From 75d815d315717ae05e9e7a4faea7c17fcd17a003 Mon Sep 17 00:00:00 2001
From: Hooray Hu <304327508@qq.com>
Date: Thu, 28 Dec 2023 21:56:45 +0800
Subject: [PATCH] =?UTF-8?q?refactor!:=20=E5=BA=94=E7=94=A8=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=20`toolbar`=20=E5=AF=B9=E8=B1=A1=E5=86=85=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

BREAKING CHANGE: `toolbar.enableFullscreen` 变更为 `toolbar.fullscreen`
`toolbar.enablePageReload` 变更为 `toolbar.pageReload`
`toolbar.enableColorScheme` 变更为 `toolbar.colorScheme`
`breadcrumb.enable` 变更为 `toolbar.breadcrumb`
`navSearch.enable` 变更为 `toolbar.navSearch`
---
 src/layouts/components/AppSetting/index.vue   | 12 ++++----
 src/layouts/components/HotkeysIntro/index.vue |  2 +-
 src/layouts/components/Search/index.vue       |  4 +--
 src/layouts/components/Tools/index.vue        | 10 +++----
 .../components/Topbar/Toolbar/index.vue       |  2 +-
 src/layouts/components/Topbar/index.vue       |  2 +-
 src/layouts/index.vue                         |  2 +-
 src/settings.default.ts                       | 12 ++++----
 src/types/global.d.ts                         | 30 ++++++++-----------
 9 files changed, 35 insertions(+), 41 deletions(-)

