feat: layout调整

src/components/_base/menu/index.vue

@@ -2,6 +2,7 @@
 import type { RouteMeta, RouteRecordRaw } from 'vue-router';
 
 import { useAppStore } from '@/stores';
+import { useSidebarStore } from '@/stores/modules/side-bar';
 import { listenerRouteChange } from '@/utils/route-listener';
 import { openWindow, regexUrl } from '@/utils';
 import useMenuTree from './use-menu-tree';
@@ -25,8 +26,8 @@ export default defineComponent({
     const topMenu = computed(() => appStore.topMenu);
     const openKeys = ref<string[]>([]);
     const selectedKey = ref<string[]>([]);
-    const goto = (item: RouteRecordRaw) => {
-      // Open external link
+    const sidebarStore = useSidebarStore();
+    const onMenuItemClick = (item: RouteRecordRaw) => {
       if (regexUrl.test(item.path)) {
         openWindow(item.path);
         selectedKey.value = [item.name as string];
@@ -71,6 +72,9 @@ export default defineComponent({
         const keySet = new Set([...menuOpenKeys, ...openKeys.value]);
         openKeys.value = [...keySet];
         selectedKey.value = [activeMenu || menuOpenKeys[menuOpenKeys.length - 1]];
+
+        // 自动设置 activeMenuId
+        sidebarStore.setActiveMenuIdByRoute(newRoute);
       }
     }, true);
     const setCollapse = (val: boolean) => {
@@ -83,14 +87,14 @@ export default defineComponent({
           // 跳过没有 name 的菜单项，防止 key 报错
           if (!element?.name) return;
 
-          const icon = element?.meta?.icon ? () => h(element.meta.icon as object) : null;
+          const icon = element?.meta?.icon ? () => h(element?.meta?.icon as object) : null;
           if (element.children && element.children.length > 0) {
             nodes.push(
               <a-sub-menu
                 key={String(element.name)}
                 v-slots={{
                   icon,
-                  title: () => element.meta?.locale || '',
+                  title: () => element?.meta?.locale || '',
                 }}
               >
                 {travel(element.children)}
@@ -98,8 +102,8 @@ export default defineComponent({
             );
           } else {
             nodes.push(
-              <a-menu-item key={String(element.name)} v-slots={{ icon }} onClick={() => goto(element)}>
-                {element.meta?.locale || ''}
+              <a-menu-item key={String(element.name)} v-slots={{ icon }} onClick={() => onMenuItemClick(element)}>
+                {element?.meta?.locale || ''}
               </a-menu-item>,
             );
           }

src/components/_base/menu/use-menu-tree.ts

@@ -4,17 +4,16 @@
  */
 import type { RouteRecordRaw, RouteRecordNormalized } from 'vue-router';
 
-import { useAppStore } from '@/stores';
-import appClientMenus from '@/router/app-menus';
+// import { useAppStore } from '@/stores';
+import { appRoutes } from '@/router/routes';
+import { useSidebarStore } from '@/stores/modules/side-bar';
 
 export default function useMenuTree() {
-  const appStore = useAppStore();
+  // const appStore = useAppStore();
+  const sidebarStore = useSidebarStore();
   const appRoute = computed(() => {
-    if (appStore.menuFromServer) {
-      // return appClientMenus.concat(toRaw(appStore.appAsyncMenus));
-      return toRaw(appStore.appAsyncMenus);
-    }
-    return appClientMenus;
+    const _filterRoutes = appRoutes.filter((v) => v.meta.id === sidebarStore.activeMenuId);
+    return _filterRoutes;
   });
   const menuTree = computed(() => {
     const copyRouter = cloneDeep(appRoute.value) as RouteRecordNormalized[];