From 8e2cebc4029d8a0fe11b1781e05ca7140844cc3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Sat, 21 May 2022 13:29:58 +0800
Subject: [PATCH] =?UTF-8?q?update=20TopNav=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TopNav/index.vue          | 20 ++++++++++----------
 src/layout/components/Settings/index.vue |  2 ++
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/components/TopNav/index.vue b/src/components/TopNav/index.vue
index 72d8318..4146855 100644
--- a/src/components/TopNav/index.vue
+++ b/src/components/TopNav/index.vue
@@ -1,5 +1,11 @@
 <template>
-  <el-menu :default-active="activeMenu" :active-text-color="theme" mode="horizontal" background-color="transparent" @select="handleSelect" :ellipsis="false">
+  <el-menu
+    :default-active="activeMenu"
+    :active-text-color="theme"
+    mode="horizontal"
+    background-color="transparent"
+    @select="handleSelect"
+    :ellipsis="false">
     <template v-for="(item, index) in topMenus">
       <el-menu-item :style="{ '--theme': theme }" :index="item.path" :key="index" v-if="index < visibleNumber">
         <svg-icon :name="item.meta.icon" />
@@ -24,6 +30,7 @@
 import { constantRoutes } from '@/router'
 import { isHttp } from '@/utils/validate'
 import { useRouter } from 'vue-router'
+import { getNormalPath } from '@/utils/ruoyi'
 
 // 顶部栏初始数
 const visibleNumber = ref(5)
@@ -64,10 +71,10 @@ const childrenMenus = computed(() => {
     for (let item in router.children) {
       if (router.children[item].parentPath === undefined) {
         if (router.path === '/') {
-          router.children[item].path = '/redirect/' + router.children[item].path
+          router.children[item].path = getNormalPath('/redirect/' + router.children[item].path)
         } else {
           if (!isHttp(router.children[item].path)) {
-            router.children[item].path = router.path + '/' + router.children[item].path
+            router.children[item].path = getNormalPath(router.path + '/' + router.children[item].path)
           }
         }
         router.children[item].parentPath = router.path
@@ -96,7 +103,6 @@ const activeMenu = computed(() => {
   if (routes.length === 0) {
     activePath = currentIndex.value || defaultRouter.value
 
-    console.log('activePath', activePath)
     activeRoutes(activePath)
   }
   return activePath
@@ -170,12 +176,6 @@ onMounted(() => {
 .el-menu--horizontal > .el-menu-item .svg-icon {
   margin-right: 5px;
 }
-// .topmenu-container.el-menu--horizontal > .el-menu-item.is-active,
-// .el-menu--horizontal > .el-sub-menu.is-active .el-submenu__title {
-//   border-bottom: 0px solid #{"var(--theme)"} !important;
-//   color: #303133;
-// }
-
 /* sub-menu item */
 .topmenu-container.el-menu--horizontal > .el-sub-menu .el-sub-menu__title {
   height: 50px !important;
diff --git a/src/layout/components/Settings/index.vue b/src/layout/components/Settings/index.vue
index 37be351..7987a3d 100644
--- a/src/layout/components/Settings/index.vue
+++ b/src/layout/components/Settings/index.vue
@@ -124,6 +124,8 @@ const topNav = computed({
     if (!val) {
       store.dispatch('app/toggleSideBarHide', false)
       store.commit('SET_SIDEBAR_ROUTERS', store.state.permission.defaultRoutes)
+      // TODO 临时解决切换topnav路由跳转问题
+      setTimeout('window.location.reload()', 100)
     }
   },
 })