diff --git a/app/src/config/keymap.ts b/app/src/config/keymap.ts index 6b642afa0..8c5130e4e 100644 --- a/app/src/config/keymap.ts +++ b/app/src/config/keymap.ts @@ -465,7 +465,7 @@ export const keymap = { const isAssistKey = ["⌘", "⇧", "⌥", "⌃"].includes(keymapStr.substr(keymapStr.length - 1, 1)); if (isAssistKey || ["⌘A", "⌘X", "⌘C", "⌘V", "⌘-", "⌘=", "⌘0", "⇧⌘V", "⌘/", "⇧↑", "⇧↓", "⇧→", "⇧←", "⇧⇥", "⌃D", "⇧⌘→", - "⇧⌘←", "⌘Home", "⌘End", "⇧↩", "⌥↩", "↩", "PageUp", "PageDown", "⌫", "⌦", "Escape"].includes(keymapStr) || + "⇧⌘←", "⌘Home", "⌘End", "⇧↩", "↩", "PageUp", "PageDown", "⌫", "⌦", "Escape"].includes(keymapStr) || // 跳转到下/上一个编辑页签不能包含 ctrl, 否则不能监听到 keyup (isMac() && keys[0] === "general" && ["goToEditTabNext", "goToEditTabPrev"].includes(keys[1]) && keymapStr.includes("⌘")) ) { diff --git a/app/src/constants.ts b/app/src/constants.ts index 8a4cb65fa..dc2e37fdd 100644 --- a/app/src/constants.ts +++ b/app/src/constants.ts @@ -343,7 +343,7 @@ export abstract class Constants { // 冲突不使用 "⌘S/Q" // "⌘", "⇧", "⌥", "⌃" // "⌘A", "⌘X", "⌘C", "⌘V", "⌘-", "⌘=", "⌘0", "⇧⌘V", "⌘/", "⇧↑", "⇧↓", "⇧→", "⇧←", "⇧⇥", "⌃D", "⇧⌘→", "⇧⌘←", - // "⌘Home", "⌘End", "⇧↩", "⌥↩", "↩", "PageUp", "PageDown", "⌫", "⌦", "Escape" 不可自定义 + // "⌘Home", "⌘End", "⇧↩", "↩", "PageUp", "PageDown", "⌫", "⌦", "Escape" 不可自定义 public static readonly SIYUAN_KEYMAP: Config.IKeymap = { general: { mainMenu: {default: "⌥\\", custom: "⌥\\"},