From d9e0d8f77f29c00b14925f8398bc526682c9dd38 Mon Sep 17 00:00:00 2001 From: Ben Lin <maobin001@msn.com> Date: 星期二, 23 七月 2024 16:56:48 +0800 Subject: [PATCH] 增加系统配置项VITE_GLOB_SYS_TYPE, WMS/MES --- src/hooks/setting/useMenuSetting.ts | 24 +++++++++++------------- 1 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/hooks/setting/useMenuSetting.ts b/src/hooks/setting/useMenuSetting.ts index 3566bfd..173c254 100644 --- a/src/hooks/setting/useMenuSetting.ts +++ b/src/hooks/setting/useMenuSetting.ts @@ -1,12 +1,12 @@ -import type { MenuSetting } from '/#/config'; +import type { MenuSetting } from '#/config'; import { computed, unref, ref } from 'vue'; -import { useAppStore } from '/@/store/modules/app'; +import { useAppStore } from '@/store/modules/app'; -import { SIDE_BAR_MINI_WIDTH, SIDE_BAR_SHOW_TIT_MINI_WIDTH } from '/@/enums/appEnum'; -import { MenuModeEnum, MenuTypeEnum, TriggerEnum } from '/@/enums/menuEnum'; -import { useFullContent } from '/@/hooks/web/useFullContent'; +import { SIDE_BAR_MINI_WIDTH, SIDE_BAR_SHOW_TIT_MINI_WIDTH } from '@/enums/appEnum'; +import { MenuModeEnum, MenuTypeEnum, TriggerEnum } from '@/enums/menuEnum'; +import { useFullContent } from '@/hooks/web/useFullContent'; const mixSideHasChildren = ref(false); @@ -105,8 +105,8 @@ return siderHidden ? 0 : collapsedShowTitle - ? SIDE_BAR_SHOW_TIT_MINI_WIDTH - : SIDE_BAR_MINI_WIDTH; + ? SIDE_BAR_SHOW_TIT_MINI_WIDTH + : SIDE_BAR_MINI_WIDTH; }); const getCalcContentWidth = computed(() => { @@ -114,16 +114,16 @@ unref(getIsTopMenu) || !unref(getShowMenu) || (unref(getSplit) && unref(getMenuHidden)) ? 0 : unref(getIsMixSidebar) - ? (unref(getCollapsed) ? SIDE_BAR_MINI_WIDTH : SIDE_BAR_SHOW_TIT_MINI_WIDTH) + - (unref(getMixSideFixed) && unref(mixSideHasChildren) ? unref(getRealWidth) : 0) - : unref(getRealWidth); + ? (unref(getCollapsed) ? SIDE_BAR_MINI_WIDTH : SIDE_BAR_SHOW_TIT_MINI_WIDTH) + + (unref(getMixSideFixed) && unref(mixSideHasChildren) ? unref(getRealWidth) : 0) + : unref(getRealWidth); return `calc(100% - ${unref(width)}px)`; }); // Set menu configuration function setMenuSetting(menuSetting: Partial<MenuSetting>): void { - appStore.setProjectConfig({ menuSetting }); + appStore.setMenuSetting(menuSetting); } function toggleCollapsed() { @@ -133,9 +133,7 @@ } return { setMenuSetting, - toggleCollapsed, - getMenuFixed, getRealWidth, getMenuType, -- Gitblit v1.9.3