From 09c6b17b7e719cbfc5c8328a1096a79a10fdae8c Mon Sep 17 00:00:00 2001
From: Kerwin Bryant <kerwin612@qq.com>
Date: Thu, 28 Apr 2022 11:14:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=8F=9C=E5=8D=95=E9=80=89?=
 =?UTF-8?q?=E4=B8=AD=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91=20(#132)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/components/Header.vue      | 16 +++-----------
 src/layouts/components/MenuContent.tsx | 30 +++++++++++++-------------
 src/layouts/components/SideNav.tsx     | 22 ++++++-------------
 src/router/index.ts                    | 14 +++++++++++-
 4 files changed, 37 insertions(+), 45 deletions(-)
 mode change 100644 => 100755 src/layouts/components/MenuContent.tsx

diff --git a/src/layouts/components/Header.vue b/src/layouts/components/Header.vue
index a46c225..7584b55 100644
--- a/src/layouts/components/Header.vue
+++ b/src/layouts/components/Header.vue
@@ -65,8 +65,9 @@
 
 <script setup lang="ts">
 import { PropType, computed } from 'vue';
-import { useRouter, useRoute } from 'vue-router';
+import { useRouter } from 'vue-router';
 import { useSettingStore } from '@/store';
+import { getActive } from '@/router';
 import { prefix } from '@/config/global';
 import tLogoFull from '@/assets/assets-logo-full.svg?component';
 import { MenuRoute } from '@/interface';
@@ -115,18 +116,7 @@ const toggleSettingPanel = () => {
   });
 };
 
-const active = computed(() => {
-  const { layout } = props;
-  const route = useRoute();
-  if (!route.path) {
-    return '';
-  }
-  return route.path
-    .split('/')
-    .filter((item, index) => index < props.maxLevel - (layout === 'mix' ? 1 : -1) && index > 0)
-    .map((item) => `/${item}`)
-    .join('');
-});
+const active = computed(() => getActive());
 
 const layoutCls = computed(() => [`${prefix}-header-layout`]);
 
diff --git a/src/layouts/components/MenuContent.tsx b/src/layouts/components/MenuContent.tsx
old mode 100644
new mode 100755
index b856cb0..f2eeb76
--- a/src/layouts/components/MenuContent.tsx
+++ b/src/layouts/components/MenuContent.tsx
@@ -1,6 +1,7 @@
 import { defineComponent, PropType, computed, h } from 'vue';
 import { prefix } from '@/config/global';
 import { MenuRoute } from '@/interface';
