From 8cf8c8acd059969b9e79ad1c2f9f1921cc42d69c Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期二, 07 十一月 2023 11:38:19 +0800
Subject: [PATCH] 修复外链带端口出现的异常(I86J4B)
---
ruoyi-ui/src/components/TopNav/index.vue | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/ruoyi-ui/src/components/TopNav/index.vue b/ruoyi-ui/src/components/TopNav/index.vue
index cabb258..daee1b8 100644
--- a/ruoyi-ui/src/components/TopNav/index.vue
+++ b/ruoyi-ui/src/components/TopNav/index.vue
@@ -6,7 +6,10 @@
>
<template v-for="(item, index) in topMenus">
<el-menu-item :style="{'--theme': theme}" :index="item.path" :key="index" v-if="index < visibleNumber"
- ><svg-icon :icon-class="item.meta.icon" />
+ ><svg-icon
+ v-if="item.meta && item.meta.icon && item.meta.icon !== '#'"
+ :icon-class="item.meta.icon"
+ />
{{ item.meta.title }}</el-menu-item
>
</template>
@@ -30,13 +33,14 @@
<script>
import { constantRoutes } from "@/router";
+// 隐藏侧边栏路由
+const hideList = ['/index', '/user/profile'];
+
export default {
data() {
return {
// 顶部栏初始数
visibleNumber: 5,
- // 是否为首次加载
- isFrist: false,
// 当前激活菜单的 index
currentIndex: undefined
};
@@ -88,17 +92,12 @@
activeMenu() {
const path = this.$route.path;
let activePath = path;
- if (path.lastIndexOf("/") > 0) {
+ if (path !== undefined && path.lastIndexOf("/") > 0 && hideList.indexOf(path) === -1) {
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";
+ if (!this.$route.meta.link) {
+ this.$store.dispatch('app/toggleSideBarHide', false);
}
- this.$store.dispatch('app/toggleSideBarHide', true);
} else if(!this.$route.children) {
activePath = path;
this.$store.dispatch('app/toggleSideBarHide', true);
@@ -131,7 +130,13 @@
window.open(key, "_blank");
} else if (!route || !route.children) {
// 没有子路由路径内部打开
- this.$router.push({ path: key });
+ const routeMenu = this.childrenMenus.find(item => item.path === key);
+ if (routeMenu && routeMenu.query) {
+ let query = JSON.parse(routeMenu.query);
+ this.$router.push({ path: key, query: query });
+ } else {
+ this.$router.push({ path: key });
+ }
this.$store.dispatch('app/toggleSideBarHide', true);
} else {
// 显示左侧联动菜单
@@ -151,6 +156,8 @@
}
if(routes.length > 0) {
this.$store.commit("SET_SIDEBAR_ROUTERS", routes);
+ } else {
+ this.$store.dispatch('app/toggleSideBarHide', true);
}
},
ishttp(url) {
--
Gitblit v1.9.2