diff --git a/app/src/block/Panel.ts b/app/src/block/Panel.ts index f5bc7f872..6a11507fc 100644 --- a/app/src/block/Panel.ts +++ b/app/src/block/Panel.ts @@ -16,7 +16,7 @@ import {showMessage} from "../dialog/message"; import {App} from "../index"; import {resize} from "../protyle/util/resize"; import {checkFold} from "../util/noRelyPCFunction"; -import {updateHotkeyTip} from "../protyle/util/compatibility"; +import {updateHotkeyAfterTip} from "../protyle/util/compatibility"; export class BlockPanel { public element: HTMLElement; @@ -240,7 +240,7 @@ export class BlockPanel { } let openHTML = ""; if (this.refDefs.length === 1) { - openHTML = ` + openHTML = ` `; /// #if !BROWSER openHTML += ` diff --git a/app/src/layout/dock/Backlink.ts b/app/src/layout/dock/Backlink.ts index e6210b218..04e4e1e48 100644 --- a/app/src/layout/dock/Backlink.ts +++ b/app/src/layout/dock/Backlink.ts @@ -5,7 +5,7 @@ import {setPanelFocus} from "../util"; import {getDockByType} from "../tabUtil"; import {fetchPost} from "../../util/fetch"; import {Constants} from "../../constants"; -import {updateHotkeyTip} from "../../protyle/util/compatibility"; +import {updateHotkeyAfterTip} from "../../protyle/util/compatibility"; import {openFileById} from "../../editor/util"; import {Protyle} from "../../protyle"; import {MenuItem} from "../../menus/Menu"; @@ -94,15 +94,15 @@ export class Backlink extends Model { - + - + - +
diff --git a/app/src/layout/dock/Bookmark.ts b/app/src/layout/dock/Bookmark.ts index 8e8a8c34e..f027a2541 100644 --- a/app/src/layout/dock/Bookmark.ts +++ b/app/src/layout/dock/Bookmark.ts @@ -4,7 +4,7 @@ import {Tree} from "../../util/Tree"; import {setPanelFocus} from "../util"; import {getDockByType} from "../tabUtil"; import {fetchPost} from "../../util/fetch"; -import {updateHotkeyTip} from "../../protyle/util/compatibility"; +import {updateHotkeyAfterTip} from "../../protyle/util/compatibility"; import {openFileById} from "../../editor/util"; import {hasClosestByClassName} from "../../protyle/util/hasClosest"; import {openBookmarkMenu} from "../../menus/bookmark"; @@ -62,15 +62,15 @@ export class Bookmark extends Model { - + - + - +
`; this.tree = new Tree({ diff --git a/app/src/layout/dock/Files.ts b/app/src/layout/dock/Files.ts index 07f8c48e8..06728bb00 100644 --- a/app/src/layout/dock/Files.ts +++ b/app/src/layout/dock/Files.ts @@ -14,7 +14,12 @@ import {fetchPost, fetchSyncPost} from "../../util/fetch"; import {openEmojiPanel, unicode2Emoji} from "../../emoji"; import {mountHelp, newNotebook} from "../../util/mount"; import {confirmDialog} from "../../dialog/confirmDialog"; -import {isNotCtrl, isOnlyMeta, setStorageVal, updateHotkeyTip} from "../../protyle/util/compatibility"; +import { + isNotCtrl, + isOnlyMeta, + setStorageVal, + updateHotkeyAfterTip +} from "../../protyle/util/compatibility"; import {openFileById} from "../../editor/util"; import { hasClosestByAttribute, @@ -116,9 +121,9 @@ export class Files extends Model { ${window.siyuan.languages.fileTree} - + - +
@@ -126,7 +131,7 @@ export class Files extends Model { - +
    diff --git a/app/src/layout/dock/Graph.ts b/app/src/layout/dock/Graph.ts index 51af7a82b..469ef5b09 100644 --- a/app/src/layout/dock/Graph.ts +++ b/app/src/layout/dock/Graph.ts @@ -8,7 +8,7 @@ import {BlockPanel} from "../../block/Panel"; import {fullscreen} from "../../protyle/breadcrumb/action"; import {fetchPost} from "../../util/fetch"; import {openFileById} from "../../editor/util"; -import {updateHotkeyTip} from "../../protyle/util/compatibility"; +import {updateHotkeyAfterTip} from "../../protyle/util/compatibility"; import {openGlobalSearch} from "../../search/util"; import {App} from "../../index"; import {checkFold} from "../../util/noRelyPCFunction"; @@ -274,7 +274,7 @@ export class Graph extends Model { - +
    ${panelHTML} diff --git a/app/src/layout/dock/Inbox.ts b/app/src/layout/dock/Inbox.ts index 3bb997066..56d155028 100644 --- a/app/src/layout/dock/Inbox.ts +++ b/app/src/layout/dock/Inbox.ts @@ -4,7 +4,7 @@ import {setPanelFocus} from "../util"; import {getDockByType} from "../tabUtil"; /// #endif import {fetchPost} from "../../util/fetch"; -import {updateHotkeyTip} from "../../protyle/util/compatibility"; +import {updateHotkeyAfterTip} from "../../protyle/util/compatibility"; import {Model} from "../Model"; import {needSubscribe} from "../../util/needSubscribe"; import {MenuItem} from "../../menus/Menu"; @@ -68,7 +68,7 @@ export class Inbox extends Model { - +
    diff --git a/app/src/layout/dock/Outline.ts b/app/src/layout/dock/Outline.ts index 95b9f6dc3..ddf92c768 100644 --- a/app/src/layout/dock/Outline.ts +++ b/app/src/layout/dock/Outline.ts @@ -6,7 +6,7 @@ import {getDockByType} from "../tabUtil"; import {fetchPost} from "../../util/fetch"; import {getAllModels} from "../getAll"; import {hasClosestBlock, hasClosestByClassName, hasTopClosestByClassName} from "../../protyle/util/hasClosest"; -import {setStorageVal, updateHotkeyTip} from "../../protyle/util/compatibility"; +import {setStorageVal, updateHotkeyAfterTip} from "../../protyle/util/compatibility"; import {openFileById} from "../../editor/util"; import {Constants} from "../../constants"; import {escapeHtml} from "../../util/escape"; @@ -89,15 +89,15 @@ export class Outline extends Model { ${window.siyuan.languages.outline} - + - + - +
    `; diff --git a/app/src/layout/dock/Tag.ts b/app/src/layout/dock/Tag.ts index e5dc676df..e5705e0f4 100644 --- a/app/src/layout/dock/Tag.ts +++ b/app/src/layout/dock/Tag.ts @@ -4,7 +4,7 @@ import {Tree} from "../../util/Tree"; import {setPanelFocus} from "../util"; import {getDockByType} from "../tabUtil"; import {fetchPost} from "../../util/fetch"; -import {updateHotkeyTip} from "../../protyle/util/compatibility"; +import {updateHotkeyAfterTip} from "../../protyle/util/compatibility"; import {openGlobalSearch} from "../../search/util"; import {MenuItem} from "../../menus/Menu"; import {App} from "../../index"; @@ -63,15 +63,15 @@ export class Tag extends Model {     - + - + - +
    `; diff --git a/app/src/protyle/util/compatibility.ts b/app/src/protyle/util/compatibility.ts index 9e3a001be..cfd217ff1 100644 --- a/app/src/protyle/util/compatibility.ts +++ b/app/src/protyle/util/compatibility.ts @@ -222,6 +222,14 @@ export const isInHarmony = () => { return window.siyuan.config.system.container === "harmony" && window.JSHarmony; }; + +export const updateHotkeyAfterTip = (hotkey: string) => { + if (hotkey) { + return " " + updateHotkeyTip(hotkey); + } + return ""; +}; + // Mac，Windows 快捷键展示 export const updateHotkeyTip = (hotkey: string) => { if (isMac()) {