From 7938a844bfbaa148c341381a05f5fa2c1bbfdc91 Mon Sep 17 00:00:00 2001
From: likui628 <90845831+likui628@users.noreply.github.com>
Date: Fri, 17 Nov 2023 22:11:45 +0800
Subject: [PATCH] =?UTF-8?q?refactor(layouts):=20SwitchItem=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E4=BC=A0=E5=85=A5callback?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/setting/components/Content.vue | 61 +++++++++++--------
 .../setting/components/Features.vue           | 57 ++++++++++-------
 .../setting/components/SwitchItem.vue         | 20 +++---
 .../setting/components/ThemeEditor.vue        |  8 +--
 .../setting/components/ThemeSwitch.vue        | 39 ------------
 .../setting/components/Transitions.vue        | 21 ++++---
 6 files changed, 97 insertions(+), 109 deletions(-)
 delete mode 100644 packages/layouts/src/components/setting/components/ThemeSwitch.vue

diff --git a/packages/layouts/src/components/setting/components/Content.vue b/packages/layouts/src/components/setting/components/Content.vue
index b2662649..6022befe 100644
--- a/packages/layouts/src/components/setting/components/Content.vue
+++ b/packages/layouts/src/components/setting/components/Content.vue
@@ -8,6 +8,11 @@ import {
   useHeaderSetting,
   useMultipleTabSetting,
 } from '@vben/hooks'
