Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into v-next-dev

2025-04-22 15:39:53 +08:00
parent 062111502f b985ff0584
commit acd2787f29
38 changed files with 815 additions and 424 deletions
--- a/packages/effects/layouts/src/basic/menu/use-mixed-menu.ts
+++ b/packages/effects/layouts/src/basic/menu/use-mixed-menu.ts
@@ -74,7 +74,7 @@ function useMixedMenu() {
   */
  const headerActive = computed(() => {
    if (!needSplit.value) {
-      return route.path;
+      return route.meta?.activePath ?? route.path;
    }
    return rootMenuPath.value;
  });