From 2aa2da6ff94c0e88e7ba0638606881a3c04cf579 Mon Sep 17 00:00:00 2001
From: zhangwei <1504152376@qq.com>
Date: 星期二, 29 七月 2025 16:25:06 +0800
Subject: [PATCH] '-'
---
src/router/utils.ts | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/router/utils.ts b/src/router/utils.ts
index bb895a1..9137806 100644
--- a/src/router/utils.ts
+++ b/src/router/utils.ts
@@ -21,6 +21,7 @@
import { userKey, type DataInfo } from "@/utils/auth";
import { type menuType, routerArrays } from "@/layout/types";
import { useMultiTagsStoreHook } from "@/store/modules/multiTags";
+import { useUserStoreHook } from "@/store/modules/user";
import { usePermissionStoreHook } from "@/store/modules/permission";
const IFrame = () => import("@/layout/frame.vue");
// https://cn.vitejs.dev/guide/features.html#glob-import
@@ -33,7 +34,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 +85,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 +172,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 +206,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 +215,7 @@
} else {
return new Promise(resolve => {
getAsyncRoutes().then(({ data }) => {
- // handleAsyncRoutes(cloneDeep(data));
+ handleAsyncRoutes(cloneDeep(data));
resolve(router);
});
});
@@ -249,7 +250,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,
@@ -387,7 +388,8 @@
usePermissionStoreHook().wholeMenus[0]?.children[0]
);
tag && useMultiTagsStoreHook().handleTags("push", topMenu);
- console.log(topMenu, "topMenu");
+ // console.log(topMenu, "topMenu");
+
return topMenu;
}
--
Gitblit v1.9.1