From 2c40a892f8de3bdf1b2ec9b76afd23a603c3bcb7 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期日, 07 二月 2021 09:18:17 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
ruoyi-ui/src/store/modules/permission.js | 16 +++++++++++-----
ruoyi-ui/src/views/system/role/index.vue | 10 ++++++++--
2 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/ruoyi-ui/src/store/modules/permission.js b/ruoyi-ui/src/store/modules/permission.js
index 92db4f6..80015b0 100644
--- a/ruoyi-ui/src/store/modules/permission.js
+++ b/ruoyi-ui/src/store/modules/permission.js
@@ -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) {
@@ -77,6 +80,9 @@
return
}
}
+ if (lastRouter) {
+ el.path = lastRouter.path + '/' + el.path
+ }
children = children.concat(el)
})
return children
diff --git a/ruoyi-ui/src/views/system/role/index.vue b/ruoyi-ui/src/views/system/role/index.vue
index 68a199b..3cb6df9 100644
--- a/ruoyi-ui/src/views/system/role/index.vue
+++ b/ruoyi-ui/src/views/system/role/index.vue
@@ -213,7 +213,7 @@
<el-input v-model="form.roleKey" :disabled="true" />
</el-form-item>
<el-form-item label="鏉冮檺鑼冨洿">
- <el-select v-model="form.dataScope">
+ <el-select v-model="form.dataScope" @change="dataScopeSelectChange">
<el-option
v-for="item in dataScopeOptions"
:key="item.value"
@@ -524,6 +524,12 @@
this.title = "淇敼瑙掕壊";
});
},
+ /** 閫夋嫨瑙掕壊鏉冮檺鑼冨洿瑙﹀彂 */
+ dataScopeSelectChange(value) {
+ if(value !== '2') {
+ this.$refs.dept.setCheckedKeys([]);
+ }
+ },
/** 鍒嗛厤鏁版嵁鏉冮檺鎿嶄綔 */
handleDataScope(row) {
this.reset();
@@ -601,4 +607,4 @@
}
}
};
-</script>
+</script>
\ No newline at end of file
--
Gitblit v1.9.3