From e471e9140ecef6701d8d9bdea323640e0de011f5 Mon Sep 17 00:00:00 2001 From: Soybean Date: Mon, 27 Oct 2025 18:49:39 +0800 Subject: [PATCH] fix(layout): fix getSiderWidth --- src/layouts/base-layout/index.vue | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/layouts/base-layout/index.vue b/src/layouts/base-layout/index.vue index aab04748..c552792d 100644 --- a/src/layouts/base-layout/index.vue +++ b/src/layouts/base-layout/index.vue @@ -18,7 +18,7 @@ defineOptions({ const appStore = useAppStore(); const themeStore = useThemeStore(); -const { childLevelMenus, isActiveFirstLevelMenuHasChildren } = provideMixMenuContext(); +const { secondLevelMenus, childLevelMenus, isActiveFirstLevelMenuHasChildren } = provideMixMenuContext(); const GlobalMenu = defineAsyncComponent(() => import('../modules/global-menu/index.vue')); @@ -77,9 +77,9 @@ const isTopHybridSidebarFirst = computed(() => themeStore.layout.mode === 'top-h const isTopHybridHeaderFirst = computed(() => themeStore.layout.mode === 'top-hybrid-header-first'); -const siderWidth = computed(() => getSiderWidth()); +const siderWidth = computed(() => getSiderAndCollapsedWidth(false)); -const siderCollapsedWidth = computed(() => getSiderCollapsedWidth()); +const siderCollapsedWidth = computed(() => getSiderAndCollapsedWidth(true)); function getSiderAndCollapsedWidth(isCollapsed: boolean) { const { @@ -104,7 +104,7 @@ function getSiderAndCollapsedWidth(isCollapsed: boolean) { const isMixMode = isVerticalMix.value || isTopHybridSidebarFirst.value || isVerticalHybridHeaderFirst.value; let finalWidth = isMixMode ? mixWidth : width; - if (isVerticalMix.value && appStore.mixSiderFixed && childLevelMenus.value.length) { + if (isVerticalMix.value && appStore.mixSiderFixed && secondLevelMenus.value.length) { finalWidth += mixChildMenuWidth; } @@ -114,14 +114,6 @@ function getSiderAndCollapsedWidth(isCollapsed: boolean) { return finalWidth; } - -function getSiderWidth() { - return getSiderAndCollapsedWidth(false); -} - -function getSiderCollapsedWidth() { - return getSiderAndCollapsedWidth(true); -}