From 1f753e3d84e1d3f2bcc4fd76e2b838deb78b511a Mon Sep 17 00:00:00 2001
From: 也曾为你像超人 <1553592282@qq.com>
Date: Mon, 30 Oct 2023 11:50:19 +0800
Subject: [PATCH] 修复字典表详情页面搜索bug
---
ruoyi-ui/src/components/TopNav/index.vue | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/ruoyi-ui/src/components/TopNav/index.vue b/ruoyi-ui/src/components/TopNav/index.vue
index 0cc24db..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>
@@ -92,7 +95,9 @@
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);
+ if (!this.$route.meta.link) {
+ this.$store.dispatch('app/toggleSideBarHide', false);
+ }
} else if(!this.$route.children) {
activePath = path;
this.$store.dispatch('app/toggleSideBarHide', true);
@@ -125,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 {
// 显示左侧联动菜单
@@ -145,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