From cd312f1348812604f053212ed920c6a91e0224ec Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期二, 15 三月 2022 10:20:53 +0800 Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev --- ruoyi-ui/src/components/TopNav/index.vue | 36 ++++++++++++++---------------------- 1 files changed, 14 insertions(+), 22 deletions(-) diff --git a/ruoyi-ui/src/components/TopNav/index.vue b/ruoyi-ui/src/components/TopNav/index.vue index dec1f74..cabb258 100644 --- a/ruoyi-ui/src/components/TopNav/index.vue +++ b/ruoyi-ui/src/components/TopNav/index.vue @@ -71,7 +71,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 +87,23 @@ // 榛樿婵�娲荤殑鑿滃崟 activeMenu() { const path = this.$route.path; - let activePath = this.defaultRouter(); + let activePath = path; if (path.lastIndexOf("/") > 0) { const tmpPath = path.substring(1, path.length); activePath = "/" + tmpPath.substring(0, tmpPath.indexOf("/")); + this.$store.dispatch('app/toggleSideBarHide', false); } else if ("/index" == path || "" == path) { if (!this.isFrist) { this.isFrist = true; } else { activePath = "index"; } + this.$store.dispatch('app/toggleSideBarHide', true); + } 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 +122,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):// 璺緞鏂扮獥鍙f墦寮� 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); } }, // 褰撳墠婵�娲荤殑璺敱 @@ -159,7 +152,6 @@ if(routes.length > 0) { this.$store.commit("SET_SIDEBAR_ROUTERS", routes); } - return routes; }, ishttp(url) { return url.indexOf('http://') !== -1 || url.indexOf('https://') !== -1 -- Gitblit v1.9.3