From c2208270bd47608abc0733e9d5e5fbddf3b36642 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 31 一月 2023 14:10:56 +0800
Subject: [PATCH] fix 修复 错误修改 sql 用户数据

---
 ruoyi-ui/src/components/TopNav/index.vue |   52 +++++++++++++++++++++-------------------------------
 1 files changed, 21 insertions(+), 31 deletions(-)

diff --git a/ruoyi-ui/src/components/TopNav/index.vue b/ruoyi-ui/src/components/TopNav/index.vue
index 1b7c4d9..5f0edbe 100644
--- a/ruoyi-ui/src/components/TopNav/index.vue
+++ b/ruoyi-ui/src/components/TopNav/index.vue
@@ -30,13 +30,14 @@
 <script>
 import { constantRoutes } from "@/router";
 
+// 闅愯棌渚ц竟鏍忚矾鐢�
+const hideList = ['/index', '/user/profile'];
+
 export default {
   data() {
     return {
       // 椤堕儴鏍忓垵濮嬫暟
       visibleNumber: 5,
-      // 鏄惁涓洪娆″姞杞�
-      isFrist: false,
       // 褰撳墠婵�娲昏彍鍗曠殑 index
       currentIndex: undefined
     };
@@ -71,7 +72,7 @@
         for (var 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 = "/" + router.children[item].path;
             } else {
               if(!this.ishttp(router.children[item].path)) {
                 router.children[item].path = router.path + "/" + router.children[item].path;
@@ -87,22 +88,18 @@
     // 榛樿婵�娲荤殑鑿滃崟
     activeMenu() {
       const path = this.$route.path;
-      let activePath = this.defaultRouter();
-      if (path.lastIndexOf("/") > 0) {
+      let activePath = path;
+      if (path !== undefined && path.lastIndexOf("/") > 0 && hideList.indexOf(path) === -1) {
         const tmpPath = path.substring(1, path.length);
         activePath = "/" + tmpPath.substring(0, tmpPath.indexOf("/"));
-      } else if ("/index" == path || "" == path) {
-        if (!this.isFrist) {
-          this.isFrist = true;
-        } else {
-          activePath = "index";
+        if (!this.$route.meta.link) {
+          this.$store.dispatch('app/toggleSideBarHide', false);
         }
+      } else if(!this.$route.children) {
+        activePath = path;
+        this.$store.dispatch('app/toggleSideBarHide', true);
       }
-      var routes = this.activeRoutes(activePath);
-      if (routes.length === 0) {
-        activePath = this.currentIndex || this.defaultRouter()
-        this.activeRoutes(activePath);
-      }
+      this.activeRoutes(activePath);
       return activePath;
     },
   },
@@ -121,29 +118,21 @@
       const width = document.body.getBoundingClientRect().width / 3;
       this.visibleNumber = parseInt(width / 85);
     },
-    // 榛樿婵�娲荤殑璺敱
-    defaultRouter() {
-      let router;
-      Object.keys(this.routers).some((key) => {
-        if (!this.routers[key].hidden) {
-          router = this.routers[key].path;
-          return true;
-        }
-      });
-      return router;
-    },
     // 鑿滃崟閫夋嫨浜嬩欢
     handleSelect(key, keyPath) {
       this.currentIndex = key;
+      const route = this.routers.find(item => item.path === key);
       if (this.ishttp(key)) {
         // http(s):// 璺緞鏂扮獥鍙ｆ墦寮�
         window.open(key, "_blank");
-      } else if (key.indexOf("/redirect") !== -1) {
-        // /redirect 璺緞鍐呴儴鎵撳紑
-        this.$router.push({ path: key.replace("/redirect", "") });
+      } else if (!route || !route.children) {
+        // 娌℃湁瀛愯矾鐢辫矾寰勫唴閮ㄦ墦寮�
+        this.$router.push({ path: key });
+        this.$store.dispatch('app/toggleSideBarHide', true);
       } else {
         // 鏄剧ず宸︿晶鑱斿姩鑿滃崟
         this.activeRoutes(key);
+        this.$store.dispatch('app/toggleSideBarHide', false);
       }
     },
     // 褰撳墠婵�娲荤殑璺敱
@@ -158,10 +147,11 @@
       }
       if(routes.length > 0) {
         this.$store.commit("SET_SIDEBAR_ROUTERS", routes);
+      } else {
+        this.$store.dispatch('app/toggleSideBarHide', true);
       }
-      return routes;
     },
-	ishttp(url) {
+    ishttp(url) {
       return url.indexOf('http://') !== -1 || url.indexOf('https://') !== -1
     }
   },

--
Gitblit v1.9.3