+
+import { context } from '../../../../bridge'
+const { useAppConfig } = context
+const { baseHandler } = useAppConfig()
+
 const { t } = useI18n()
 
 const {
@@ -26,80 +31,86 @@ const { getShowHeader } = useHeaderSetting()
 
 const { getShowMultipleTab, getShowQuick, getShowRedo, getShowFold } =
   useMultipleTabSetting()
+
+const eventHandler = (evt: HandlerSettingEnum, val: boolean) => {
+  baseHandler(evt, val)
+}
 </script>
 <template>
   <VbenSpace vertical>
     <SwitchItem
       :title="t('layout.setting.breadcrumb')"
-      :def="getShowBreadCrumb"
-      :event="HandlerSettingEnum.SHOW_BREADCRUMB"
+      :value="getShowBreadCrumb"
+      :callback="(v) => eventHandler(HandlerSettingEnum.SHOW_BREADCRUMB, v)"
       :disabled="!getShowHeader"
     />
     <SwitchItem
       :title="t('layout.setting.breadcrumbIcon')"
-      :def="getShowBreadCrumbIcon"
-      :event="HandlerSettingEnum.SHOW_BREADCRUMB_ICON"
+      :value="getShowBreadCrumbIcon"
+      :callback="
+        (v) => eventHandler(HandlerSettingEnum.SHOW_BREADCRUMB_ICON, v)
+      "
       :disabled="!getShowBreadCrumb"
     />
     <SwitchItem
       :title="t('layout.setting.tabs')"
-      :def="getShowMultipleTab"
-      :event="HandlerSettingEnum.TABS_SHOW"
+      :value="getShowMultipleTab"
+      :callback="(v) => eventHandler(HandlerSettingEnum.TABS_SHOW, v)"
     />
     <SwitchItem
       :title="t('layout.setting.tabsRedoBtn')"
-      :def="getShowRedo"
-      :event="HandlerSettingEnum.TABS_SHOW_REDO"
+      :value="getShowRedo"
+      :callback="(v) => eventHandler(HandlerSettingEnum.TABS_SHOW_REDO, v)"
       :disabled="!getShowMultipleTab"
     />
     <SwitchItem
       :title="t('layout.setting.tabsQuickBtn')"
-      :def="getShowQuick"
-      :event="HandlerSettingEnum.TABS_SHOW_QUICK"
+      :value="getShowQuick"
+      :callback="(v) => eventHandler(HandlerSettingEnum.TABS_SHOW_QUICK, v)"
       :disabled="!getShowMultipleTab"
     />
     <SwitchItem
       :title="t('layout.setting.tabsFoldBtn')"
-      :def="getShowFold"
-      :event="HandlerSettingEnum.TABS_SHOW_FOLD"
+      :value="getShowFold"
+      :callback="(v) => eventHandler(HandlerSettingEnum.TABS_SHOW_FOLD, v)"
       :disabled="!getShowMultipleTab"
     />
     <SwitchItem
       :title="t('layout.setting.sidebar')"
       :def="getShowMenu"
-      :event="HandlerSettingEnum.MENU_SHOW_SIDEBAR"
+      :callback="(v) => eventHandler(HandlerSettingEnum.MENU_SHOW_SIDEBAR, v)"
       :disabled="getIsHorizontal"
     />
     <SwitchItem
       :title="t('layout.setting.header')"
-      :def="getShowHeader"
-      :event="HandlerSettingEnum.HEADER_SHOW"
+      :value="getShowHeader"
+      :callback="(v) => eventHandler(HandlerSettingEnum.HEADER_SHOW, v)"
     />
     <SwitchItem
       title="Logo"
-      :def="getShowLogo"
-      :event="HandlerSettingEnum.SHOW_LOGO"
+      :value="getShowLogo"
+      :callback="(v) => eventHandler(HandlerSettingEnum.SHOW_LOGO, v)"
       :disabled="getIsMixSidebar"
     />
     <SwitchItem
       :title="t('layout.setting.footer')"
-      :def="getShowFooter"
-      :event="HandlerSettingEnum.SHOW_FOOTER"
+      :value="getShowFooter"
+      :callback="(v) => eventHandler(HandlerSettingEnum.SHOW_FOOTER, v)"
     />
     <SwitchItem
       :title="t('layout.setting.fullContent')"
-      :def="getFullContent"
-      :event="HandlerSettingEnum.FULL_CONTENT"
+      :value="getFullContent"
+      :callback="(v) => eventHandler(HandlerSettingEnum.FULL_CONTENT, v)"
     />
     <SwitchItem
       :title="t('layout.setting.grayMode')"
-      :def="getGrayMode"
-      :event="HandlerSettingEnum.GRAY_MODE"
+      :value="getGrayMode"
+      :callback="(v) => eventHandler(HandlerSettingEnum.GRAY_MODE, v)"
     />
     <SwitchItem
       :title="t('layout.setting.colorWeak')"
-      :def="getColorWeak"
-      :event="HandlerSettingEnum.COLOR_WEAK"
+      :value="getColorWeak"
+      :callback="(v) => eventHandler(HandlerSettingEnum.COLOR_WEAK, v)"
     />
   </VbenSpace>
 </template>
diff --git a/packages/layouts/src/components/setting/components/Features.vue b/packages/layouts/src/components/setting/components/Features.vue
index 7173587a..b9076a2e 100644
--- a/packages/layouts/src/components/setting/components/Features.vue
+++ b/packages/layouts/src/components/setting/components/Features.vue
@@ -19,7 +19,8 @@ import { useI18n } from '@vben/locale'
 
 const { t } = useI18n()
 
-const { useMenuSetting, useHeaderSetting, useRootSetting } = context
+const { useMenuSetting, useHeaderSetting, useRootSetting, useAppConfig } =
+  context
 
 const { getContentMode, getLockTime } = useRootSetting()
 
@@ -59,73 +60,85 @@ const some = triggerOptions.some((item) => item.value === unref(getTrigger))
 if (!some) {
   setMenuSetting({ trigger: TriggerEnum.FOOTER })
 }
+
+const { baseHandler } = useAppConfig()
+const eventHandler = (evt: HandlerSettingEnum, val: boolean) => {
+  baseHandler(evt, val)
+}
 </script>
 <template>
   <VbenSpace vertical>
     <SwitchItem
       :title="t('layout.setting.splitMenu')"
-      :def="getSplit"
-      :event="HandlerSettingEnum.MENU_SPLIT"
+      :value="getSplit"
+      :callback="(v) => eventHandler(HandlerSettingEnum.MENU_SPLIT, v)"
       :disabled="!getShowMenuRef || getMenuType !== NavBarModeEnum.MIX"
     />
     <SwitchItem
       :title="t('layout.setting.mixSidebarFixed')"
-      :def="getMixSideFixed"
-      :event="HandlerSettingEnum.MENU_FIXED_MIX_SIDEBAR"
+      :value="getMixSideFixed"
+      :callback="
+        (v) => eventHandler(HandlerSettingEnum.MENU_FIXED_MIX_SIDEBAR, v)
+      "
       :disabled="!getIsMixSidebar"
     />
     <SwitchItem
       :title="t('layout.setting.closeMixSidebarOnChange')"
-      :def="getCloseMixSidebarOnChange"
-      :event="HandlerSettingEnum.MENU_CLOSE_MIX_SIDEBAR_ON_CHANGE"
+      :value="getCloseMixSidebarOnChange"
+      :callback="
+        (v) =>
+          eventHandler(HandlerSettingEnum.MENU_CLOSE_MIX_SIDEBAR_ON_CHANGE, v)
+      "
       :disabled="!getIsMixSidebar"
     />
     <SwitchItem
       :title="t('layout.setting.menuCollapse')"
-      :def="getCollapsed"
-      :event="HandlerSettingEnum.MENU_COLLAPSED"
+      :value="getCollapsed"
+      :callback="(v) => eventHandler(HandlerSettingEnum.MENU_COLLAPSED, v)"
       :disabled="!getShowMenuRef"
     />
     <SwitchItem
       :title="t('layout.setting.menuDrag')"
-      :def="getCanDrag"
-      :event="HandlerSettingEnum.MENU_HAS_DRAG"
+      :value="getCanDrag"
+      :callback="(v) => eventHandler(HandlerSettingEnum.MENU_HAS_DRAG, v)"
       :disabled="!getShowMenuRef"
     />
     <SwitchItem
       :title="t('layout.setting.menuSearch')"
-      :def="getShowSearch"
-      :event="HandlerSettingEnum.HEADER_SEARCH"
+      :value="getShowSearch"
+      :callback="(v) => eventHandler(HandlerSettingEnum.HEADER_SEARCH, v)"
       :disabled="!getShowHeader"
     />
     <SwitchItem
       :title="t('layout.setting.menuAccordion')"
-      :def="getAccordion"
-      :event="HandlerSettingEnum.MENU_ACCORDION"
+      :value="getAccordion"
+      :callback="(v) => eventHandler(HandlerSettingEnum.MENU_ACCORDION, v)"
       :disabled="!getShowMenuRef"
     />
     <SwitchItem
       :title="t('layout.setting.collapseMenuDisplayName')"
-      :def="getCollapsedShowTitle"
-      :event="HandlerSettingEnum.MENU_COLLAPSED_SHOW_TITLE"
+      :value="getCollapsedShowTitle"
+      :callback="
+        (v) => eventHandler(HandlerSettingEnum.MENU_COLLAPSED_SHOW_TITLE, v)
+      "
       :disabled="!getShowMenuRef || !getCollapsed || getIsMixSidebar"
     />
     <SwitchItem
       :title="t('layout.setting.fixedHeader')"
-      :def="getHeaderFixed"
-      :event="HandlerSettingEnum.HEADER_FIXED"
+      :value="getHeaderFixed"
+      :callback="(v) => eventHandler(HandlerSettingEnum.HEADER_FIXED, v)"
       :disabled="!getShowHeader"
     />
     <SwitchItem
       :title="t('layout.setting.fixedSideBar')"
-      :def="getMenuFixed"
-      :event="HandlerSettingEnum.MENU_FIXED"
+      :value="getMenuFixed"
+      :callback="(v) => eventHandler(HandlerSettingEnum.MENU_FIXED, v)"
       :disabled="!getShowMenuRef || getIsMixSidebar"
     />
     <SelectItem
       :title="t('layout.setting.mixSidebarTrigger')"
       :options="mixSidebarTriggerOptions"
-      :def="getMixSideTrigger"
+      :value="getMixSideTrigger"
       :event="HandlerSettingEnum.MENU_TRIGGER_MIX_SIDEBAR"
       :disabled="!getIsMixSidebar"
     />
diff --git a/packages/layouts/src/components/setting/components/SwitchItem.vue b/packages/layouts/src/components/setting/components/SwitchItem.vue
index 3aedd65c..ca4716e8 100644
--- a/packages/layouts/src/components/setting/components/SwitchItem.vue
+++ b/packages/layouts/src/components/setting/components/SwitchItem.vue
@@ -1,32 +1,32 @@
 <script lang="ts" setup name="SwitchItem">
 import { PropType } from 'vue'
-import { HandlerSettingEnum } from '@vben/constants'
-import { context } from '../../../../bridge'
-const { useAppConfig } = context
-const { baseHandler } = useAppConfig()
 
 const props = defineProps({
   title: { type: String, default: '' },
-  def: {
+  value: {
     type: Boolean as PropType<boolean>,
   },
-  event: {
-    type: Number as PropType<HandlerSettingEnum>,
+  callback: {
+    type: Function as PropType<(val: boolean) => void>,
     required: true,
   },
   disabled: {
     type: Boolean,
   },
 })
-const onChange = (value: any) => {
-  baseHandler(props.event, value)
+const onChange = (value: boolean) => {
+  props.callback(value)
 }
 </script>
 <template>
   <div class="switch-item">
     <VbenSpace justify="space-between" align="center">
       <span>{{ title }}</span>
-      <VbenSwitch :value="def" :disabled="disabled" @update:value="onChange">
+      <VbenSwitch
+        :value="props.value"
+        :disabled="disabled"
+        @update:value="onChange"
+      >
         <template #checked-icon>
           <VbenIconify icon="ant-design:check-outlined" color="#18A058" />
         </template>
diff --git a/packages/layouts/src/components/setting/components/ThemeEditor.vue b/packages/layouts/src/components/setting/components/ThemeEditor.vue
index 400c3c81..439adc5c 100644
--- a/packages/layouts/src/components/setting/components/ThemeEditor.vue
+++ b/packages/layouts/src/components/setting/components/ThemeEditor.vue
@@ -1,9 +1,7 @@
 <script lang="ts" setup>
 import {
   APP_PRESET_COLOR_LIST,
-  HandlerSettingEnum,
   HEADER_PRESET_BG_COLOR_LIST,
-  SIDE_BAR_BG_COLOR_LIST,
   ThemeChangeEnum,
 } from '@vben/constants'
 import { useI18n } from '@vben/locale'
@@ -11,13 +9,11 @@ import { useAppTheme } from '@vben/hooks'
 import { context } from '../../../../bridge'
 import ThemeColorPicker from './ThemeColorPicker.vue'
 import SwitchItem from '#/components/setting/components/SwitchItem.vue'
-import ThemeSwitch from '#/components/setting/components/ThemeSwitch.vue'
 
 const { t } = useI18n()
 
-const { useMenuSetting, useHeaderSetting } = context
+const { useHeaderSetting } = context
 
-const { getMenuBgColor } = useMenuSetting()
 const { getHeaderBgColor } = useHeaderSetting()
 
 const {
@@ -66,7 +62,7 @@ const {
         :colorList="HEADER_PRESET_BG_COLOR_LIST"
       />
     </VbenSpace>
-    <ThemeSwitch
+    <SwitchItem
       :title="t('layout.setting.sidebarDark')"
       :value="isSidebarDark"
       :callback="toggleSidebarTheme"
diff --git a/packages/layouts/src/components/setting/components/ThemeSwitch.vue b/packages/layouts/src/components/setting/components/ThemeSwitch.vue
deleted file mode 100644
index ca4716e8..00000000
--- a/packages/layouts/src/components/setting/components/ThemeSwitch.vue
+++ /dev/null
@@ -1,39 +0,0 @@
-<script lang="ts" setup name="SwitchItem">
-import { PropType } from 'vue'
-
-const props = defineProps({
-  title: { type: String, default: '' },
-  value: {
-    type: Boolean as PropType<boolean>,
-  },
-  callback: {
-    type: Function as PropType<(val: boolean) => void>,
-    required: true,
-  },
-  disabled: {
-    type: Boolean,
-  },
-})
-const onChange = (value: boolean) => {
-  props.callback(value)
-}
-</script>
-<template>
-  <div class="switch-item">
-    <VbenSpace justify="space-between" align="center">
-      <span>{{ title }}</span>
-      <VbenSwitch
-        :value="props.value"
-        :disabled="disabled"
-        @update:value="onChange"
-      >
-        <template #checked-icon>
-          <VbenIconify icon="ant-design:check-outlined" color="#18A058" />
-        </template>
-        <template #unchecked-icon>
-          <VbenIconify icon="ant-design:close-outlined" color="#BEBEBE" />
-        </template>
-      </VbenSwitch>
-    </VbenSpace>
-  </div>
-</template>
diff --git a/packages/layouts/src/components/setting/components/Transitions.vue b/packages/layouts/src/components/setting/components/Transitions.vue
index aab558a0..e8f7631f 100644
--- a/packages/layouts/src/components/setting/components/Transitions.vue
+++ b/packages/layouts/src/components/setting/components/Transitions.vue
@@ -8,7 +8,7 @@ import { useI18n } from '@vben/locale'
 
 const { t } = useI18n()
 
-const { useTransitionSetting } = context
+const { useTransitionSetting, useAppConfig } = context
 
 const {
   getOpenPageLoading,
@@ -16,23 +16,30 @@ const {
   getEnableTransition,
   getOpenNProgress,
 } = useTransitionSetting()
+
+const { baseHandler } = useAppConfig()
+const eventHandler = (evt: HandlerSettingEnum, val: boolean) => {
+  baseHandler(evt, val)
+}
 </script>
 <template>
   <VbenSpace vertical>
     <SwitchItem
       :title="t('layout.setting.progress')"
-      :def="getOpenNProgress"
-      :event="HandlerSettingEnum.OPEN_PROGRESS"
+      :value="getOpenNProgress"
+      :callback="(v) => eventHandler(HandlerSettingEnum.OPEN_PROGRESS, v)"
     />
     <SwitchItem
       :title="t('layout.setting.switchLoading')"
-      :def="getOpenPageLoading"
-      :event="HandlerSettingEnum.OPEN_PAGE_LOADING"
+      :value="getOpenPageLoading"
+      :callback="(v) => eventHandler(HandlerSettingEnum.OPEN_PAGE_LOADING, v)"
     />
     <SwitchItem
       :title="t('layout.setting.switchAnimation')"
-      :def="getEnableTransition"
-      :event="HandlerSettingEnum.OPEN_ROUTE_TRANSITION"
+      :value="getEnableTransition"
+      :callback="
+        (v) => eventHandler(HandlerSettingEnum.OPEN_ROUTE_TRANSITION, v)
+      "
     />
     <SelectItem
       :title="t('layout.setting.animationType')"