Skip to content

Commit e471e91

Browse files
committed
fix(layout): fix getSiderWidth
1 parent b2c919b commit e471e91

File tree

1 file changed

+4
-12
lines changed

1 file changed

+4
-12
lines changed

src/layouts/base-layout/index.vue

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ defineOptions({
1818
1919
const appStore = useAppStore();
2020
const themeStore = useThemeStore();
21-
const { childLevelMenus, isActiveFirstLevelMenuHasChildren } = provideMixMenuContext();
21+
const { secondLevelMenus, childLevelMenus, isActiveFirstLevelMenuHasChildren } = provideMixMenuContext();
2222
2323
const GlobalMenu = defineAsyncComponent(() => import('../modules/global-menu/index.vue'));
2424
@@ -77,9 +77,9 @@ const isTopHybridSidebarFirst = computed(() => themeStore.layout.mode === 'top-h
7777
7878
const isTopHybridHeaderFirst = computed(() => themeStore.layout.mode === 'top-hybrid-header-first');
7979
80-
const siderWidth = computed(() => getSiderWidth());
80+
const siderWidth = computed(() => getSiderAndCollapsedWidth(false));
8181
82-
const siderCollapsedWidth = computed(() => getSiderCollapsedWidth());
82+
const siderCollapsedWidth = computed(() => getSiderAndCollapsedWidth(true));
8383
8484
function getSiderAndCollapsedWidth(isCollapsed: boolean) {
8585
const {
@@ -104,7 +104,7 @@ function getSiderAndCollapsedWidth(isCollapsed: boolean) {
104104
const isMixMode = isVerticalMix.value || isTopHybridSidebarFirst.value || isVerticalHybridHeaderFirst.value;
105105
let finalWidth = isMixMode ? mixWidth : width;
106106
107-
if (isVerticalMix.value && appStore.mixSiderFixed && childLevelMenus.value.length) {
107+
if (isVerticalMix.value && appStore.mixSiderFixed && secondLevelMenus.value.length) {
108108
finalWidth += mixChildMenuWidth;
109109
}
110110
@@ -114,14 +114,6 @@ function getSiderAndCollapsedWidth(isCollapsed: boolean) {
114114
115115
return finalWidth;
116116
}
117-
118-
function getSiderWidth() {
119-
return getSiderAndCollapsedWidth(false);
120-
}
121-
122-
function getSiderCollapsedWidth() {
123-
return getSiderAndCollapsedWidth(true);
124-
}
125117
</script>
126118

127119
<template>

0 commit comments

Comments
 (0)