+import { getActive } from '@/router';
 
 const getMenuList = (list: MenuRoute[], basePath?: string): MenuRoute[] => {
   if (!list) {
@@ -34,36 +35,33 @@ const renderIcon = (item) => {
   return () => '';
 };
 
-const useRenderNav = (list: Array<MenuRoute>) => {
+const getPath = (active, item) => {
+  if (active.startsWith(item.path)) {
+    return active;
+  }
+  return item.meta?.single ? item.redirect : item.path;
+};
+
+const useRenderNav = (active: string, list: Array<MenuRoute>) => {
   return list.map((item) => {
     if (!item.children || !item.children.length || item.meta?.single) {
       const href = item.path.match(/(http|https):\/\/([\w.]+\/?)\S*/);
       if (href) {
         return (
-          <t-menu-item
-            href={href?.[0]}
-            name={item.path}
-            value={item.meta?.single ? item.redirect : item.path}
-            icon={renderIcon(item)}
-          >
+          <t-menu-item href={href?.[0]} name={item.path} value={getPath(active, item)} icon={renderIcon(item)}>
             {item.title}
           </t-menu-item>
         );
       }
       return (
-        <t-menu-item
-          name={item.path}
-          value={item.meta?.single ? item.redirect : item.path}
-          to={item.path}
-          icon={renderIcon(item)}
-        >
+        <t-menu-item name={item.path} value={getPath(active, item)} to={item.path} icon={renderIcon(item)}>
           {item.title}
         </t-menu-item>
       );
     }
     return (
       <t-submenu name={item.path} value={item.path} title={item.title} icon={renderIcon(item)}>
-        {item.children && useRenderNav(item.children)}
+        {item.children && useRenderNav(active, item.children)}
       </t-submenu>
     );
   });
@@ -77,6 +75,7 @@ export default defineComponent({
     },
   },
   setup(props) {
+    const active = computed(() => getActive());
     const list = computed(() => {
       const { navData } = props;
       return getMenuList(navData);
@@ -84,11 +83,12 @@ export default defineComponent({
 
     return {
       prefix,
+      active,
       list,
       useRenderNav,
     };
   },
   render() {
-    return <div>{this.useRenderNav(this.list)}</div>;
+    return <div>{this.useRenderNav(this.active, this.list)}</div>;
   },
 });
diff --git a/src/layouts/components/SideNav.tsx b/src/layouts/components/SideNav.tsx
index 4040f34..4bc4941 100644
--- a/src/layouts/components/SideNav.tsx
+++ b/src/layouts/components/SideNav.tsx
@@ -1,17 +1,20 @@
 import { defineComponent, PropType, computed, onMounted } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
+import { useRouter } from 'vue-router';
 import { prefix } from '@/config/global';
 import pgk from '../../../package.json';
 import MenuContent from './MenuContent';
 import tLogo from '@/assets/assets-t-logo.svg?component';
 import tLogoFull from '@/assets/assets-logo-full.svg?component';
 import { useSettingStore } from '@/store';
+import { getActive } from '@/router';
 
 const MIN_POINT = 992 - 1;
 
 const useComputed = (props) => {
   const collapsed = computed(() => useSettingStore().isSidebarCompact);
 
+  const active = computed(() => getActive());
+
   const sideNavCls = computed(() => {
     const { isCompact } = props;
     return [
@@ -40,6 +43,7 @@ const useComputed = (props) => {
   });
 
   return {
+    active,
     collapsed,
     sideNavCls,
     menuCls,
@@ -107,18 +111,6 @@ export default defineComponent({
       };
     });
 
-    const getActiveName = (maxLevel = 2) => {
-      const route = useRoute();
-      if (!route.path) {
-        return '';
-      }
-      return route.path
-        .split('/')
-        .filter((_item: string, index: number) => index <= maxLevel && index > 0)
-        .map((item: string) => `/${item}`)
-        .join('');
-    };
-
     const goHome = () => {
       router.push('/dashboard/base');
     };
@@ -128,18 +120,16 @@ export default defineComponent({
       ...useComputed(props),
       autoCollapsed,
       changeCollapsed,
-      getActiveName,
       goHome,
     };
   },
   render() {
-    const active = this.getActiveName();
     return (
       <div class={this.sideNavCls}>
         <t-menu
           class={this.menuCls}
           theme={this.theme}
-          value={active}
+          value={this.active}
           collapsed={this.collapsed}
           v-slots={{
             logo: () =>
diff --git a/src/router/index.ts b/src/router/index.ts
index 63d004a..883e87b 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -1,4 +1,4 @@
-import { createRouter, createWebHashHistory, RouteRecordRaw } from 'vue-router';
+import { useRoute, createRouter, createWebHashHistory, RouteRecordRaw } from 'vue-router';
 
 import baseRouters from './modules/base';
 import componentsRouters from './modules/components';
@@ -30,6 +30,18 @@ const defaultRouterList: Array<RouteRecordRaw> = [
 
 export const allRoutes = [...defaultRouterList, ...asyncRouterList];
 
+export const getActive = (maxLevel = 2): string => {
+  const route = useRoute();
+  if (!route.path) {
+    return '';
+  }
+  return route.path
+    .split('/')
+    .filter((_item: string, index: number) => index <= maxLevel && index > 0)
+    .map((item: string) => `/${item}`)
+    .join('');
+};
+
 const router = createRouter({
   history: createWebHashHistory(),
   routes: allRoutes,