From 2e99c68ed071171dba9f048363fd873ed268d22e Mon Sep 17 00:00:00 2001 From: 若依 <yzz_ivy@163.com> Date: 星期一, 10 四月 2023 17:09:43 +0800 Subject: [PATCH] !695 下拉图标选择组件优化:1.已选择图标高亮回显 2.滚动条采用el-scrollbar Merge pull request !695 from 绿色心情/icon-select --- ruoyi-ui/src/components/TopNav/index.vue | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ruoyi-ui/src/components/TopNav/index.vue b/ruoyi-ui/src/components/TopNav/index.vue index 0cc24db..5f0edbe 100644 --- a/ruoyi-ui/src/components/TopNav/index.vue +++ b/ruoyi-ui/src/components/TopNav/index.vue @@ -92,7 +92,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); @@ -145,6 +147,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