From 2801f5c8ceb1b7ddb77e79d757160c5cb89ff067 Mon Sep 17 00:00:00 2001
From: zhangwei <1504152376@qq.com>
Date: 星期一, 04 八月 2025 17:11:39 +0800
Subject: [PATCH] 个人资料更改
---
src/router/utils.ts | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/router/utils.ts b/src/router/utils.ts
index da5f0cd..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
@@ -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)
);
@@ -151,7 +152,7 @@
/** 澶勭悊鍔ㄦ�佽矾鐢憋紙鍚庣杩斿洖鐨勮矾鐢憋級 */
function handleAsyncRoutes(routeList) {
- if (routeList.length === 0) {
+ if (routeList?.length === 0) {
usePermissionStoreHook().handleWholeMenus(routeList);
} else {
formatFlatteningRoutes(addAsyncRoutes(routeList)).map(
@@ -227,7 +228,7 @@
* @returns 杩斿洖澶勭悊鍚庣殑涓�缁磋矾鐢�
*/
function formatFlatteningRoutes(routesList: RouteRecordRaw[]) {
- if (routesList.length === 0) return routesList;
+ if (routesList?.length === 0) return routesList;
let hierarchyList = buildHierarchyTree(routesList);
for (let i = 0; i < hierarchyList.length; i++) {
if (hierarchyList[i].children) {
@@ -246,7 +247,7 @@
* @returns 杩斿洖灏嗕竴缁存暟缁勯噸鏂板鐞嗘垚瑙勫畾璺敱鐨勬牸寮�
*/
function formatTwoStageRoutes(routesList: RouteRecordRaw[]) {
- if (routesList.length === 0) return routesList;
+ if (routesList?.length === 0) return routesList;
const newRoutesList: RouteRecordRaw[] = [];
routesList.forEach((v: RouteRecordRaw) => {
if (v.path === "/") {
@@ -387,6 +388,8 @@
usePermissionStoreHook().wholeMenus[0]?.children[0]
);
tag && useMultiTagsStoreHook().handleTags("push", topMenu);
+ // console.log(topMenu, "topMenu");
+
return topMenu;
}
--
Gitblit v1.9.1