From 7a8f1cb7741436c43fc5859707da5041d6648953 Mon Sep 17 00:00:00 2001
From: zhangwei <1504152376@qq.com>
Date: 星期一, 21 七月 2025 17:21:41 +0800
Subject: [PATCH] -
---
src/router/utils.ts | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/router/utils.ts b/src/router/utils.ts
index bb895a1..d8ef0f7 100644
--- a/src/router/utils.ts
+++ b/src/router/utils.ts
@@ -33,7 +33,7 @@
const { name, path, parentId, meta } = routeInfo;
return isAllEmpty(parentId)
? isAllEmpty(meta?.rank) ||
- (meta?.rank === 0 && name !== "Welcome" && path !== "/welcome")
+ (meta?.rank === 0 && name !== "Home" && path !== "/")
? true
: false
: false;
@@ -84,7 +84,7 @@
/** 浠巐ocalStorage閲屽彇鍑哄綋鍓嶇櫥褰曠敤鎴风殑瑙掕壊roles锛岃繃婊ゆ棤鏉冮檺鐨勮彍鍗� */
function filterNoPermissionTree(data: RouteComponent[]) {
const currentRoles =
- storageLocal().getItem<DataInfo<number>>(userKey)?.roles ?? [];
+ storageLocal().getItem<DataInfo<number>>(userKey)?.exRoles ?? [];
const newTree = cloneDeep(data).filter((v: any) =>
isOneOfArray(v.meta?.roles, currentRoles)
);
@@ -171,7 +171,7 @@
if (!router.hasRoute(v?.name)) router.addRoute(v);
const flattenRouters: any = router
.getRoutes()
- .find(n => n.path === "/welcome");
+ .find(n => n.path === "/");
// 淇濇寔router.options.routes[0].children涓巔ath涓�"/"鐨刢hildren涓�鑷达紝闃叉鏁版嵁涓嶄竴鑷村鑷村紓甯�
flattenRouters.children = router.options.routes[0].children;
router.addRoute(flattenRouters);
@@ -205,8 +205,8 @@
} else {
return new Promise(resolve => {
getAsyncRoutes().then(({ data }) => {
- // handleAsyncRoutes(cloneDeep(data));
- // storageLocal().setItem(key, data);
+ handleAsyncRoutes(cloneDeep(data));
+ storageLocal().setItem(key, data);
resolve(router);
});
});
@@ -214,7 +214,7 @@
} else {
return new Promise(resolve => {
getAsyncRoutes().then(({ data }) => {
- // handleAsyncRoutes(cloneDeep(data));
+ handleAsyncRoutes(cloneDeep(data));
resolve(router);
});
});
@@ -249,7 +249,7 @@
if (routesList?.length === 0) return routesList;
const newRoutesList: RouteRecordRaw[] = [];
routesList.forEach((v: RouteRecordRaw) => {
- if (v.path === "/welcome") {
+ if (v.path === "/") {
newRoutesList.push({
component: v.component,
name: v.name,
@@ -388,6 +388,7 @@
);
tag && useMultiTagsStoreHook().handleTags("push", topMenu);
console.log(topMenu, "topMenu");
+
return topMenu;
}
--
Gitblit v1.9.1