From dc347aeb0f51f86803ad76e83d0908d307d3570e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A5=94=E8=B7=91=E7=9A=84=E9=9D=A2=E6=9D=A1?=
 <1262327911@qq.com>
Date: Wed, 13 Apr 2022 11:03:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=96=B9=E5=90=91?=
 =?UTF-8?q?=E9=94=AE=E5=BF=AB=E6=8D=B7=E9=94=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/chart/hooks/useKeyboard.hook.ts | 34 +++++++++++------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/views/chart/hooks/useKeyboard.hook.ts b/src/views/chart/hooks/useKeyboard.hook.ts
index 383b6d33..0d7d4ad2 100644
--- a/src/views/chart/hooks/useKeyboard.hook.ts
+++ b/src/views/chart/hooks/useKeyboard.hook.ts
@@ -5,7 +5,6 @@ import debounce from 'lodash/debounce'
 
 import keymaster from 'keymaster'
 // Keymaster可以支持识别以下组合键： ⇧，shift，option，⌥，alt，ctrl，control，command，和⌘
-
 const chartEditStore = useChartEditStore()
 
 const winCtrlMerge = (e: string) => `${WinKeyboard.CTRL}+${e}`
@@ -13,10 +12,10 @@ const winShiftMerge = (e: string) => `${WinKeyboard.SHIFT}+${e}`
 const winAltMerge = (e: string) => `${WinKeyboard.ALT}+${e}`
 
 export const winKeyboardValue = {
-  [MenuEnum.ARROW_UP]: winCtrlMerge('arrowup'),
-  [MenuEnum.ARROW_RIGHT]: winCtrlMerge('arrowright'),
-  [MenuEnum.ARROW_DOWN]: winCtrlMerge('arrowdown'),
-  [MenuEnum.ARROW_LEFT]: winCtrlMerge('arrowleft'),
+  [MenuEnum.ARROW_UP]: winCtrlMerge('up'),
+  [MenuEnum.ARROW_RIGHT]: winCtrlMerge('right'),
+  [MenuEnum.ARROW_DOWN]: winCtrlMerge('down'),
+  [MenuEnum.ARROW_LEFT]: winCtrlMerge('left'),
   [MenuEnum.COPY]: winCtrlMerge('c'),
   [MenuEnum.CUT]: winCtrlMerge('x'),
   [MenuEnum.PARSE]: winCtrlMerge('v'),
@@ -25,6 +24,7 @@ export const winKeyboardValue = {
   [MenuEnum.FORWORD]: winCtrlMerge(winShiftMerge('z')),
 }
 
+// 这个 Ctrl 后面还是换成了 ⌘
 const macCtrlMerge = (e: string) => `${MacKeyboard.CTRL}+${e}`
 const macShiftMerge = (e: string) => `${MacKeyboard.SHIFT}+${e}`
 const macAltMerge = (e: string) => `${MacKeyboard.ALT}+${e}`
@@ -38,7 +38,7 @@ export const macKeyboardValue = {
   [MenuEnum.COPY]: macCtrlMerge('c'),
   [MenuEnum.CUT]: macCtrlMerge('x'),
   [MenuEnum.PARSE]: macCtrlMerge('v'),
-  [MenuEnum.DELETE]: 'delete',
+  [MenuEnum.DELETE]: macCtrlMerge('backspace'),
   [MenuEnum.BACK]: macCtrlMerge('z'),
   [MenuEnum.FORWORD]: macCtrlMerge(macShiftMerge('z')),
 }
@@ -79,45 +79,45 @@ const macKeyList: Array<string> = [
 export const useAddKeyboard = () => {
   const switchHande = (keyboardValue: typeof winKeyboardValue, e: string) => {
     switch (e) {
-      // ↑
+      // ct+↑
       case keyboardValue.up:
         keymaster(e, throttle(() => { chartEditStore.setMove(MenuEnum.ARROW_UP); return false }, 200))
         break;
-      // →
+      // ct+→
       case keyboardValue.right:
         keymaster(e, throttle(() => { chartEditStore.setMove(MenuEnum.ARROW_RIGHT); return false }, 200))
         break;
-      // ↓
+      // ct+↓
       case keyboardValue.down:
         keymaster(e, throttle(() => { chartEditStore.setMove(MenuEnum.ARROW_DOWN); return false }, 200))
         break;
-      // ←
+      // ct+←
       case keyboardValue.left:
         keymaster(e, throttle(() => { chartEditStore.setMove(MenuEnum.ARROW_LEFT); return false }, 200))
         break;
 
-      // 删除
+      // 删除 delete
       case keyboardValue.delete:
         keymaster(e, debounce(() => { chartEditStore.removeComponentList(); return false }, 200))
         break;
-      // 复制
+      // 复制 ct+v
       case keyboardValue.copy:
         keymaster(e, debounce(() => { chartEditStore.setCopy(); return false }, 200))
         break;
-      // 剪切
+      // 剪切 ct+x
       case keyboardValue.cut:
         keymaster(e, debounce(() => { chartEditStore.setCut(); return false }, 200))
         break;
-      // 粘贴
+      // 粘贴 ct+v
       case keyboardValue.parse:
         keymaster(e, throttle(() => { chartEditStore.setParse(); return false }, 200))
         break;
 
-      // 撤回
+      // 撤回 ct+z
       case keyboardValue.back:
         keymaster(e, throttle(() => { chartEditStore.setBack(); return false }, 200))
         break;
-      // 前进
+      // 前进 ct+sh+z
       case keyboardValue.forward:
         keymaster(e, throttle(() => { chartEditStore.setForward(); return false }, 200))
         break;
@@ -139,4 +139,4 @@ export const useRemoveKeyboard = () => {
   macKeyList.forEach((key: string) => {
     keymaster.unbind(key)
   })
-}
+}
\ No newline at end of file