From c334c2d76c1b51d0fbe1531bf524e1b90f921a7c Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 20 五月 2025 15:16:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/store/modules/permission.js | 31 ++++++++++---------------------
1 files changed, 10 insertions(+), 21 deletions(-)
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index c1c862b..6a16d9d 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -85,24 +85,13 @@
function filterChildren(childrenMap, lastRouter = false) {
var children = []
- childrenMap.forEach((el, index) => {
- if (el.children && el.children.length) {
- if (el.component === 'ParentView' && !lastRouter) {
- el.children.forEach(c => {
- c.path = el.path + '/' + c.path
- if (c.children && c.children.length) {
- children = children.concat(filterChildren(c.children, c))
- return
- }
- children.push(c)
- })
- return
- }
+ childrenMap.forEach(el => {
+ el.path = lastRouter ? lastRouter.path + '/' + el.path : el.path
+ if (el.children && el.children.length && el.component === 'ParentView') {
+ children = children.concat(filterChildren(el.children, el))
+ } else {
+ children.push(el)
}
- if (lastRouter) {
- el.path = lastRouter.path + '/' + el.path
- }
- children = children.concat(el)
})
return children
}
@@ -125,14 +114,14 @@
}
export const loadView = (view) => {
- let res;
+ let res
for (const path in modules) {
- const dir = path.split('views/')[1].split('.vue')[0];
+ const dir = path.split('views/')[1].split('.vue')[0]
if (dir === view) {
- res = () => modules[path]();
+ res = () => modules[path]()
}
}
- return res;
+ return res
}
export default usePermissionStore
--
Gitblit v1.9.3