From ea929ac4273e9ddebb3ec30c9430bb99cf437b0c Mon Sep 17 00:00:00 2001
From: Hooray <304327508@qq.com>
Date: Wed, 26 Feb 2025 17:42:11 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=BF=AB=E6=8D=B7=E9=94=AE?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E7=BB=91=E5=AE=9A/=E8=A7=A3=E7=BB=91?=
 =?UTF-8?q?=E8=BF=81=E7=A7=BB=E5=88=B0=E5=90=84=E8=87=AA=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/components/HotkeysIntro/index.vue |  8 +++++++
 src/layouts/components/MainSidebar/index.vue  | 20 ++++++++++++++++
 .../Topbar/Toolbar/PageReload/index.vue       | 13 +++++++++++
 src/layouts/index.vue                         | 23 -------------------
 4 files changed, 41 insertions(+), 23 deletions(-)

diff --git a/src/layouts/components/HotkeysIntro/index.vue b/src/layouts/components/HotkeysIntro/index.vue
index d8a70e3a..c073e1e2 100755
--- a/src/layouts/components/HotkeysIntro/index.vue
+++ b/src/layouts/components/HotkeysIntro/index.vue
@@ -54,6 +54,14 @@ onMounted(() => {
               </div>
               激活下一个主导航
             </li>
+            <li class="flex-baseline gap-2 py-1">
+              <div class="flex-shrink-0 space-x-1">
+                <FaKbd>{{ settingsStore.os === 'mac' ? '⌥' : 'Alt' }}</FaKbd>
+                <FaKbd>{{ settingsStore.os === 'mac' ? '⇧' : 'Shift' }}</FaKbd>
+                <FaKbd>`</FaKbd>
+              </div>
+              激活上一个主导航
+            </li>
           </ul>
         </div>
         <div v-if="settingsStore.settings.tabbar.enable && settingsStore.settings.tabbar.enableHotkeys">
diff --git a/src/layouts/components/MainSidebar/index.vue b/src/layouts/components/MainSidebar/index.vue
index e26c8708..70308033 100755
--- a/src/layouts/components/MainSidebar/index.vue
+++ b/src/layouts/components/MainSidebar/index.vue
@@ -2,6 +2,7 @@
 import { useSlots } from '@/slots'
 import useMenuStore from '@/store/modules/menu'
 import useSettingsStore from '@/store/modules/settings'
+import hotkeys from 'hotkeys-js'
 import Logo from '../Logo/index.vue'
 
 defineOptions({
@@ -12,6 +13,25 @@ const settingsStore = useSettingsStore()
 const menuStore = useMenuStore()
 
 const { switchTo } = useMenu()
+
+onMounted(() => {
+  hotkeys('alt+`', (e) => {
+    if (settingsStore.settings.menu.enableHotkeys && ['side', 'head'].includes(settingsStore.settings.menu.mode)) {
+      e.preventDefault()
+      switchTo(menuStore.actived + 1 < menuStore.allMenus.length ? menuStore.actived + 1 : 0)
+    }
+  })
+  hotkeys('alt+shift+`', (e) => {
+    if (settingsStore.settings.menu.enableHotkeys && ['side', 'head'].includes(settingsStore.settings.menu.mode)) {
+      e.preventDefault()
+      switchTo(menuStore.actived - 1 >= 0 ? menuStore.actived - 1 : menuStore.allMenus.length - 1)
+    }
+  })
+})
+onUnmounted(() => {
+  hotkeys.unbind('alt+`')
+  hotkeys.unbind('alt+shift+`')
+})
 </script>
 
 <template>
diff --git a/src/layouts/components/Topbar/Toolbar/PageReload/index.vue b/src/layouts/components/Topbar/Toolbar/PageReload/index.vue
index 7192af27..3f333b08 100644
--- a/src/layouts/components/Topbar/Toolbar/PageReload/index.vue
+++ b/src/layouts/components/Topbar/Toolbar/PageReload/index.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import useSettingsStore from '@/store/modules/settings'
+import hotkeys from 'hotkeys-js'
 
 defineOptions({
   name: 'PageReload',
@@ -10,6 +11,18 @@ const mainPage = useMainPage()
 
 const isAnimating = ref(false)
 
+onMounted(() => {
+  hotkeys('f5', (e) => {
+    if (settingsStore.settings.toolbar.pageReload) {
+      e.preventDefault()
+      mainPage.reload()
+    }
+  })
+})
+onUnmounted(() => {
+  hotkeys.unbind('f5')
+})
+
 function handleClick() {
   isAnimating.value = true
   mainPage.reload()
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index 092958b6..51096c63 100755
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -4,7 +4,6 @@ import useKeepAliveStore from '@/store/modules/keepAlive'
 import useMenuStore from '@/store/modules/menu'
 import useSettingsStore from '@/store/modules/settings'
 import eventBus from '@/utils/eventBus'
-import hotkeys from 'hotkeys-js'
 import AppSetting from './components/AppSetting/index.vue'
 import Header from './components/Header/index.vue'
 import HotkeysIntro from './components/HotkeysIntro/index.vue'
@@ -23,9 +22,6 @@ const settingsStore = useSettingsStore()
 const keepAliveStore = useKeepAliveStore()
 const menuStore = useMenuStore()
 
-const mainPage = useMainPage()
-const menu = useMenu()
-
 // 头部当前实际高度
 const headerActualHeight = computed(() => {
   let actualHeight = Number.parseInt(getComputedStyle(document.documentElement).getPropertyValue('--g-header-height'))
@@ -89,25 +85,6 @@ watch(() => routeInfo.path, () => {
   }
 })
 
-onMounted(() => {
-  hotkeys('f5', (e) => {
-    if (settingsStore.settings.toolbar.pageReload) {
-      e.preventDefault()
-      mainPage.reload()
-    }
-  })
-  hotkeys('alt+`', (e) => {
-    if (settingsStore.settings.menu.enableHotkeys) {
-      e.preventDefault()
-      menu.switchTo(menuStore.actived + 1 < menuStore.allMenus.length ? menuStore.actived + 1 : 0)
-    }
-  })
-})
-onUnmounted(() => {
-  hotkeys.unbind('f5')
-  hotkeys.unbind('alt+`')
-})
-
 const enableAppSetting = import.meta.env.VITE_APP_SETTING
 </script>