From 85bf5fbc9b129e3891aa765e91b7dae12643ced8 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 03 六月 2021 17:33:48 +0800
Subject: [PATCH] fix 修复主键列表显示 重复生成bug
---
ruoyi-ui/src/components/TopNav/index.vue | 81 +++++++++++++++++++++++++++-------------
1 files changed, 54 insertions(+), 27 deletions(-)
diff --git a/ruoyi-ui/src/components/TopNav/index.vue b/ruoyi-ui/src/components/TopNav/index.vue
index 2397628..d89930a 100644
--- a/ruoyi-ui/src/components/TopNav/index.vue
+++ b/ruoyi-ui/src/components/TopNav/index.vue
@@ -5,7 +5,7 @@
@select="handleSelect"
>
<template v-for="(item, index) in topMenus">
- <el-menu-item :index="item.path" :key="index" v-if="index < visibleNumber"
+ <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
>
@@ -30,9 +30,6 @@
<script>
import { constantRoutes } from "@/router";
-// 涓嶉渶瑕佹縺娲荤殑璺敱
-const noactiveList = ["/user/profile", "/dict/type", "/gen/edit", "/job/log"];
-
export default {
data() {
return {
@@ -40,15 +37,25 @@
visibleNumber: 5,
// 鏄惁涓洪娆″姞杞�
isFrist: false,
+ // 褰撳墠婵�娲昏彍鍗曠殑 index
+ currentIndex: undefined
};
},
computed: {
+ theme() {
+ return this.$store.state.settings.theme;
+ },
// 椤堕儴鏄剧ず鑿滃崟
topMenus() {
let topMenus = [];
this.routers.map((menu) => {
- if (menu.hidden === false) {
- topMenus.push(menu);
+ if (menu.hidden !== true) {
+ // 鍏煎椤堕儴鏍忎竴绾ц彍鍗曞唴閮ㄨ烦杞�
+ if (menu.path === "/") {
+ topMenus.push(menu.children[0]);
+ } else {
+ topMenus.push(menu);
+ }
}
});
return topMenus;
@@ -63,7 +70,13 @@
this.routers.map((router) => {
for (var item in router.children) {
if (router.children[item].parentPath === undefined) {
- router.children[item].path = router.path + "/" + router.children[item].path;
+ if(router.path === "/") {
+ router.children[item].path = "/redirect/" + router.children[item].path;
+ } else {
+ if(!this.ishttp(router.children[item].path)) {
+ router.children[item].path = router.path + "/" + router.children[item].path;
+ }
+ }
router.children[item].parentPath = router.path;
}
childrenMenus.push(router.children[item]);
@@ -75,12 +88,6 @@
activeMenu() {
const path = this.$route.path;
let activePath = this.routers[0].path;
- var noactive = noactiveList.some(function (item) {
- return path.indexOf(item) !== -1;
- });
- if (noactive) {
- return;
- }
if (path.lastIndexOf("/") > 0) {
const tmpPath = path.substring(1, path.length);
activePath = "/" + tmpPath.substring(0, tmpPath.indexOf("/"));
@@ -91,9 +98,19 @@
activePath = "index";
}
}
- this.activeRoutes(activePath);
+ var routes = this.activeRoutes(activePath);
+ if (routes.length === 0) {
+ activePath = this.currentIndex || this.routers[0].path
+ this.activeRoutes(activePath);
+ }
return activePath;
},
+ },
+ beforeMount() {
+ window.addEventListener('resize', this.setVisibleNumber)
+ },
+ beforeDestroy() {
+ window.removeEventListener('resize', this.setVisibleNumber)
},
mounted() {
this.setVisibleNumber();
@@ -101,22 +118,20 @@
methods: {
// 鏍规嵁瀹藉害璁＄畻璁剧疆鏄剧ず鏍忔暟
setVisibleNumber() {
- const width = document.body.getBoundingClientRect().width - 380;
- const elWidth = this.$el.getBoundingClientRect().width;
- const menuItemNodes = this.$el.children;
- const menuWidth = Array.from(menuItemNodes).map(
- (i) => i.getBoundingClientRect().width
- );
- this.visibleNumber = (
- parseInt(width - elWidth) / parseInt(menuWidth)
- ).toFixed(0);
+ const width = document.body.getBoundingClientRect().width / 3;
+ this.visibleNumber = parseInt(width / 85);
},
// 鑿滃崟閫夋嫨浜嬩欢
handleSelect(key, keyPath) {
- if (key.indexOf("http://") !== -1 || key.indexOf("https://") !== -1) {
+ this.currentIndex = key;
+ if (this.ishttp(key)) {
// http(s):// 璺緞鏂扮獥鍙ｆ墦寮�
window.open(key, "_blank");
+ } else if (key.indexOf("/redirect") !== -1) {
+ // /redirect 璺緞鍐呴儴鎵撳紑
+ this.$router.push({ path: key.replace("/redirect", "") });
} else {
+ // 鏄剧ず宸︿晶鑱斿姩鑿滃崟
this.activeRoutes(key);
}
},
@@ -130,13 +145,19 @@
}
});
}
- this.$store.commit("SET_SIDEBAR_ROUTERS", routes);
+ if(routes.length > 0) {
+ this.$store.commit("SET_SIDEBAR_ROUTERS", routes);
+ }
+ return routes;
+ },
+ ishttp(url) {
+ return url.indexOf('http://') !== -1 || url.indexOf('https://') !== -1
}
},
};
</script>
-<style lang="scss" scoped>
+<style lang="scss">
.el-menu--horizontal > .el-menu-item {
float: left;
height: 50px;
@@ -149,7 +170,13 @@
}
.el-menu--horizontal > .el-menu-item.is-active {
- border-bottom: 3px solid #409eff;
+ border-bottom: 3px solid #{'var(--theme)'};
color: #303133;
}
+
+/* submenu item */
+.el-menu--horizontal > .el-submenu .el-submenu__title {
+ height: 50px !important;
+ line-height: 50px !important;
+}
</style>
--
Gitblit v1.9.3