From 661e8cf7b40d79d2024969e56f04100b31abef1a Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Wed, 11 Feb 2026 15:38:13 +0800
Subject: [PATCH] 优化字典类型属性提醒说明
---
ruoyi-ui/src/components/TopNav/index.vue | 169 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 90 insertions(+), 79 deletions(-)
diff --git a/ruoyi-ui/src/components/TopNav/index.vue b/ruoyi-ui/src/components/TopNav/index.vue
index d89930a..8e742c5 100644
--- a/ruoyi-ui/src/components/TopNav/index.vue
+++ b/ruoyi-ui/src/components/TopNav/index.vue
@@ -5,105 +5,107 @@
@select="handleSelect"
>
<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" />
- {{ item.meta.title }}</el-menu-item
- >
+ <el-menu-item :style="{'--theme': theme}" :index="item.path" :key="index" v-if="index < visibleNumber">
+ <svg-icon
+ v-if="item.meta && item.meta.icon && item.meta.icon !== '#'"
+ :icon-class="item.meta.icon"/>
+ {{ item.meta.title }}
+ </el-menu-item>
</template>
<!-- 顶部菜单超出数量折叠 -->
- <el-submenu index="more" v-if="topMenus.length > visibleNumber">
+ <el-submenu :style="{'--theme': theme}" index="more" :key="visibleNumber" v-if="topMenus.length > visibleNumber">
<template slot="title">更多菜单</template>
<template v-for="(item, index) in topMenus">
<el-menu-item
:index="item.path"
:key="index"
- v-if="index >= visibleNumber"
- ><svg-icon :icon-class="item.meta.icon" />
- {{ item.meta.title }}</el-menu-item
- >
+ v-if="index >= visibleNumber">
+ <svg-icon
+ v-if="item.meta && item.meta.icon && item.meta.icon !== '#'"
+ :icon-class="item.meta.icon"/>
+ {{ item.meta.title }}
+ </el-menu-item>
</template>
</el-submenu>
</el-menu>
</template>
<script>
-import { constantRoutes } from "@/router";
+import { constantRoutes } from "@/router"
+import { isHttp } from "@/utils/validate"
+
+// 隐藏侧边栏路由
+const hideList = ['/index', '/user/profile']
export default {
data() {
return {
// 顶部栏初始数
visibleNumber: 5,
- // 是否为首次加载
- isFrist: false,
// 当前激活菜单的 index
currentIndex: undefined
- };
+ }
},
computed: {
theme() {
- return this.$store.state.settings.theme;
+ return this.$store.state.settings.theme
},
// 顶部显示菜单
topMenus() {
- let topMenus = [];
+ let topMenus = []
this.routers.map((menu) => {
if (menu.hidden !== true) {
// 兼容顶部栏一级菜单内部跳转
- if (menu.path === "/") {
- topMenus.push(menu.children[0]);
+ if (menu.path === '/' && menu.children) {
+ topMenus.push(menu.children[0])
} else {
- topMenus.push(menu);
+ topMenus.push(menu)
}
}
- });
- return topMenus;
+ })
+ return topMenus
},
// 所有的路由信息
routers() {
- return this.$store.state.permission.topbarRouters;
+ return this.$store.state.permission.topbarRouters
},
// 设置子路由
childrenMenus() {
- var childrenMenus = [];
+ var childrenMenus = []
this.routers.map((router) => {
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;
- }
+ if(!isHttp(router.children[item].path)) {
+ router.children[item].path = router.path + "/" + router.children[item].path
+ }
}
- router.children[item].parentPath = router.path;
+ router.children[item].parentPath = router.path
}
- childrenMenus.push(router.children[item]);
+ childrenMenus.push(router.children[item])
}
- });
- return constantRoutes.concat(childrenMenus);
+ })
+ return constantRoutes.concat(childrenMenus)
},
// 默认激活的菜单
activeMenu() {
- const path = this.$route.path;
- let activePath = this.routers[0].path;
- if (path.lastIndexOf("/") > 0) {
- 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";
+ const path = this.$route.path
+ let activePath = path
+ if (path !== undefined && path.lastIndexOf("/") > 0 && hideList.indexOf(path) === -1) {
+ const tmpPath = path.substring(1, path.length)
+ if (!this.$route.meta.link) {
+ activePath = "/" + tmpPath.substring(0, tmpPath.indexOf("/"))
+ 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.routers[0].path
- this.activeRoutes(activePath);
- }
- return activePath;
+ this.activeRoutes(activePath)
+ return activePath
},
},
beforeMount() {
@@ -113,70 +115,79 @@
window.removeEventListener('resize', this.setVisibleNumber)
},
mounted() {
- this.setVisibleNumber();
+ this.setVisibleNumber()
},
methods: {
// 根据宽度计算设置显示栏数
setVisibleNumber() {
- const width = document.body.getBoundingClientRect().width / 3;
- this.visibleNumber = parseInt(width / 85);
+ const width = document.body.getBoundingClientRect().width / 3
+ this.visibleNumber = parseInt(width / 85)
},
// 菜单选择事件
handleSelect(key, keyPath) {
- this.currentIndex = key;
- if (this.ishttp(key)) {
+ this.currentIndex = key
+ const route = this.routers.find(item => item.path === key)
+ if (isHttp(key)) {
// http(s):// 路径新窗口打开
- window.open(key, "_blank");
- } else if (key.indexOf("/redirect") !== -1) {
- // /redirect 路径内部打开
- this.$router.push({ path: key.replace("/redirect", "") });
+ window.open(key, "_blank")
+ } else if (!route || !route.children) {
+ // 没有子路由路径内部打开
+ 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 {
// 显示左侧联动菜单
- this.activeRoutes(key);
+ this.activeRoutes(key)
+ this.$store.dispatch('app/toggleSideBarHide', false)
}
},
// 当前激活的路由
activeRoutes(key) {
- var routes = [];
+ var routes = []
if (this.childrenMenus && this.childrenMenus.length > 0) {
this.childrenMenus.map((item) => {
if (key == item.parentPath || (key == "index" && "" == item.path)) {
- routes.push(item);
+ routes.push(item)
}
- });
+ })
}
if(routes.length > 0) {
- this.$store.commit("SET_SIDEBAR_ROUTERS", routes);
+ this.$store.commit("SET_SIDEBAR_ROUTERS", routes)
+ } else {
+ this.$store.dispatch('app/toggleSideBarHide', true)
}
- return routes;
- },
- ishttp(url) {
- return url.indexOf('http://') !== -1 || url.indexOf('https://') !== -1
}
- },
-};
+ }
+}
</script>
<style lang="scss">
-.el-menu--horizontal > .el-menu-item {
+.topmenu-container.el-menu--horizontal > .el-menu-item {
float: left;
- height: 50px;
- line-height: 50px;
- margin: 0;
- border-bottom: 3px solid transparent;
- color: #999093;
- padding: 0 5px;
- margin: 0 10px;
+ height: 50px !important;
+ line-height: 50px !important;
+ color: #303133 !important;
+ padding: 0 5px !important;
+ margin: 0 10px !important;
}
-.el-menu--horizontal > .el-menu-item.is-active {
- border-bottom: 3px solid #{'var(--theme)'};
+.topmenu-container.el-menu--horizontal > .el-menu-item.is-active, .el-menu--horizontal > .el-submenu.is-active .el-submenu__title {
+ border-bottom: 2px solid #{'var(--theme)'} !important;
color: #303133;
}
/* submenu item */
-.el-menu--horizontal > .el-submenu .el-submenu__title {
- height: 50px !important;
- line-height: 50px !important;
+.topmenu-container.el-menu--horizontal > .el-submenu .el-submenu__title {
+ float: left;
+ height: 50px !important;
+ line-height: 50px !important;
+ color: #303133 !important;
+ padding: 0 5px !important;
+ margin: 0 10px !important;
}
</style>
--
Gitblit v1.9.3