diff --git a/src/layouts/components/AppSetting/index.vue b/src/layouts/components/AppSetting/index.vue
index 42b000c2..39f0b756 100755
--- a/src/layouts/components/AppSetting/index.vue
+++ b/src/layouts/components/AppSetting/index.vue
@@ -180,7 +180,7 @@ function handleCopy() {
       <div class="label">
         全屏
       </div>
-      <HToggle v-model="settingsStore.settings.toolbar.enableFullscreen" />
+      <HToggle v-model="settingsStore.settings.toolbar.fullscreen" />
     </div>
     <div class="setting-item">
       <div class="label">
@@ -189,7 +189,7 @@ function handleCopy() {
           <SvgIcon name="ri:question-line" />
         </HTooltip>
       </div>
-      <HToggle v-model="settingsStore.settings.toolbar.enablePageReload" />
+      <HToggle v-model="settingsStore.settings.toolbar.pageReload" />
     </div>
     <div class="setting-item">
       <div class="label">
@@ -198,7 +198,7 @@ function handleCopy() {
           <SvgIcon name="ri:question-line" />
         </HTooltip>
       </div>
-      <HToggle v-model="settingsStore.settings.toolbar.enableColorScheme" />
+      <HToggle v-model="settingsStore.settings.toolbar.colorScheme" />
     </div>
     <div v-if="settingsStore.mode === 'pc'" class="divider">
       面包屑导航
@@ -207,7 +207,7 @@ function handleCopy() {
       <div class="label">
         是否启用
       </div>
-      <HToggle v-model="settingsStore.settings.breadcrumb.enable" />
+      <HToggle v-model="settingsStore.settings.toolbar.breadcrumb" />
     </div>
     <div class="divider">
       页面
@@ -228,13 +228,13 @@ function handleCopy() {
           <SvgIcon name="ri:question-line" />
         </HTooltip>
       </div>
-      <HToggle v-model="settingsStore.settings.navSearch.enable" />
+      <HToggle v-model="settingsStore.settings.toolbar.navSearch" />
     </div>
     <div class="setting-item">
       <div class="label">
         是否启用快捷键
       </div>
-      <HToggle v-model="settingsStore.settings.navSearch.enableHotkeys" :disabled="!settingsStore.settings.navSearch.enable" />
+      <HToggle v-model="settingsStore.settings.navSearch.enableHotkeys" :disabled="!settingsStore.settings.toolbar.navSearch" />
     </div>
     <div class="divider">
       底部版权
diff --git a/src/layouts/components/HotkeysIntro/index.vue b/src/layouts/components/HotkeysIntro/index.vue
index 1db74578..a9e63371 100755
--- a/src/layouts/components/HotkeysIntro/index.vue
+++ b/src/layouts/components/HotkeysIntro/index.vue
@@ -31,7 +31,7 @@ onMounted(() => {
               <HKbd>I</HKbd>
               查看系统信息
             </li>
-            <li v-if="settingsStore.settings.navSearch.enable && settingsStore.settings.navSearch.enableHotkeys" class="py-1">
+            <li v-if="settingsStore.settings.toolbar.navSearch && settingsStore.settings.navSearch.enableHotkeys" class="py-1">
               <HKbd>{{ settingsStore.os === 'mac' ? '⌥' : 'Alt' }}</HKbd>
               <HKbd>S</HKbd>
               唤起导航搜索
diff --git a/src/layouts/components/Search/index.vue b/src/layouts/components/Search/index.vue
index 167f4cbc..1db84cb5 100755
--- a/src/layouts/components/Search/index.vue
+++ b/src/layouts/components/Search/index.vue
@@ -132,14 +132,14 @@ onMounted(() => {
     isShow.value = !isShow.value
   })
   hotkeys('alt+s', (e) => {
-    if (settingsStore.settings.navSearch.enable && settingsStore.settings.navSearch.enableHotkeys) {
+    if (settingsStore.settings.toolbar.navSearch && settingsStore.settings.navSearch.enableHotkeys) {
       e.preventDefault()
       initSourceList()
       isShow.value = true
     }
   })
   hotkeys('esc', (e) => {
-    if (settingsStore.settings.navSearch.enable && settingsStore.settings.navSearch.enableHotkeys) {
+    if (settingsStore.settings.toolbar.navSearch && settingsStore.settings.navSearch.enableHotkeys) {
       e.preventDefault()
       isShow.value = false
     }
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 71d5df84..b2c47867 100755
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -54,22 +54,22 @@ watch(() => userStore.avatar, () => {
 
 <template>
   <div class="tools flex items-center gap-4 whitespace-nowrap px-4">
-    <span v-if="settingsStore.settings.navSearch.enable && settingsStore.mode === 'pc'" class="group inline-flex cursor-pointer items-center gap-1 rounded-2 bg-stone-1 px-2 py-1.5 text-dark ring-stone-3 ring-inset transition dark:bg-stone-9 dark:text-white hover:ring-1 dark:ring-stone-7" @click="eventBus.emit('global-search-toggle')">
+    <span v-if="settingsStore.settings.toolbar.navSearch && settingsStore.mode === 'pc'" class="group inline-flex cursor-pointer items-center gap-1 rounded-2 bg-stone-1 px-2 py-1.5 text-dark ring-stone-3 ring-inset transition dark:bg-stone-9 dark:text-white hover:ring-1 dark:ring-stone-7" @click="eventBus.emit('global-search-toggle')">
       <SvgIcon name="ri:search-line" />
       <span class="text-sm text-stone-5 transition group-hover:text-dark dark:group-hover:text-white">搜索</span>
       <HKbd v-if="settingsStore.settings.navSearch.enableHotkeys" class="ml-2">{{ settingsStore.os === 'mac' ? '⌥' : 'Alt' }} S</HKbd>
     </span>
     <div class="flex items-center empty:hidden">
-      <span v-if="settingsStore.settings.navSearch.enable && settingsStore.mode === 'mobile'" class="item" @click="eventBus.emit('global-search-toggle')">
+      <span v-if="settingsStore.settings.toolbar.navSearch && settingsStore.mode === 'mobile'" class="item" @click="eventBus.emit('global-search-toggle')">
         <SvgIcon name="ri:search-line" />
       </span>
-      <span v-if="settingsStore.mode === 'pc' && settingsStore.settings.toolbar.enableFullscreen" class="item" @click="toggle">
+      <span v-if="settingsStore.mode === 'pc' && settingsStore.settings.toolbar.fullscreen" class="item" @click="toggle">
         <SvgIcon :name="isFullscreen ? 'ri:fullscreen-exit-line' : 'ri:fullscreen-line'" />
       </span>
-      <span v-if="settingsStore.settings.toolbar.enablePageReload" class="item" @click="mainPage.reload()">
+      <span v-if="settingsStore.settings.toolbar.pageReload" class="item" @click="mainPage.reload()">
         <SvgIcon name="iconoir:refresh-double" />
       </span>
-      <span v-if="settingsStore.settings.toolbar.enableColorScheme" class="item" @click="toggleColorScheme">
+      <span v-if="settingsStore.settings.toolbar.colorScheme" class="item" @click="toggleColorScheme">
         <SvgIcon :name="settingsStore.settings.app.colorScheme === 'light' ? 'ri:sun-line' : 'ri:moon-line'" />
       </span>
     </div>
diff --git a/src/layouts/components/Topbar/Toolbar/index.vue b/src/layouts/components/Topbar/Toolbar/index.vue
index 776cad6c..bae76e55 100755
--- a/src/layouts/components/Topbar/Toolbar/index.vue
+++ b/src/layouts/components/Topbar/Toolbar/index.vue
@@ -50,7 +50,7 @@ function pathCompile(path: string) {
       <div v-if="enableSubMenuCollapseButton" class="flex-center cursor-pointer px-2 py-1 transition-transform" :class="{ '-rotate-z-180': settingsStore.settings.menu.subMenuCollapse }" @click="settingsStore.toggleSidebarCollapse()">
         <SvgIcon name="toolbar-collapse" />
       </div>
-      <Breadcrumb v-if="settingsStore.mode === 'pc' && settingsStore.settings.breadcrumb.enable && settingsStore.settings.app.routeBaseOn !== 'filesystem'" class="breadcrumb">
+      <Breadcrumb v-if="settingsStore.mode === 'pc' && settingsStore.settings.toolbar.breadcrumb && settingsStore.settings.app.routeBaseOn !== 'filesystem'" class="breadcrumb">
         <TransitionGroup name="breadcrumb">
           <BreadcrumbItem v-for="(item, index) in breadcrumbList" :key="`${index}_${item.path}_${item.title}`" :to="index < breadcrumbList.length - 1 && item.path !== '' ? pathCompile(item.path) : ''">
             {{ item.title }}
diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue
index 8e285fac..2b025dd9 100755
--- a/src/layouts/components/Topbar/index.vue
+++ b/src/layouts/components/Topbar/index.vue
@@ -11,7 +11,7 @@ const settingsStore = useSettingsStore()
 const enableToolbar = computed(() => {
   return !(
     settingsStore.settings.menu.menuMode === 'head' && !settingsStore.settings.menu.enableSubMenuCollapseButton && (
-      !settingsStore.settings.breadcrumb.enable || settingsStore.settings.app.routeBaseOn === 'filesystem'
+      !settingsStore.settings.toolbar.breadcrumb || settingsStore.settings.app.routeBaseOn === 'filesystem'
     )
   )
 })
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index b90ee02d..eeba2600 100755
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -51,7 +51,7 @@ watch(() => routeInfo.path, () => {
 
 onMounted(() => {
   hotkeys('f5', (e) => {
-    if (settingsStore.settings.toolbar.enablePageReload) {
+    if (settingsStore.settings.toolbar.pageReload) {
       e.preventDefault()
       mainPage.reload()
     }
diff --git a/src/settings.default.ts b/src/settings.default.ts
index 2a715999..590f1d29 100755
--- a/src/settings.default.ts
+++ b/src/settings.default.ts
@@ -31,18 +31,16 @@ const globalSettingsDefault: RecursiveRequired<Settings.all> = {
     mode: 'static',
   },
   toolbar: {
-    enableFullscreen: false,
-    enablePageReload: false,
-    enableColorScheme: false,
-  },
-  breadcrumb: {
-    enable: true,
+    breadcrumb: true,
+    navSearch: true,
+    fullscreen: false,
+    pageReload: false,
+    colorScheme: false,
   },
   mainPage: {
     enableHotkeys: true,
   },
   navSearch: {
-    enable: true,
     enableHotkeys: true,
   },
   copyright: {
diff --git a/src/types/global.d.ts b/src/types/global.d.ts
index 59176e68..6745823f 100755
--- a/src/types/global.d.ts
+++ b/src/types/global.d.ts
@@ -113,28 +113,31 @@ declare namespace Settings {
     mode?: 'static' | 'fixed' | 'sticky'
   }
   interface toolbar {
+    /**
+     * 是否开启面包屑导航
+     * @默认值 `true`
+     */
+    breadcrumb?: boolean
+    /**
+     * 是否开启导航搜索
+     * @默认值 `true`
+     */
+    navSearch?: boolean
     /**
      * 是否开启全屏
      * @默认值 `false`
      */
-    enableFullscreen?: boolean
+    fullscreen?: boolean
     /**
      * 是否开启页面刷新
      * @默认值 `false`
      */
-    enablePageReload?: boolean
+    pageReload?: boolean
     /**
      * 是否开启颜色主题
      * @默认值 `false`
      */
-    enableColorScheme?: boolean
-  }
-  interface breadcrumb {
-    /**
-     * 是否开启面包屑导航
-     * @默认值 `true`
-     */
-    enable?: boolean
+    colorScheme?: boolean
   }
   interface mainPage {
     /**
@@ -144,11 +147,6 @@ declare namespace Settings {
     enableHotkeys?: boolean
   }
   interface navSearch {
-    /**
-     * 是否开启导航搜索
-     * @默认值 `true`
-     */
-    enable?: boolean
     /**
      * 是否开启导航搜索快捷键
      * @默认值 `true`
@@ -195,8 +193,6 @@ declare namespace Settings {
     topbar?: topbar
     /** 工具栏设置 */
     toolbar?: toolbar
-    /** 面包屑导航设置 */
-    breadcrumb?: breadcrumb
     /** 页面设置 */
     mainPage?: mainPage
     /** 导航搜索设置 */