diff --git a/packages/@core/preferences/__tests__/__snapshots__/config.test.ts.snap b/packages/@core/preferences/__tests__/__snapshots__/config.test.ts.snap index 87f03de69..81df96821 100644 --- a/packages/@core/preferences/__tests__/__snapshots__/config.test.ts.snap +++ b/packages/@core/preferences/__tests__/__snapshots__/config.test.ts.snap @@ -71,7 +71,7 @@ exports[`defaultPreferences immutability test > should not modify the config obj "collapsedShowTitle": false, "enable": true, "expandOnHover": true, - "extraCollapse": true, + "extraCollapse": false, "hidden": false, "width": 224, }, diff --git a/packages/@core/preferences/src/config.ts b/packages/@core/preferences/src/config.ts index a5912a067..10971de5c 100644 --- a/packages/@core/preferences/src/config.ts +++ b/packages/@core/preferences/src/config.ts @@ -71,7 +71,7 @@ const defaultPreferences: Preferences = { collapsedShowTitle: false, enable: true, expandOnHover: true, - extraCollapse: true, + extraCollapse: false, hidden: false, width: 224, }, diff --git a/packages/effects/layouts/src/basic/layout.vue b/packages/effects/layouts/src/basic/layout.vue index 622884534..73f692f63 100644 --- a/packages/effects/layouts/src/basic/layout.vue +++ b/packages/effects/layouts/src/basic/layout.vue @@ -96,17 +96,6 @@ const showHeaderNav = computed(() => { ); }); -// 侧边多列菜单 -const { - extraActiveMenu, - extraMenus, - handleDefaultSelect, - handleMenuMouseEnter, - handleMixedMenuSelect, - handleSideMouseLeave, - sidebarExtraVisible, -} = useExtraMenu(); - const { handleMenuSelect, handleMenuOpen, @@ -114,11 +103,21 @@ const { headerMenus, sidebarActive, sidebarMenus, - mixedSidebarActive, mixHeaderMenus, sidebarVisible, } = useMixedMenu(); +// 侧边多列菜单 +const { + extraActiveMenu, + extraMenus, + handleDefaultSelect, + handleMenuMouseEnter, + handleMixedMenuSelect, + handleSideMouseLeave, + sidebarExtraVisible, +} = useExtraMenu(mixHeaderMenus); + /** * 包装菜单,翻译菜单名称 * @param menus 原始菜单数据 @@ -275,7 +274,7 @@ const headerSlots = computed(() => {