From 189e88c5601b2a99b032ae966f945986b8acf8b1 Mon Sep 17 00:00:00 2001 From: Hufe921 Date: Fri, 17 Feb 2023 22:19:17 +0800 Subject: [PATCH] feat:support mac os shortcut remark --- index.html | 30 +++++++++---------- .../core/contextmenu/menus/globalMenus.ts | 9 +++--- src/main.ts | 29 ++++++++++++++---- 3 files changed, 44 insertions(+), 24 deletions(-) diff --git a/index.html b/index.html index ee164bd..63a5888 100644 --- a/index.html +++ b/index.html @@ -12,10 +12,10 @@
-
+
-
+
@@ -51,28 +51,28 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -88,16 +88,16 @@
-
+
-
+
-
+
-
+
@@ -206,7 +206,7 @@
-
+
@@ -226,7 +226,7 @@
-
+
diff --git a/src/editor/core/contextmenu/menus/globalMenus.ts b/src/editor/core/contextmenu/menus/globalMenus.ts index 51315c1..3f72f8e 100644 --- a/src/editor/core/contextmenu/menus/globalMenus.ts +++ b/src/editor/core/contextmenu/menus/globalMenus.ts @@ -1,10 +1,11 @@ import { IRegisterContextMenu } from '../../../interface/contextmenu/ContextMenu' +import { isApple } from '../../../utils/ua' import { Command } from '../../command/Command' export const globalMenus: IRegisterContextMenu[] = [ { i18nPath: 'contextmenu.global.cut', - shortCut: 'Ctrl + X', + shortCut: `${isApple ? '⌘' : 'Ctrl'} + X`, when: (payload) => { return !payload.isReadonly }, @@ -14,7 +15,7 @@ export const globalMenus: IRegisterContextMenu[] = [ }, { i18nPath: 'contextmenu.global.copy', - shortCut: 'Ctrl + C', + shortCut: `${isApple ? '⌘' : 'Ctrl'} + C`, when: (payload) => { return payload.editorHasSelection }, @@ -24,7 +25,7 @@ export const globalMenus: IRegisterContextMenu[] = [ }, { i18nPath: 'contextmenu.global.paste', - shortCut: 'Ctrl + V', + shortCut: `${isApple ? '⌘' : 'Ctrl'} + V`, when: (payload) => { return !payload.isReadonly && payload.editorTextFocus }, @@ -34,7 +35,7 @@ export const globalMenus: IRegisterContextMenu[] = [ }, { i18nPath: 'contextmenu.global.selectAll', - shortCut: 'Ctrl + A', + shortCut: `${isApple ? '⌘' : 'Ctrl'} + A`, when: (payload) => { return payload.editorTextFocus }, diff --git a/src/main.ts b/src/main.ts index efd83b9..7eddd37 100644 --- a/src/main.ts +++ b/src/main.ts @@ -7,6 +7,7 @@ import { formatPrismToken } from './utils/prism' import { Signature } from './components/signature/Signature' window.onload = function () { + const isApple = typeof navigator !== 'undefined' && /Mac OS X/.test(navigator.userAgent) // 1. 初始化编辑器 const container = document.querySelector('.editor')! @@ -17,12 +18,14 @@ window.onload = function () { // 2. | 撤销 | 重做 | 格式刷 | 清除格式 | const undoDom = document.querySelector('.menu-item__undo')! + undoDom.title = `撤销(${isApple ? '⌘' : 'Ctrl'}+Z)` undoDom.onclick = function () { console.log('undo') instance.command.executeUndo() } const redoDom = document.querySelector('.menu-item__redo')! + redoDom.title = `重做(${isApple ? '⌘' : 'Ctrl'}+Y)` redoDom.onclick = function () { console.log('redo') instance.command.executeRedo() @@ -60,29 +63,36 @@ window.onload = function () { instance.command.executeFont(li.dataset.family!) } - document.querySelector('.menu-item__size-add')!.onclick = function () { + const sizeAddDom = document.querySelector('.menu-item__size-add')! + sizeAddDom.title = `增大字号(${isApple ? '⌘' : 'Ctrl'}+[)` + sizeAddDom.onclick = function () { console.log('size-add') instance.command.executeSizeAdd() } - document.querySelector('.menu-item__size-minus')!.onclick = function () { + const sizeMinusDom = document.querySelector('.menu-item__size-minus')! + sizeMinusDom.title = `减小字号(${isApple ? '⌘' : 'Ctrl'}+])` + sizeMinusDom.onclick = function () { console.log('size-minus') instance.command.executeSizeMinus() } const boldDom = document.querySelector('.menu-item__bold')! + boldDom.title = `加粗(${isApple ? '⌘' : 'Ctrl'}+B)` boldDom.onclick = function () { console.log('bold') instance.command.executeBold() } const italicDom = document.querySelector('.menu-item__italic')! + italicDom.title = `斜体(${isApple ? '⌘' : 'Ctrl'}+I)` italicDom.onclick = function () { console.log('italic') instance.command.executeItalic() } const underlineDom = document.querySelector('.menu-item__underline')! + underlineDom.title = `下划线(${isApple ? '⌘' : 'Ctrl'}+U)` underlineDom.onclick = function () { console.log('underline') instance.command.executeUnderline() @@ -95,12 +105,14 @@ window.onload = function () { } const superscriptDom = document.querySelector('.menu-item__superscript')! + superscriptDom.title = `上标(${isApple ? '⌘' : 'Ctrl'}+Shift+,)` superscriptDom.onclick = function () { console.log('superscript') instance.command.executeSuperscript() } const subscriptDom = document.querySelector('.menu-item__subscript')! + subscriptDom.title = `下标(${isApple ? '⌘' : 'Ctrl'}+Shift+.)` subscriptDom.onclick = function () { console.log('subscript') instance.command.executeSubscript() @@ -129,24 +141,28 @@ window.onload = function () { } const leftDom = document.querySelector('.menu-item__left')! + leftDom.title = `左对齐(${isApple ? '⌘' : 'Ctrl'}+L)` leftDom.onclick = function () { console.log('left') instance.command.executeLeft() } const centerDom = document.querySelector('.menu-item__center')! + centerDom.title = `居中对齐(${isApple ? '⌘' : 'Ctrl'}+E)` centerDom.onclick = function () { console.log('center') instance.command.executeCenter() } const rightDom = document.querySelector('.menu-item__right')! + rightDom.title = `右对齐(${isApple ? '⌘' : 'Ctrl'}+R)` rightDom.onclick = function () { console.log('right') instance.command.executeRight() } const alignmentDom = document.querySelector('.menu-item__alignment')! + alignmentDom.title = `两端对齐(${isApple ? '⌘' : 'Ctrl'}+J)` alignmentDom.onclick = function () { console.log('alignment') instance.command.executeAlignment() @@ -697,6 +713,7 @@ window.onload = function () { const searchInputDom = document.querySelector('.menu-item__search__collapse__search input')! const replaceInputDom = document.querySelector('.menu-item__search__collapse__replace input')! const searchDom = document.querySelector('.menu-item__search')! + searchDom.title = `搜索与替换(${isApple ? '⌘' : 'Ctrl'}+F)` const searchResultDom = searchCollapseDom.querySelector('.search-result')! function setSearchResult() { const result = instance.command.getSearchNavigateInfo() @@ -754,7 +771,9 @@ window.onload = function () { setSearchResult() } - document.querySelector('.menu-item__print')!.onclick = function () { + const printDom = document.querySelector('.menu-item__print')! + printDom.title = `打印(${isApple ? '⌘' : 'Ctrl'}+P)` + printDom.onclick = function () { console.log('print') instance.command.executePrint() } @@ -1062,7 +1081,7 @@ window.onload = function () { instance.register.shortcutList([ { key: KeyMap.P, - ctrl: true, + mod: true, isGlobal: true, callback: (command: Command) => { command.executePrint() @@ -1070,7 +1089,7 @@ window.onload = function () { }, { key: KeyMap.F, - ctrl: true, + mod: true, isGlobal: true, callback: (command: Command) => { const text = command.getRangeText()