From 2eb7fed9f450d6246d478c793b76597d60f7c3f8 Mon Sep 17 00:00:00 2001
From: Netfan <netfan@foxmail.com>
Date: Mon, 30 Dec 2024 15:24:01 +0800
Subject: [PATCH] fix: header-mixed layout side-menu active (#5265)

* fix: header-mixed layout side-menu active

* fix: config test
---
 .../__snapshots__/config.test.ts.snap         |  2 +-
 packages/@core/preferences/src/config.ts      |  2 +-
 packages/effects/layouts/src/basic/layout.vue | 27 +++++-----
 .../layouts/src/basic/menu/use-extra-menu.ts  | 51 ++++++++-----------
 .../layouts/src/basic/menu/use-mixed-menu.ts  |  5 --
 5 files changed, 36 insertions(+), 51 deletions(-)

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,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(() => {
     </template>
     <template #mixed-menu>
       <LayoutMixedMenu
-        :active-path="isHeaderMixedNav ? mixedSidebarActive : extraActiveMenu"
+        :active-path="extraActiveMenu"
         :menus="wrapperMenus(mixHeaderMenus, false)"
         :rounded="isMenuRounded"
         :theme="sidebarTheme"
diff --git a/packages/effects/layouts/src/basic/menu/use-extra-menu.ts b/packages/effects/layouts/src/basic/menu/use-extra-menu.ts
index 17dc6a666..b0eb227c5 100644
--- a/packages/effects/layouts/src/basic/menu/use-extra-menu.ts
+++ b/packages/effects/layouts/src/basic/menu/use-extra-menu.ts
@@ -1,6 +1,6 @@
 import type { MenuRecordRaw } from '@vben/types';
 
-import { computed, nextTick, ref, watch } from 'vue';
+import { computed, type ComputedRef, ref, watch } from 'vue';
 import { useRoute } from 'vue-router';
 
 import { preferences } from '@vben/preferences';
@@ -9,11 +9,11 @@ import { findRootMenuByPath } from '@vben/utils';
 
 import { useNavigation } from './use-navigation';
 
-function useExtraMenu() {
+function useExtraMenu(useRootMenus?: ComputedRef<MenuRecordRaw[]>) {
   const accessStore = useAccessStore();
   const { navigation } = useNavigation();
 
-  const menus = computed(() => accessStore.accessMenus);
+  const menus = computed(() => useRootMenus?.value ?? accessStore.accessMenus);
 
   /** 记录当前顶级菜单下哪个子菜单最后激活 */
   const defaultSubMap = new Map<string, string>();
@@ -22,6 +22,9 @@ function useExtraMenu() {
   const extraMenus = ref<MenuRecordRaw[]>([]);
   const sidebarExtraVisible = ref<boolean>(false);
   const extraActiveMenu = ref('');
+  const parentLevel = computed(() =>
+    preferences.app.layout === 'header-mixed-nav' ? 1 : 0,
+  );
 
   /**
    * 选择混合菜单事件
@@ -29,7 +32,7 @@ function useExtraMenu() {
    */
   const handleMixedMenuSelect = async (menu: MenuRecordRaw) => {
     extraMenus.value = menu?.children ?? [];
-    extraActiveMenu.value = menu.parents?.[0] ?? menu.path;
+    extraActiveMenu.value = menu.parents?.[parentLevel.value] ?? menu.path;
     const hasChildren = extraMenus.value.length > 0;
 
     sidebarExtraVisible.value = hasChildren;
@@ -53,10 +56,8 @@ function useExtraMenu() {
     menu: MenuRecordRaw,
     rootMenu?: MenuRecordRaw,
   ) => {
-    await nextTick();
-
     extraMenus.value = rootMenu?.children ?? extraRootMenus.value ?? [];
-    extraActiveMenu.value = menu.parents?.[0] ?? menu.path;
+    extraActiveMenu.value = menu.parents?.[parentLevel.value] ?? menu.path;
 
     if (preferences.sidebar.expandOnHover) {
       sidebarExtraVisible.value = extraMenus.value.length > 0;
@@ -67,23 +68,23 @@ function useExtraMenu() {
    * 侧边菜单鼠标移出事件
    */
   const handleSideMouseLeave = () => {
-    // const { findMenu, rootMenu, rootMenuPath } = findRootMenuByPath(
-    //   menus.value,
-    //   route.path,
-    // );
-    calcExtraMenus(route.path);
     if (preferences.sidebar.expandOnHover) {
-      sidebarExtraVisible.value = extraMenus.value.length > 0;
       return;
     }
-    sidebarExtraVisible.value = false;
+
+    const { findMenu, rootMenu, rootMenuPath } = findRootMenuByPath(
+      menus.value,
+      route.path,
+    );
+    extraActiveMenu.value = rootMenuPath ?? findMenu?.path ?? '';
+    extraMenus.value = rootMenu?.children ?? [];
   };
 
   const handleMenuMouseEnter = (menu: MenuRecordRaw) => {
     if (!preferences.sidebar.expandOnHover) {
       const { findMenu } = findRootMenuByPath(menus.value, menu.path);
       extraMenus.value = findMenu?.children ?? [];
-      extraActiveMenu.value = menu.parents?.[0] ?? menu.path;
+      extraActiveMenu.value = menu.parents?.[parentLevel.value] ?? menu.path;
       sidebarExtraVisible.value = extraMenus.value.length > 0;
     }
   };
@@ -93,22 +94,12 @@ function useExtraMenu() {
     const { findMenu, rootMenu, rootMenuPath } = findRootMenuByPath(
       menus.value,
       currentPath,
+      parentLevel.value,
     );
-    if (preferences.app.layout === 'header-mixed-nav') {
-      const subExtra = findRootMenuByPath(
-        rootMenu?.children ?? [],
-        currentPath,
-        1,
-      );
-      extraRootMenus.value = subExtra.rootMenu?.children ?? [];
-      extraActiveMenu.value = subExtra.rootMenuPath ?? '';
-      extraMenus.value = subExtra.rootMenu?.children ?? [];
-    } else {
-      extraRootMenus.value = rootMenu?.children ?? [];
-      if (rootMenuPath) defaultSubMap.set(rootMenuPath, currentPath);
-      extraActiveMenu.value = rootMenuPath ?? findMenu?.path ?? '';
-      extraMenus.value = rootMenu?.children ?? [];
-    }
+    extraRootMenus.value = rootMenu?.children ?? [];
+    if (rootMenuPath) defaultSubMap.set(rootMenuPath, currentPath);
+    extraActiveMenu.value = rootMenuPath ?? findMenu?.path ?? '';
+    extraMenus.value = rootMenu?.children ?? [];
     if (preferences.sidebar.expandOnHover) {
       sidebarExtraVisible.value = extraMenus.value.length > 0;
     }
diff --git a/packages/effects/layouts/src/basic/menu/use-mixed-menu.ts b/packages/effects/layouts/src/basic/menu/use-mixed-menu.ts
index bdb840a02..c1d27fd41 100644
--- a/packages/effects/layouts/src/basic/menu/use-mixed-menu.ts
+++ b/packages/effects/layouts/src/basic/menu/use-mixed-menu.ts
@@ -69,10 +69,6 @@ function useMixedMenu() {
     return (route?.meta?.activePath as string) ?? route.path;
   });
 
-  const mixedSidebarActive = computed(() => {
-    return mixedRootMenuPath.value || sidebarActive.value;
-  });
-
   /**
    * 头部菜单激活路径
    */
@@ -160,7 +156,6 @@ function useMixedMenu() {
     headerMenus,
     sidebarActive,
     sidebarMenus,
-    mixedSidebarActive,
     mixHeaderMenus,
     mixExtraMenus,
     sidebarVisible,