From e03d73bb48872b8851fad71af2b2c52afd85fa60 Mon Sep 17 00:00:00 2001
From: hxr <1490493387@qq.com>
Date: Tue, 15 Aug 2023 05:35:35 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20:bug:=20=E8=A1=A5=E5=85=85=20basePath=20?=
 =?UTF-8?q?=E7=88=B6=E7=BA=A7=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: cce921b52b3f93fb9be8d9619c788a5b1b585fe9
---
 src/layout/components/Sidebar/LeftMenu.vue    | 27 ++++++++++++++++++-
 src/layout/components/Sidebar/SidebarItem.vue |  2 ++
 src/layout/components/Sidebar/index.vue       |  2 +-
 src/layout/index.vue                          | 14 +++++-----
 4 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/src/layout/components/Sidebar/LeftMenu.vue b/src/layout/components/Sidebar/LeftMenu.vue
index bae939cf..16d13282 100644
--- a/src/layout/components/Sidebar/LeftMenu.vue
+++ b/src/layout/components/Sidebar/LeftMenu.vue
@@ -5,6 +5,9 @@ import { useSettingsStore } from "@/store/modules/settings";
 import { useAppStore } from "@/store/modules/app";
 import variables from "@/styles/variables.module.scss";
 
+import path from "path-browserify";
+import { isExternal } from "@/utils/index";
+
 const settingsStore = useSettingsStore();
 const appStore = useAppStore();
 const currRoute = useRoute();
@@ -17,7 +20,29 @@ const props = defineProps({
     },
     type: Array<any>,
   },
+  basePath: {
+    type: String,
+    required: true,
+  },
 });
+
+/**
+ * 解析路径
+ *
+ * @param routePath 路由路径
+ */
+function resolvePath(routePath: string) {
+  if (isExternal(routePath)) {
+    return routePath;
+  }
+  if (isExternal(props.basePath)) {
+    return props.basePath;
+  }
+
+  // 完整路径 = 父级路径(/level/level_3) + 路由路径
+  const fullPath = path.resolve(props.basePath, routePath); // 相对路径 → 绝对路径
+  return fullPath;
+}
 </script>
 <template>
   <el-menu
@@ -34,7 +59,7 @@ const props = defineProps({
       v-for="route in menuList"
       :key="route.path"
       :item="route"
-      :base-path="route.path"
+      :base-path="resolvePath(route.path)"
       :is-collapse="!appStore.sidebar.opened"
     />
   </el-menu>
diff --git a/src/layout/components/Sidebar/SidebarItem.vue b/src/layout/components/Sidebar/SidebarItem.vue
index 06ebf71d..d932eeb1 100644
--- a/src/layout/components/Sidebar/SidebarItem.vue
+++ b/src/layout/components/Sidebar/SidebarItem.vue
@@ -54,6 +54,7 @@ function hasOneShowingChild(children = [], parent: any) {
   // 2：如果无子路由, 复制当前路由信息作为其子路由，满足只拥有一个子路由的条件，所以返回 true
   if (showingChildren.length === 0) {
     onlyOneChild.value = { ...parent, path: "", noShowingChildren: true };
+
     return true;
   }
   return false;
@@ -71,6 +72,7 @@ function resolvePath(routePath: string) {
   if (isExternal(props.basePath)) {
     return props.basePath;
   }
+
   // 完整路径 = 父级路径(/level/level_3) + 路由路径
   const fullPath = path.resolve(props.basePath, routePath); // 相对路径 → 绝对路径
   return fullPath;
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index 16f36850..02a0ce40 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -32,7 +32,7 @@ watch(
   >
     <logo v-if="sidebarLogo" :collapse="!appStore.sidebar.opened" />
     <el-scrollbar v-if="showContent">
-      <LeftMenu :menu-list="permissionStore.routes" />
+      <LeftMenu :menu-list="permissionStore.routes" base-path="" />
     </el-scrollbar>
     <NavRight v-if="layout === 'top'" />
   </div>
diff --git a/src/layout/index.vue b/src/layout/index.vue
index 7e3109bc..3c838e59 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -38,12 +38,11 @@ watch(
         mixLeftMenu.value = item.children || [];
       }
     });
-    console.log(" mixLeftMenu.value ", mixLeftMenu.value);
-    // if (mixLeftMenu.value.length) {
-    //   router.push({
-    //     path: mixLeftMenu.value[0].path,
-    //   });
-    // }
+    if (mixLeftMenu.value) {
+      router.push({
+        path: mixLeftMenu.value[0].path,
+      });
+    }
   },
   {
     deep: true,
@@ -94,7 +93,8 @@ function handleOutsideClick() {
     <template v-if="layout === 'mix'">
       <div class="mix-wrap">
         <!-- :menu-list="mixLeftMenu -->
-        <LeftMenu :menu-list="permissionStore.routes" />
+        <!-- :menu-list="permissionStore.routes -->
+        <LeftMenu :menu-list="mixLeftMenu" :base-path="activeTopMenu" />
         <Main />
       </div>
     </template>