From 0fe55adb7b47aac4678212986117422a9a183cac Mon Sep 17 00:00:00 2001
From: lhyUnited <lhy_1314@yeah.net>
Date: Mon, 19 Apr 2021 15:29:30 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0command=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=20finish=20#20?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/useGlobalHotkey.ts | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/hooks/useGlobalHotkey.ts b/src/hooks/useGlobalHotkey.ts
index 0b26d0ad..40409110 100644
--- a/src/hooks/useGlobalHotkey.ts
+++ b/src/hooks/useGlobalHotkey.ts
@@ -124,10 +124,10 @@ export default () => {
 
     const key = e.key.toUpperCase()
 
-    if (ctrlKey && !ctrlKeyActive.value) store.commit(MutationTypes.SET_CTRL_KEY_STATE, true)
+    if ((ctrlKey || metaKey) && !ctrlKeyActive.value) store.commit(MutationTypes.SET_CTRL_KEY_STATE, true)
     if (shiftKey && !shiftKeyActive.value) store.commit(MutationTypes.SET_SHIFT_KEY_STATE, true)
 
-    if (ctrlKey && key === KEYS.F) {
+    if ((ctrlKey || metaKey) && key === KEYS.F) {
       e.preventDefault()
       enterScreening()
       store.commit(MutationTypes.SET_CTRL_KEY_STATE, false)
@@ -145,37 +145,37 @@ export default () => {
       e.preventDefault()
       cut()
     }
-    if (ctrlKey && key === KEYS.D) {
+    if ((ctrlKey || metaKey) && key === KEYS.D) {
       if (disableHotkeys.value) return
       e.preventDefault()
       quickCopy()
     }
-    if (ctrlKey && key === KEYS.Z) {
+    if ((ctrlKey || metaKey) && key === KEYS.Z) {
       if (disableHotkeys.value) return
       e.preventDefault()
       undo()
     }
-    if (ctrlKey && key === KEYS.Y) {
+    if ((ctrlKey || metaKey) && key === KEYS.Y) {
       if (disableHotkeys.value) return
       e.preventDefault()
       redo()
     }
-    if (ctrlKey && key === KEYS.A) {
+    if ((ctrlKey || metaKey) && key === KEYS.A) {
       if (disableHotkeys.value) return
       e.preventDefault()
       selectAll()
     }
-    if (ctrlKey && key === KEYS.L) {
+    if ((ctrlKey || metaKey) && key === KEYS.L) {
       if (disableHotkeys.value) return
       e.preventDefault()
       lock()
     }
-    if (!shiftKey && ctrlKey && key === KEYS.G) {
+    if (!shiftKey && (ctrlKey || metaKey) && key === KEYS.G) {
       if (disableHotkeys.value) return
       e.preventDefault()
       combine()
     }
-    if (shiftKey && ctrlKey && key === KEYS.G) {
+    if (shiftKey && (ctrlKey || metaKey) && key === KEYS.G) {
       if (disableHotkeys.value) return
       e.preventDefault()
       uncombine()