Skip to content

An open-source, privacy-first, self-hosted knowledge workspace where humans and AI agents work together 开源、隐私优先、自托管的知识工作空间,让人与智能体在此协作

:art: Support inserting the current time from the slash menu https://github.com/siyuan-note/siyuan/issues/20523

Nathan Ka40b38383470
diff --git a/app/appearance/langs/ar.json b/app/appearance/langs/ar.json
index 8574aab077..bbe01e8a7c 100644
--- a/app/appearance/langs/ar.json
+++ b/app/appearance/langs/ar.json
@@ -1,4 +1,5 @@
{
+ "currentTime": "الوقت الحالي",
"exitWaiting": "جارٍ الخروج، يُرجى الانتظار...",
"exitWaitFailed": "تعذّر التأكد من اكتمال الإغلاق. يمكنك إعادة المحاولة أو إغلاق مربع الحوار هذا ومتابعة الانتظار.",
"previousExitWaiting": "في انتظار اكتمال الإغلاق السابق...",
diff --git a/app/appearance/langs/de.json b/app/appearance/langs/de.json
index 95c2169078..2622cdd859 100644
--- a/app/appearance/langs/de.json
+++ b/app/appearance/langs/de.json
@@ -1,4 +1,5 @@
{
+ "currentTime": "Aktuelle Uhrzeit",
"exitWaiting": "Wird beendet, bitte warten...",
"exitWaitFailed": "Der Abschluss des Beendens konnte nicht bestätigt werden. Versuchen Sie es erneut oder schließen Sie diesen Dialog und warten Sie weiter.",
"previousExitWaiting": "Warten, bis der vorherige Beendigungsvorgang abgeschlossen ist...",
diff --git a/app/appearance/langs/en.json b/app/appearance/langs/en.json
index c42154b5a4..13551e0c0d 100644
--- a/app/appearance/langs/en.json
+++ b/app/appearance/langs/en.json
@@ -1,4 +1,5 @@
{
+ "currentTime": "Current Time",
"exitWaiting": "Exiting, please wait...",
"exitWaitFailed": "Could not confirm that shutdown has completed. You can retry or close this dialog and continue waiting.",
"previousExitWaiting": "Waiting for the previous shutdown to finish...",
diff --git a/app/appearance/langs/es.json b/app/appearance/langs/es.json
index 61137c3d22..f2ee2be4c9 100644
--- a/app/appearance/langs/es.json
+++ b/app/appearance/langs/es.json
@@ -1,4 +1,5 @@
{
+ "currentTime": "Hora actual",
"exitWaiting": "Saliendo, espere...",
"exitWaitFailed": "No se pudo confirmar que el cierre haya terminado. Puede reintentar o cerrar este diálogo y seguir esperando.",
"previousExitWaiting": "Esperando a que termine el cierre anterior...",
diff --git a/app/appearance/langs/fr.json b/app/appearance/langs/fr.json
index fd7520dd0b..1a1c19beba 100644
--- a/app/appearance/langs/fr.json
+++ b/app/appearance/langs/fr.json
@@ -1,4 +1,5 @@
{
+ "currentTime": "Heure actuelle",
"exitWaiting": "Fermeture en cours, veuillez patienter...",
"exitWaitFailed": "Impossible de confirmer la fin de la fermeture. Vous pouvez réessayer ou fermer cette boîte de dialogue et continuer à patienter.",
"previousExitWaiting": "En attente de la fin de la fermeture précédente...",
diff --git a/app/appearance/langs/he.json b/app/appearance/langs/he.json
index 43df98e469..a4c46b05a6 100644
--- a/app/appearance/langs/he.json
+++ b/app/appearance/langs/he.json
@@ -1,4 +1,5 @@
{
+ "currentTime": "השעה הנוכחית",
"exitWaiting": "היישום נסגר, נא להמתין...",
"exitWaitFailed": "לא ניתן לאשר שהסגירה הושלמה. אפשר לנסות שוב או לסגור את תיבת הדו־שיח ולהמשיך להמתין.",
"previousExitWaiting": "ממתין להשלמת הסגירה הקודמת...",
diff --git a/app/appearance/langs/hi.json b/app/appearance/langs/hi.json
index b765fbcb86..5897d4bc31 100644
--- a/app/appearance/langs/hi.json
+++ b/app/appearance/langs/hi.json
@@ -1,4 +1,5 @@
{
+ "currentTime": "वर्तमान समय",
"exitWaiting": "बंद किया जा रहा है, कृपया प्रतीक्षा करें...",
"exitWaitFailed": "बंद होने की प्रक्रिया पूरी होने की पुष्टि नहीं हो सकी। आप फिर से कोशिश कर सकते हैं या इस संवाद को बंद करके प्रतीक्षा जारी रख सकते हैं।",
"previousExitWaiting": "पिछली बंद होने की प्रक्रिया पूरी होने की प्रतीक्षा की जा रही है...",
diff --git a/app/appearance/langs/id.json b/app/appearance/langs/id.json
index d8db03db34..29031a91f9 100644
--- a/app/appearance/langs/id.json
+++ b/app/appearance/langs/id.json
@@ -1,4 +1,5 @@
{
+ "currentTime": "Waktu Saat Ini",
"exitWaiting": "Menutup aplikasi, harap tunggu...",
"exitWaitFailed": "Tidak dapat memastikan bahwa proses penutupan telah selesai. Anda dapat mencoba lagi atau menutup dialog ini dan terus menunggu.",
"previousExitWaiting": "Menunggu proses penutupan sebelumnya selesai...",
diff --git a/app/appearance/langs/it.json b/app/appearance/langs/it.json
index 5f3d36cf7e..b3813b9179 100644
--- a/app/appearance/langs/it.json
+++ b/app/appearance/langs/it.json
@@ -1,4 +1,5 @@
{
+ "currentTime": "Ora attuale",
"exitWaiting": "Chiusura in corso, attendere...",
"exitWaitFailed": "Impossibile confermare il completamento della chiusura. Puoi riprovare oppure chiudere questa finestra di dialogo e continuare ad attendere.",
"previousExitWaiting": "In attesa del completamento della chiusura precedente...",
diff --git a/app/appearance/langs/ja.json b/app/appearance/langs/ja.json
index 9e6f1f8609..701f22b88f 100644
--- a/app/appearance/langs/ja.json
+++ b/app/appearance/langs/ja.json
@@ -1,4 +1,5 @@
{
+ "currentTime": "現在時刻",
"exitWaiting": "終了しています。お待ちください...",
"exitWaitFailed": "終了が完了したか確認できませんでした。再試行するか、このダイアログを閉じてお待ちください。",
"previousExitWaiting": "前回の終了処理が完了するのを待っています...",
diff --git a/app/appearance/langs/ko.json b/app/appearance/langs/ko.json
index 644d3154ed..cf015606a2 100644
--- a/app/appearance/langs/ko.json
+++ b/app/appearance/langs/ko.json
@@ -1,4 +1,5 @@
{
+ "currentTime": "현재 시간",
"exitWaiting": "종료 중입니다. 잠시 기다려 주세요...",
"exitWaitFailed": "종료 완료 여부를 확인할 수 없습니다. 다시 시도하거나 이 대화 상자를 닫고 계속 기다려 주세요.",
"previousExitWaiting": "이전 종료 작업이 완료되기를 기다리는 중...",
diff --git a/app/appearance/langs/nl.json b/app/appearance/langs/nl.json
index 8eee85a4e6..7a72b93fbe 100644
--- a/app/appearance/langs/nl.json
+++ b/app/appearance/langs/nl.json
@@ -1,4 +1,5 @@
{
+ "currentTime": "Huidige tijd",
"exitWaiting": "Afsluiten, even geduld...",
"exitWaitFailed": "Het is niet bevestigd dat het afsluiten is voltooid. Probeer het opnieuw of sluit dit dialoogvenster en blijf wachten.",
"previousExitWaiting": "Wachten tot het vorige afsluitproces is voltooid...",
diff --git a/app/appearance/langs/pl.json b/app/appearance/langs/pl.json
index 95adfd52c4..ccf4c9e22b 100644
--- a/app/appearance/langs/pl.json
+++ b/app/appearance/langs/pl.json
@@ -1,4 +1,5 @@
{
+ "currentTime": "Bieżąca godzina",
"exitWaiting": "Zamykanie, proszę czekać...",
"exitWaitFailed": "Nie można potwierdzić zakończenia zamykania. Możesz spróbować ponownie lub zamknąć to okno dialogowe i nadal czekać.",
"previousExitWaiting": "Oczekiwanie na zakończenie poprzedniego zamykania...",
diff --git a/app/appearance/langs/pt-BR.json b/app/appearance/langs/pt-BR.json
index 069293beca..3f22173e59 100644
--- a/app/appearance/langs/pt-BR.json
+++ b/app/appearance/langs/pt-BR.json
@@ -1,4 +1,5 @@
{
+ "currentTime": "Hora atual",
"exitWaiting": "Encerrando, aguarde...",
"exitWaitFailed": "Não foi possível confirmar a conclusão do encerramento. Você pode tentar novamente ou fechar esta caixa de diálogo e continuar aguardando.",
"previousExitWaiting": "Aguardando a conclusão do encerramento anterior...",
diff --git a/app/appearance/langs/ru.json b/app/appearance/langs/ru.json
index e340b838ab..1eb1a883e8 100644
--- a/app/appearance/langs/ru.json
+++ b/app/appearance/langs/ru.json
@@ -1,4 +1,5 @@
{
+ "currentTime": "Текущее время",
"exitWaiting": "Завершение работы, подождите...",
"exitWaitFailed": "Не удалось подтвердить завершение работы. Повторите попытку или закройте это диалоговое окно и продолжайте ждать.",
"previousExitWaiting": "Ожидание завершения предыдущего сеанса...",
diff --git a/app/appearance/langs/sk.json b/app/appearance/langs/sk.json
index 09f5842af7..37a8e17489 100644
--- a/app/appearance/langs/sk.json
+++ b/app/appearance/langs/sk.json
@@ -1,4 +1,5 @@
{
+ "currentTime": "Aktuálny čas",
"exitWaiting": "Ukončovanie, čakajte...",
"exitWaitFailed": "Nepodarilo sa potvrdiť dokončenie ukončovania. Môžete to skúsiť znova alebo zavrieť toto dialógové okno a ďalej čakať.",
"previousExitWaiting": "Čaká sa na dokončenie predchádzajúceho ukončovania...",
diff --git a/app/appearance/langs/sr.json b/app/appearance/langs/sr.json
index 8aae5f416f..b36b3d24a0 100644
--- a/app/appearance/langs/sr.json
+++ b/app/appearance/langs/sr.json
@@ -1,4 +1,5 @@
{
+ "currentTime": "Тренутно време",
"exitWaiting": "Затварање, сачекајте...",
"exitWaitFailed": "Није могуће потврдити да је затварање завршено. Покушајте поново или затворите овај дијалог и наставите да чекате.",
"previousExitWaiting": "Чека се завршетак претходног затварања...",
diff --git a/app/appearance/langs/th.json b/app/appearance/langs/th.json
index 12495902a7..c2167ee9a0 100644
--- a/app/appearance/langs/th.json
+++ b/app/appearance/langs/th.json
@@ -1,4 +1,5 @@
{
+ "currentTime": "เวลาปัจจุบัน",
"exitWaiting": "กำลังออกจากแอป โปรดรอสักครู่...",
"exitWaitFailed": "ไม่สามารถยืนยันได้ว่าการปิดเสร็จสิ้นแล้ว คุณสามารถลองอีกครั้ง หรือปิดกล่องโต้ตอบนี้แล้วรอต่อไปได้",
"previousExitWaiting": "กำลังรอให้การปิดครั้งก่อนเสร็จสิ้น...",
diff --git a/app/appearance/langs/tr.json b/app/appearance/langs/tr.json
index 1eb72e8897..2416061971 100644
--- a/app/appearance/langs/tr.json
+++ b/app/appearance/langs/tr.json
@@ -1,4 +1,5 @@
{
+ "currentTime": "Geçerli Saat",
"exitWaiting": "Kapatılıyor, lütfen bekleyin...",
"exitWaitFailed": "Kapanmanın tamamlandığı doğrulanamadı. Yeniden deneyebilir veya bu iletişim kutusunu kapatıp beklemeye devam edebilirsiniz.",
"previousExitWaiting": "Önceki kapanma işleminin tamamlanması bekleniyor...",
diff --git a/app/appearance/langs/uk.json b/app/appearance/langs/uk.json
index d42ce67912..b555de8170 100644
--- a/app/appearance/langs/uk.json
+++ b/app/appearance/langs/uk.json
@@ -1,4 +1,5 @@
{
+ "currentTime": "Поточний час",
"exitWaiting": "Завершення роботи, зачекайте...",
"exitWaitFailed": "Не вдалося підтвердити завершення роботи. Повторіть спробу або закрийте це діалогове вікно й продовжуйте чекати.",
"previousExitWaiting": "Очікування завершення попереднього сеансу...",
diff --git a/app/appearance/langs/zh-CN.json b/app/appearance/langs/zh-CN.json
index 8de38e34e7..08fd26f637 100644
--- a/app/appearance/langs/zh-CN.json
+++ b/app/appearance/langs/zh-CN.json
@@ -1,4 +1,5 @@
{
+ "currentTime": "当前时间",
"exitWaiting": "正在退出,请稍候...",
"exitWaitFailed": "暂时无法确认退出是否完成。可以重试,或关闭此提示继续等待。",
"previousExitWaiting": "正在等待上次退出完成...",
diff --git a/app/appearance/langs/zh-TW.json b/app/appearance/langs/zh-TW.json
index ec362a40be..8f6fd3d3e3 100644
--- a/app/appearance/langs/zh-TW.json
+++ b/app/appearance/langs/zh-TW.json
@@ -1,4 +1,5 @@
{
+ "currentTime": "目前時間",
"exitWaiting": "正在退出,請稍候...",
"exitWaitFailed": "暫時無法確認是否已結束。可以重試,或關閉此提示繼續等待。",
"previousExitWaiting": "正在等待上次結束作業完成...",
diff --git a/app/src/config/entryVisibility/catalog.test.ts b/app/src/config/entryVisibility/catalog.test.ts
index 37c5abf199..5d23877e22 100644
--- a/app/src/config/entryVisibility/catalog.test.ts
+++ b/app/src/config/entryVisibility/catalog.test.ts
@@ -168,6 +168,7 @@ const slashMenuBuiltinOrder = [
"kbd",
"tag",
"inlineMath",
+ "currentTime",
"separator_3",
"insertAsset",
"insertHTMLFile",
@@ -572,7 +573,7 @@ test("slash menu catalog follows the built-in hint order", () => {
assert.deepEqual(section?.children.map((item) => item.key), ["menu"]);
const children = getEntryCatalogChildren(SLASH_MENU_ROOT_PATH);
assert.deepEqual(children.map((item) => item.key), ["frequent", ...slashMenuBuiltinOrder]);
- assert.equal(children.filter((item) => item.type === "entry").length, 69);
+ assert.equal(children.filter((item) => item.type === "entry").length, 70);
assert.equal(children.filter((item) => item.type === "separator").length, 5);
assert.equal(children.filter(item => item.key !== "frequent").every((item) => item.simple), true);
});
diff --git a/app/src/config/entryVisibility/catalog.ts b/app/src/config/entryVisibility/catalog.ts
index 1746a970ef..24e189bdf3 100644
--- a/app/src/config/entryVisibility/catalog.ts
+++ b/app/src/config/entryVisibility/catalog.ts
@@ -595,6 +595,7 @@ const slashMenuBuiltinChildren = [
node("kbd", lang("kbd")),
node("tag", lang("tag")),
node("inlineMath", lang("inline-math")),
+ node("currentTime", lang("currentTime")),
separator("separator_3"),
node("insertAsset", lang("insertAsset")),
node("insertHTMLFile", lang("insertHTMLFile")),
diff --git a/app/src/mobile/util/keyboardToolbar.ts b/app/src/mobile/util/keyboardToolbar.ts
index 9d907c00da..d89eeab68a 100644
--- a/app/src/mobile/util/keyboardToolbar.ts
+++ b/app/src/mobile/util/keyboardToolbar.ts
@@ -784,6 +784,7 @@ const renderSlashMenu = (protyle: IProtyle, toolbarElement: Element) => {
${getSlashItem("insertVideoURL", '<video controls="controls" src=""></video>', "iconVideo", window.siyuan.languages.insertVideoURL, "true")}
${getSlashItem("insertAudioURL", '<audio controls="controls" src=""></audio>', "iconRecord", window.siyuan.languages.insertAudioURL, "true")}
${getSlashItem("emoji", "emoji", "iconEmoji", window.siyuan.languages.emoji, "true")}
+ ${getSlashItem("currentTime", Constants.ZWSP + 7, "iconClock", window.siyuan.languages.currentTime, "true")}
</div>
<div class="keyboard__slash-title"></div>
<div class="keyboard__slash-block">
diff --git a/app/src/protyle/hint/extend.ts b/app/src/protyle/hint/extend.ts
index 34f18b32be..714bb91e44 100644
--- a/app/src/protyle/hint/extend.ts
+++ b/app/src/protyle/hint/extend.ts
@@ -346,6 +346,11 @@ export const getBuiltinSlashMenuItems = (protyle: IProtyle): IHintData[] => {
id: "inlineMath",
value: "inline-math",
html: `<div class="b3-list-item__first"><svg class="b3-list-item__graphic"><use xlink:href="#iconMath"></use></svg><span class="b3-list-item__text">${window.siyuan.languages["inline-math"]}</span><span class="b3-menu__accelerator b3-menu__accelerator--hotkey">${updateHotkeyTip((window.siyuan.config.keymap.editor.insert["inline-math"].custom))}</span></div>`,
+ }, {
+ filter: [window.siyuan.languages.currentTime, "current time", "time", "now", "当前时间", "dangqianshijian", "dqsj", "时间", "shijian", "sj"],
+ id: "currentTime",
+ value: Constants.ZWSP + 7,
+ html: `<div class="b3-list-item__first"><svg class="b3-list-item__graphic"><use xlink:href="#iconClock"></use></svg><span class="b3-list-item__text">${window.siyuan.languages.currentTime}</span></div>`,
}, {
value: "",
id: "separator_3",
diff --git a/app/src/protyle/hint/index.ts b/app/src/protyle/hint/index.ts
index 48558602d7..48a9035ed6 100644
--- a/app/src/protyle/hint/index.ts
+++ b/app/src/protyle/hint/index.ts
@@ -40,6 +40,7 @@ import {setPosition} from "../../util/setPosition";
import {getContenteditableElement, hasNextSibling, hasPreviousSibling} from "../wysiwyg/getBlock";
import {transaction, updateTransaction} from "../wysiwyg/transaction";
import {insertHTML} from "../util/insertHTML";
+import * as dayjs from "dayjs";
import {highlightRender} from "../render/highlightRender";
import {renderIFrameResize} from "../render/iframeResize";
import {spinListMindmapDOM} from "../render/listMindmap/create";
@@ -1145,6 +1146,10 @@ ${genHintItemHTML(item)}
range.deleteContents();
AIChat(protyle, nodeElement);
return;
+ } else if (value === Constants.ZWSP + 7) {
+ // 用当前时间替换斜杠命令文本
+ insertHTML(dayjs().format("HH:mm"), protyle, false, true, false, undefined, undoContext);
+ return;
} else if (Constants.INLINE_TYPE.includes(value)) {
range.deleteContents();
focusByRange(range);
diff --git a/app/src/protyle/hint/slashMenu.ts b/app/src/protyle/hint/slashMenu.ts
index e2e7b49261..89bb7a0108 100644
--- a/app/src/protyle/hint/slashMenu.ts
+++ b/app/src/protyle/hint/slashMenu.ts
@@ -27,7 +27,7 @@ const LITE_SLASH_IDS = new Set([
"list", "orderedList", "check", "quote", "horizontalSuperBlock", "verticalSuperBlock", "tabs", "calloutNote", "calloutTip", "calloutImportant",
"calloutWarning", "calloutCaution", "code", "table", "line", "math", "html",
"emoji", "link", "bold", "italic", "underline", "strike", "mark", "sup", "sub", "inlineCode",
- "kbd", "tag", "inlineMath", "insertIframeURL", "insertImgURL", "insertVideoURL", "insertAudioURL",
+ "kbd", "tag", "inlineMath", "currentTime", "insertIframeURL", "insertImgURL", "insertVideoURL", "insertAudioURL",
"staff", "chart", "flowChart", "graph", "mermaid", "mindmap", "UML",
"infoStyle", "successStyle", "warningStyle", "errorStyle", "clearFontStyle",
]);