From 2a7342ec437b86bf95fb6ec2af6bc082d8455b3d Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: Tue, 30 Mar 2021 15:23:04 +0800
Subject: [PATCH] !195 读取excel增加非空判断 Merge pull request !195 from 叫我宏锅锅/yuhong
---
ruoyi-ui/src/store/modules/permission.js | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/ruoyi-ui/src/store/modules/permission.js b/ruoyi-ui/src/store/modules/permission.js
index c2fb123..61f681c 100644
--- a/ruoyi-ui/src/store/modules/permission.js
+++ b/ruoyi-ui/src/store/modules/permission.js
@@ -15,7 +15,7 @@
state.routes = constantRoutes.concat(routes)
},
SET_SIDEBAR_ROUTERS: (state, routers) => {
- state.sidebarRouters = routers
+ state.sidebarRouters = constantRoutes.concat(routers)
},
},
actions: {
@@ -27,7 +27,7 @@
const sdata = JSON.parse(JSON.stringify(res.data))
const rdata = JSON.parse(JSON.stringify(res.data))
const sidebarRoutes = filterAsyncRouter(sdata)
- const rewriteRoutes = filterAsyncRouter(rdata, true)
+ const rewriteRoutes = filterAsyncRouter(rdata, false, true)
rewriteRoutes.push({ path: '*', redirect: '/404', hidden: true })
commit('SET_ROUTES', rewriteRoutes)
commit('SET_SIDEBAR_ROUTERS', sidebarRoutes)
@@ -39,9 +39,9 @@
}
// 遍历后台传来的路由字符串，转换为组件对象
-function filterAsyncRouter(asyncRouterMap, isRewrite = false) {
+function filterAsyncRouter(asyncRouterMap, lastRouter = false, type = false) {
return asyncRouterMap.filter(route => {
- if (isRewrite && route.children) {
+ if (type && route.children) {
route.children = filterChildren(route.children)
}
if (route.component) {
@@ -55,13 +55,16 @@
}
}
if (route.children != null && route.children && route.children.length) {
- route.children = filterAsyncRouter(route.children, route, isRewrite)
+ route.children = filterAsyncRouter(route.children, route, type)
+ } else {
+ delete route['children']
+ delete route['redirect']
}
return true
})
}
-function filterChildren(childrenMap) {
+function filterChildren(childrenMap, lastRouter = false) {
var children = []
childrenMap.forEach((el, index) => {
if (el.children && el.children.length) {
@@ -74,10 +77,12 @@
}
children.push(c)
})
- childrenMap.splice(index, 1)
return
}
}
+ if (lastRouter) {
+ el.path = lastRouter.path + '/' + el.path
+ }
children = children.concat(el)
})
return children
--
Gitblit v1.9.2