From ebbd788fbb2c0b45d4473798efc57eec8ba74a25 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期二, 18 六月 2024 14:51:16 +0800
Subject: [PATCH] 版本更新至2.11.5
---
src/layouts/default/setting/SettingDrawer.tsx | 64 ++++++++++++++++++--------------
1 files changed, 36 insertions(+), 28 deletions(-)
diff --git a/src/layouts/default/setting/SettingDrawer.tsx b/src/layouts/default/setting/SettingDrawer.tsx
index 9dc3ac1..8f6ca0f 100644
--- a/src/layouts/default/setting/SettingDrawer.tsx
+++ b/src/layouts/default/setting/SettingDrawer.tsx
@@ -1,25 +1,25 @@
import { defineComponent, computed, unref } from 'vue';
-import { BasicDrawer } from '/@/components/Drawer/index';
+import { BasicDrawer } from '@/components/Drawer';
import { Divider } from 'ant-design-vue';
import {
TypePicker,
- // ThemeColorPicker,
+ ThemeColorPicker,
SettingFooter,
SwitchItem,
SelectItem,
InputNumberItem,
} from './components';
-// import { AppDarkModeToggle } from '/@/components/Application';
+import { AppDarkModeToggle } from '@/components/Application';
-import { MenuTypeEnum, TriggerEnum } from '/@/enums/menuEnum';
+import { MenuTypeEnum, TriggerEnum } from '@/enums/menuEnum';
-import { useRootSetting } from '/@/hooks/setting/useRootSetting';
-import { useMenuSetting } from '/@/hooks/setting/useMenuSetting';
-import { useHeaderSetting } from '/@/hooks/setting/useHeaderSetting';
-import { useMultipleTabSetting } from '/@/hooks/setting/useMultipleTabSetting';
-import { useTransitionSetting } from '/@/hooks/setting/useTransitionSetting';
-import { useI18n } from '/@/hooks/web/useI18n';
+import { useRootSetting } from '@/hooks/setting/useRootSetting';
+import { useMenuSetting } from '@/hooks/setting/useMenuSetting';
+import { useHeaderSetting } from '@/hooks/setting/useHeaderSetting';
+import { useMultipleTabSetting } from '@/hooks/setting/useMultipleTabSetting';
+import { useTransitionSetting } from '@/hooks/setting/useTransitionSetting';
+import { useI18n } from '@/hooks/web/useI18n';
import { baseHandler } from './handler';
@@ -29,7 +29,7 @@
topMenuAlignOptions,
getMenuTriggerOptions,
routerTransitionOptions,
- menuTypeList,
+ menuTypeListEnum,
mixSidebarTriggerOptions,
} from './enum';
@@ -37,7 +37,8 @@
// HEADER_PRESET_BG_COLOR_LIST,
// SIDE_BAR_BG_COLOR_LIST,
// APP_PRESET_COLOR_LIST,
-// } from '/@/settings/designSetting';
+// } from '@/settings/designSetting';
+import { SIDE_BAR_BG_COLOR_LIST } from '@/settings/designSetting';
const { t } = useI18n();
@@ -73,7 +74,7 @@
getTopMenuAlign,
getAccordion,
getMenuWidth,
- // getMenuBgColor,
+ getMenuBgColor,
getIsTopMenu,
getSplit,
getIsMixSidebar,
@@ -89,7 +90,8 @@
getShowSearch,
} = useHeaderSetting();
- const { getShowMultipleTab, getShowQuick, getShowRedo, getShowFold } = useMultipleTabSetting();
+ const { getShowMultipleTab, getShowQuick, getShowRedo, getShowFold, getAutoCollapse } =
+ useMultipleTabSetting();
const getShowMenuRef = computed(() => {
return unref(getShowMenu) && !unref(getIsHorizontal);
@@ -99,8 +101,8 @@
return (
<>
<TypePicker
- menuTypeList={menuTypeList}
- handler={(item: (typeof menuTypeList)[0]) => {
+ menuTypeList={menuTypeListEnum}
+ handler={(item: (typeof menuTypeListEnum)[0]) => {
baseHandler(HandlerEnum.CHANGE_LAYOUT, {
mode: item.mode,
type: item.type,
@@ -123,15 +125,15 @@
// );
// }
- // function renderSiderTheme() {
- // return (
- // <ThemeColorPicker
- // colorList={SIDE_BAR_BG_COLOR_LIST}
- // def={unref(getMenuBgColor)}
- // event={HandlerEnum.MENU_THEME}
- // />
- // );
- // }
+ function renderSideBarTheme() {
+ return (
+ <ThemeColorPicker
+ colorList={SIDE_BAR_BG_COLOR_LIST}
+ def={unref(getMenuBgColor)}
+ event={HandlerEnum.MENU_THEME}
+ />
+ );
+ }
// function renderMainTheme() {
// return (
@@ -220,6 +222,12 @@
event={HandlerEnum.MENU_FIXED}
def={unref(getMenuFixed)}
disabled={!unref(getShowMenuRef) || unref(getIsMixSidebar)}
+ />
+ <SwitchItem
+ title={t('layout.setting.autoCollapseTabsInFold')}
+ event={HandlerEnum.TABS_AUTO_COLLAPSE}
+ def={unref(getAutoCollapse)}
+ disabled={!unref(getShowMultipleTab)}
/>
<SelectItem
title={t('layout.setting.mixSidebarTrigger')}
@@ -404,15 +412,15 @@
class="setting-drawer"
>
{unref(getShowDarkModeToggle) && <Divider>{() => t('layout.setting.darkMode')}</Divider>}
- {/* {unref(getShowDarkModeToggle) && <AppDarkModeToggle class="mx-auto" />} */}
+ {unref(getShowDarkModeToggle) && <AppDarkModeToggle class="mx-auto" />}
<Divider>{() => t('layout.setting.navMode')}</Divider>
{renderSidebar()}
{/* <Divider>{() => t('layout.setting.sysTheme')}</Divider>
{renderMainTheme()}
<Divider>{() => t('layout.setting.headerTheme')}</Divider>
- {renderHeaderTheme()}
+ {renderHeaderTheme()} */}
<Divider>{() => t('layout.setting.sidebarTheme')}</Divider>
- {renderSiderTheme()} */}
+ {renderSideBarTheme()}
<Divider>{() => t('layout.setting.interfaceFunction')}</Divider>
{renderFeatures()}
<Divider>{() => t('layout.setting.interfaceDisplay')}</Divider>
--
Gitblit v1.9.3