From b6f13c546b4b0e17c1e0a982ff1eef145f3268c4 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Sun, 18 Apr 2021 21:54:53 +0800
Subject: [PATCH] 过滤BindingResult对象，防止异常
---
ruoyi-ui/src/components/TopNav/index.vue | 59 ++++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 36 insertions(+), 23 deletions(-)
diff --git a/ruoyi-ui/src/components/TopNav/index.vue b/ruoyi-ui/src/components/TopNav/index.vue
index 2397628..c5e0e01 100644
--- a/ruoyi-ui/src/components/TopNav/index.vue
+++ b/ruoyi-ui/src/components/TopNav/index.vue
@@ -30,9 +30,6 @@
<script>
import { constantRoutes } from "@/router";
-// 不需要激活的路由
-const noactiveList = ["/user/profile", "/dict/type", "/gen/edit", "/job/log"];
-
export default {
data() {
return {
@@ -40,6 +37,8 @@
visibleNumber: 5,
// 是否为首次加载
isFrist: false,
+ // 当前激活菜单的 index
+ currentIndex: undefined
};
},
computed: {
@@ -47,8 +46,13 @@
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 +67,11 @@
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 {
+ router.children[item].path = router.path + "/" + router.children[item].path;
+ }
router.children[item].parentPath = router.path;
}
childrenMenus.push(router.children[item]);
@@ -75,12 +83,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 +93,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 +113,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) {
+ this.currentIndex = key;
if (key.indexOf("http://") !== -1 || key.indexOf("https://") !== -1) {
// 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,7 +140,10 @@
}
});
}
- this.$store.commit("SET_SIDEBAR_ROUTERS", routes);
+ if(routes.length > 0) {
+ this.$store.commit("SET_SIDEBAR_ROUTERS", routes);
+ }
+ return routes;
}
},
};
--
Gitblit v1.9.2