From b4ebf8cde378044ef22166119d457294a789e33d 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 10:35:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=BF=AB=E6=8D=B7?=
 =?UTF-8?q?=E9=94=AE=E5=B1=95=E7=A4=BA=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/enums/editPageEnum.ts                     |   3 +-
 .../components/EditBottom/index.vue           |  63 +----------
 .../EditShortcutKey/ShortcutKeyModal.vue      | 102 ++++++++++++++++++
 .../components/EditShortcutKey/index.ts       |   2 +
 .../components/EditShortcutKey/index.vue      |  41 +++++++
 5 files changed, 151 insertions(+), 60 deletions(-)
 create mode 100644 src/views/chart/ContentEdit/components/EditShortcutKey/ShortcutKeyModal.vue
 create mode 100644 src/views/chart/ContentEdit/components/EditShortcutKey/index.ts
 create mode 100644 src/views/chart/ContentEdit/components/EditShortcutKey/index.vue

diff --git a/src/enums/editPageEnum.ts b/src/enums/editPageEnum.ts
index e3fa196e..1bd8fbc6 100644
--- a/src/enums/editPageEnum.ts
+++ b/src/enums/editPageEnum.ts
@@ -31,7 +31,8 @@ export enum WinKeyboard {
 
 // Mac 键盘枚举
 export enum MacKeyboard {
-  CTRL = '^',
+  // 还是用 Command 吧
+  CTRL = '⌘',
   SHIFT = '⇧',
   ALT = '⌥',
 }
\ No newline at end of file
diff --git a/src/views/chart/ContentEdit/components/EditBottom/index.vue b/src/views/chart/ContentEdit/components/EditBottom/index.vue
index f856a97e..5c98c2b5 100644
--- a/src/views/chart/ContentEdit/components/EditBottom/index.vue
+++ b/src/views/chart/ContentEdit/components/EditBottom/index.vue
@@ -4,14 +4,8 @@
 
     <n-space class="bottom-ri">
       <!-- 快捷键提示 -->
-      <n-popselect :options="shortcutKeyOptions" size="medium">
-        <n-button class="scale-btn" quaternary size="mini">
-          <n-icon class="lock-icon" size="18" :depth="2">
-            <DicomOverlayIcon></DicomOverlayIcon>
-          </n-icon>
-        </n-button>
-      </n-popselect>
-
+      <edit-shortcut-key />
+      
       <!-- 缩放比例 -->
       <n-select
         :disabled="lockScale"
@@ -61,13 +55,12 @@
 import { reactive, ref, toRefs, watchEffect } from 'vue'
 import { icon } from '@/plugins'
 import { EditHistory } from '../EditHistory/index'
+import EditShortcutKey from '../EditShortcutKey/index.vue'
 import { useDesignStore } from '@/store/modules/designStore/designStore'
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
 import { EditCanvasTypeEnum } from '@/store/modules/chartEditStore/chartEditStore.d'
 
 const { LockClosedOutlineIcon, LockOpenOutlineIcon } = icon.ionicons5
-const { DicomOverlayIcon } = icon.carbon
-
 
 // 全局颜色
 const designStore = useDesignStore()
@@ -132,54 +125,6 @@ const sliderMaks = reactive({
   100: ''
 })
 
-// 快捷键
-const shortcutKeyOptions = [
-  {
-    label: '键盘快捷键列表',
-    value: '1'
-  },
-  {
-    label: 'Ctrl + ↑ 向上移动',
-    value: '2'
-  },
-  {
-    label: 'Ctrl + → 向右移动',
-    value: '3'
-  },
-  {
-    label: 'Ctrl + ↓ 向下移动',
-    value: '4'
-  },
-  {
-    label: 'Ctrl + ← 向左移动',
-    value: '5'
-  },
-  {
-    label: 'Ctrl + Delete 删除',
-    value: '6'
-  },
-  {
-    label: 'Ctrl + C 复制',
-    value: '7'
-  },
-  {
-    label: 'Ctrl + X 剪切',
-    value: '8'
-  },
-  {
-    label: 'Ctrl + V 粘贴',
-    value: '9'
-  },
-  {
-    label: 'Ctrl + Z 后退',
-    value: '10'
-  },
-  {
-    label: 'Ctrl + Shift + Z 前进',
-    value: '11'
-  }
-]
-
 // 监听 scale 变化
 watchEffect(() => {
   const value = (scale.value * 100).toFixed(0)
@@ -189,7 +134,7 @@ watchEffect(() => {
 </script>
 
 <style lang="scss" scoped>
-@include go(edit-bottom) {
+@include go('edit-bottom') {
   width: 100%;
   padding: 0 10px;
   display: flex;
diff --git a/src/views/chart/ContentEdit/components/EditShortcutKey/ShortcutKeyModal.vue b/src/views/chart/ContentEdit/components/EditShortcutKey/ShortcutKeyModal.vue
new file mode 100644
index 00000000..0f9a507b
--- /dev/null
+++ b/src/views/chart/ContentEdit/components/EditShortcutKey/ShortcutKeyModal.vue
@@ -0,0 +1,102 @@
+<template>
+  <n-modal v-model:show="modelShow" @afterLeave="closeHandle">
+    <n-table class="model-content" :bordered="false" :single-line="false">
+      <thead>
+        <tr>
+          <th>功能</th>
+          <th>Win 快捷键</th>
+          <th>Mac 快捷键</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr v-for="(item, index) in shortcutKeyOptions" :key="index">
+          <td>{{ item.label }}</td>
+          <td>{{ item.win }}</td>
+          <td><span class="fs">{{ item.mac.substr(0,1) }}</span>  + {{ item.mac.substr(3) }}</td>
+        </tr>
+      </tbody>
+    </n-table>
+  </n-modal>
+</template>
+
+<script setup lang="ts">
+import { icon } from '@/plugins'
+import { WinKeyboard, MacKeyboard } from '@/enums/editPageEnum'
+
+const { CloseIcon } = icon.ionicons5
+
+const emit = defineEmits(['update:modelShow'])
+
+defineProps({
+  modelShow: Boolean,
+})
+
+// 快捷键
+const shortcutKeyOptions = [
+  {
+    label: '向上移动',
+    win: `${WinKeyboard.CTRL.toUpperCase()} + ↑ `,
+    mac: `${MacKeyboard.CTRL.toUpperCase()} + ↑ `,
+  },
+  {
+    label: '向右移动',
+    win: `${WinKeyboard.CTRL.toUpperCase()} + → `,
+    mac: `${MacKeyboard.CTRL.toUpperCase()} + → `,
+  },
+  {
+    label: '向下移动',
+    win: `${WinKeyboard.CTRL.toUpperCase()} + ↓ `,
+    mac: `${MacKeyboard.CTRL.toUpperCase()} + ↓ `,
+  },
+  {
+    label: '向左移动',
+    win: `${WinKeyboard.CTRL.toUpperCase()} + ← `,
+    mac: `${MacKeyboard.CTRL.toUpperCase()} + ← `,
+  },
+  {
+    label: '删除',
+    win: 'Delete',
+    mac: `${MacKeyboard.CTRL.toUpperCase()} + Backspace `,
+  },
+  {
+    label: '复制',
+    win: `${WinKeyboard.CTRL.toUpperCase()} + C `,
+    mac: `${MacKeyboard.CTRL.toUpperCase()} + C `,
+  },
+  {
+    label: '剪切',
+    win: `${WinKeyboard.CTRL.toUpperCase()} + X `,
+    mac: `${MacKeyboard.CTRL.toUpperCase()} + X `,
+  },
+  {
+    label: '粘贴',
+    win: `${WinKeyboard.CTRL.toUpperCase()} + V `,
+    mac: `${MacKeyboard.CTRL.toUpperCase()} + V `,
+  },
+  {
+    label: '后退',
+    win: `${WinKeyboard.CTRL.toUpperCase()} + Z `,
+    mac: `${MacKeyboard.CTRL.toUpperCase()} + Z `,
+  },
+  {
+    label: '前进',
+    win: `${WinKeyboard.CTRL.toUpperCase()} + ${WinKeyboard.SHIFT.toUpperCase()} + Z `,
+    mac: `${MacKeyboard.CTRL.toUpperCase()} + ${MacKeyboard.SHIFT.toUpperCase()} + Z `,
+  },
+]
+const closeHandle = () => {
+  emit('update:modelShow', false)
+}
+</script>
+
+<style lang="scss" scoped>
+.model-content {
+  width: 50vw;
+  padding-bottom: 20px;
+  overflow: hidden;
+  border-radius: 15px;
+  .fs {
+    font-size: 22px
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/chart/ContentEdit/components/EditShortcutKey/index.ts b/src/views/chart/ContentEdit/components/EditShortcutKey/index.ts
new file mode 100644
index 00000000..f7c25095
--- /dev/null
+++ b/src/views/chart/ContentEdit/components/EditShortcutKey/index.ts
@@ -0,0 +1,2 @@
+import EditShortcutKey from './index.vue'
+export { EditShortcutKey }
\ No newline at end of file
diff --git a/src/views/chart/ContentEdit/components/EditShortcutKey/index.vue b/src/views/chart/ContentEdit/components/EditShortcutKey/index.vue
new file mode 100644
index 00000000..1ffc8163
--- /dev/null
+++ b/src/views/chart/ContentEdit/components/EditShortcutKey/index.vue
@@ -0,0 +1,41 @@
+<template>
+  <div class="go-edit-shortcut">
+    <shortcut-key-modal v-model:modelShow="modelShow"></shortcut-key-modal>
+    <n-tooltip trigger="hover">
+      <template #trigger>
+        <n-button
+          class="scale-btn"
+          secondary
+          size="small"
+          @click="modelShow = true"
+        >
+          <n-icon size="21" :depth="3">
+            <dicom-overlay-icon></dicom-overlay-icon>
+          </n-icon>
+        </n-button>
+      </template>
+      <span>快捷键</span>
+    </n-tooltip>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue'
+import { icon } from '@/plugins'
+import ShortcutKeyModal from './ShortcutKeyModal.vue'
+
+const { DicomOverlayIcon } = icon.carbon
+const modelShow = ref<boolean>(false)
+</script>
+
+<style lang="scss" scoped>
+@include go('edit-shortcut') {
+  .scale-btn {
+    margin: 0 10px 0 0;
+    .btn-text {
+      font-size: 12px;
+      margin-right: 3px;
+    }
+  }
+}
+</style>