diff --git a/packages/@core/preferences/__tests__/__snapshots__/config.test.ts.snap b/packages/@core/preferences/__tests__/__snapshots__/config.test.ts.snap index 87f03de6..81df9682 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 a5912a06..10971de5 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 62288453..73f692f6 100644 --- a/packages/effects/layouts/src/basic/layout.vue +++ b/packages/effects/layouts/src/basic/layout.vue @@ -96,6 +96,17 @@ const showHeaderNav = computed(() => { ); }); +const { + handleMenuSelect, + handleMenuOpen, + headerActive, + headerMenus, + sidebarActive, + sidebarMenus, + mixHeaderMenus, + sidebarVisible, +} = useMixedMenu(); + // 侧边多列菜单 const { extraActiveMenu, @@ -105,19 +116,7 @@ const { handleMixedMenuSelect, handleSideMouseLeave, sidebarExtraVisible, -} = useExtraMenu(); - -const { - handleMenuSelect, - handleMenuOpen, - headerActive, - headerMenus, - sidebarActive, - sidebarMenus, - mixedSidebarActive, - mixHeaderMenus, - sidebarVisible, -} = useMixedMenu(); +} = useExtraMenu(mixHeaderMenus); /** * 包装菜单,翻译菜单名称 @@ -275,7 +274,7 @@ const headerSlots = computed(() => {