From 0e3550b5f89b778415691cb045e00b462f20a340 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Thu, 25 Sep 2025 16:35:53 +0800
Subject: [PATCH] =?UTF-8?q?refactor(permission):=20:recycle:=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E8=B7=AF=E7=94=B1=E6=9D=83=E9=99=90=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=EF=BC=8C=E7=AE=80=E5=8C=96=E5=91=BD=E5=90=8D=E5=92=8C=E8=81=8C?=
 =?UTF-8?q?=E8=B4=A3=E5=88=86=E7=A6=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CURD/PageContent.vue   |  4 +-
 src/plugins/permission.ts             | 40 +++--------
 src/store/modules/permission-store.ts | 99 +++++++++------------------
 src/utils/auth.ts                     | 19 ++++-
 4 files changed, 63 insertions(+), 99 deletions(-)

diff --git a/src/components/CURD/PageContent.vue b/src/components/CURD/PageContent.vue
index 8437cacd..6ca9bb75 100644
--- a/src/components/CURD/PageContent.vue
+++ b/src/components/CURD/PageContent.vue
@@ -322,7 +322,7 @@
 </template>
 
 <script setup lang="ts">
-import { hasAuth } from "@/plugins/permission";
+import { hasPerm } from "@/utils/auth";
 import { useDateFormat, useThrottleFn } from "@vueuse/core";
 import {
   genFileId,
@@ -387,7 +387,7 @@ function hasButtonPerm(action: string): boolean {
   const perm = getButtonPerm(action);
   // 如果没有设置权限标识，则默认具有权限
   if (!perm) return true;
-  return hasAuth(perm);
+  return hasPerm(perm);
 }
 
 // 创建工具栏按钮
diff --git a/src/plugins/permission.ts b/src/plugins/permission.ts
index 33d4d601..c81379ff 100644
--- a/src/plugins/permission.ts
+++ b/src/plugins/permission.ts
@@ -2,16 +2,14 @@ import type { RouteRecordRaw } from "vue-router";
 import NProgress from "@/utils/nprogress";
 import router from "@/router";
 import { usePermissionStore, useUserStore } from "@/store";
-import { ROLE_ROOT } from "@/constants";
 
 export function setupPermission() {
-  const whiteList = ["/login"]; // 无需登录的页面
+  const whiteList = ["/login"];
 
   router.beforeEach(async (to, from, next) => {
     NProgress.start();
 
     try {
-      // 使用 store 暴露的登录态，便于后续扩展（如基于过期时间等）
       const isLoggedIn = useUserStore().isLoggedIn();
 
       // 未登录处理
@@ -25,18 +23,17 @@ export function setupPermission() {
         return;
       }
 
-      // 已登录且访问登录页，重定向到首页
+      // 已登录登录页重定向
       if (to.path === "/login") {
         next({ path: "/" });
         return;
       }
 
-      // 已登录用户的正常访问
       const permissionStore = usePermissionStore();
       const userStore = useUserStore();
 
-      // 路由未生成则生成
-      if (!permissionStore.isDynamicRoutesGenerated) {
+      // 动态路由生成
+      if (!permissionStore.isRouteGenerated) {
         if (!userStore.userInfo?.roles?.length) {
           await userStore.getUserInfo();
         }
@@ -50,13 +47,13 @@ export function setupPermission() {
         return;
       }
 
-      // 检查路由是否存在
+      // 路由404检查
       if (to.matched.length === 0) {
         next("/404");
         return;
       }
 
-      // 设置页面标题
+      // 动态标题设置
       const title = (to.params.title as string) || (to.query.title as string);
       if (title) {
         to.meta.title = title;
@@ -64,13 +61,9 @@ export function setupPermission() {
 
       next();
     } catch (error) {
-      console.error("❌ Route guard error:", error);
-      // 出错时清理状态并重定向到登录页
-      try {
-        await useUserStore().resetAllState();
-      } catch (resetError) {
-        console.error("❌ Failed to reset user state:", resetError);
-      }
+      // 错误处理：重置状态并跳转登录
+      console.error("Route guard error:", error);
+      await useUserStore().resetAllState();
       next("/login");
       NProgress.done();
     }
@@ -80,18 +73,3 @@ export function setupPermission() {
     NProgress.done();
   });
 }
-
-/** 判断是否有权限 */
-export function hasAuth(value: string | string[], type: "button" | "role" = "button") {
-  const { roles, perms } = useUserStore().userInfo;
-
-  // 超级管理员 拥有所有权限
-  if (type === "button" && roles.includes(ROLE_ROOT)) {
-    return true;
-  }
-
-  const auths = type === "button" ? perms : roles;
-  return typeof value === "string"
-    ? auths.includes(value)
-    : value.some((perm) => auths.includes(perm));
-}
diff --git a/src/store/modules/permission-store.ts b/src/store/modules/permission-store.ts
index a4088f7f..f9abc3a1 100644
--- a/src/store/modules/permission-store.ts
+++ b/src/store/modules/permission-store.ts
@@ -5,7 +5,7 @@ import router from "@/router";
 
 import MenuAPI, { type RouteVO } from "@/api/system/menu-api";
 const modules = import.meta.glob("../../views/**/**.vue");
-const Layout = () => import("@/layouts/index.vue");
+const Layout = () => import("../../layouts/index.vue");
 
 export const usePermissionStore = defineStore("permission", () => {
   // 所有路由（静态路由 + 动态路由）
@@ -13,42 +13,34 @@ export const usePermissionStore = defineStore("permission", () => {
   // 混合布局的左侧菜单路由
   const mixLayoutSideMenus = ref<RouteRecordRaw[]>([]);
   // 动态路由是否已生成
-  const isDynamicRoutesGenerated = ref(false);
+  const isRouteGenerated = ref(false);
 
-  /**
-   * 生成动态路由
-   */
+  /** 生成动态路由 */
   async function generateRoutes(): Promise<RouteRecordRaw[]> {
     try {
-      const data = await MenuAPI.getRoutes(); // 获取当前登录人拥有的菜单路由
-      const processRouteList = processRoutes(data); // 处理后的路由数据
-      const dynamicRoutes = parseDynamicRoutes(processRouteList);
+      const data = await MenuAPI.getRoutes(); // 获取当前登录人的菜单路由
+      const dynamicRoutes = transformRoutes(data);
 
       routes.value = [...constantRoutes, ...dynamicRoutes];
-
-      isDynamicRoutesGenerated.value = true;
+      isRouteGenerated.value = true;
 
       return dynamicRoutes;
     } catch (error) {
-      console.error("❌ Failed to generate routes:", error);
-      isDynamicRoutesGenerated.value = false;
+      // 路由生成失败，重置状态
+      isRouteGenerated.value = false;
       throw error;
     }
   }
 
-  /**
-   * 设置混合布局的左侧菜单
-   */
+  /** 设置混合布局左侧菜单 */
   const setMixLayoutSideMenus = (parentPath: string) => {
     const parentMenu = routes.value.find((item) => item.path === parentPath);
     mixLayoutSideMenus.value = parentMenu?.children || [];
   };
 
-  /**
-   * 重置路由状态
-   */
+  /** 重置路由状态 */
   const resetRouter = () => {
-    // 移除动态路由
+    // 移除动态添加的路由
     const constantRouteNames = new Set(constantRoutes.map((route) => route.name).filter(Boolean));
     routes.value.forEach((route) => {
       if (route.name && !constantRouteNames.has(route.name)) {
@@ -56,16 +48,16 @@ export const usePermissionStore = defineStore("permission", () => {
       }
     });
 
-    // 重置状态
+    // 重置所有状态
     routes.value = [...constantRoutes];
     mixLayoutSideMenus.value = [];
-    isDynamicRoutesGenerated.value = false;
+    isRouteGenerated.value = false;
   };
 
   return {
     routes,
     mixLayoutSideMenus,
-    isDynamicRoutesGenerated,
+    isRouteGenerated,
     generateRoutes,
     setMixLayoutSideMenus,
     resetRouter,
@@ -73,63 +65,40 @@ export const usePermissionStore = defineStore("permission", () => {
 });
 
 /**
- * 解析后端返回的路由数据并转换为 Vue Router 兼容的路由配置
- *
- * @param rawRoutes 后端返回的原始路由数据
- * @returns 解析后的路由集合
+ * 转换后端路由数据为Vue Router配置
+ * 处理组件路径映射和Layout层级嵌套
  */
-const parseDynamicRoutes = (rawRoutes: RouteVO[]): RouteRecordRaw[] => {
-  const parsedRoutes: RouteRecordRaw[] = [];
+const transformRoutes = (routes: RouteVO[], isTopLevel: boolean = true): RouteRecordRaw[] => {
+  return routes.map((route) => {
+    const { component, children, ...args } = route;
 
-  rawRoutes.forEach((route) => {
-    const normalizedRoute = { ...route } as RouteRecordRaw;
+    // 处理组件：顶层或非Layout保留组件，中间层Layout设为undefined
+    const processedComponent = isTopLevel || component !== "Layout" ? component : undefined;
 
-    if (!normalizedRoute.component) {
-      // 如果没有组件，则将组件设置为 undefined 防止404 例如(多级菜单的父菜单)
+    const normalizedRoute = { ...args } as RouteRecordRaw;
+
+    if (!processedComponent) {
+      // 多级菜单的父级菜单，不需要组件
       normalizedRoute.component = undefined;
     } else {
-      // 处理组件路径
+      // 动态导入组件，Layout特殊处理，找不到组件时返回404
       normalizedRoute.component =
-        normalizedRoute.component?.toString() === "Layout"
+        processedComponent === "Layout"
           ? Layout
-          : modules[`../../views/${normalizedRoute.component}.vue`] ||
-            modules[`../../views/error/404.vue`]; // 找不到页面时，返回404页面
+          : modules[`../../views/${processedComponent}.vue`] ||
+            modules[`../../views/error/404.vue`];
     }
 
-    // 递归解析子路由
-    if (normalizedRoute.children) {
-      normalizedRoute.children = parseDynamicRoutes(route.children);
+    // 递归处理子路由
+    if (children && children.length > 0) {
+      normalizedRoute.children = transformRoutes(children, false);
     }
 
-    parsedRoutes.push(normalizedRoute);
-  });
-
-  return parsedRoutes;
-};
-
-/**
- * 路由处理函数
- *  - 去除中间层路由 `component: Layout` 的 `component` 属性
- * @param routes 路由数组
- * @param isTopLevel 是否是顶层路由
- */
-const processRoutes = (routes: RouteVO[], isTopLevel: boolean = true): RouteVO[] => {
-  return routes.map(({ component, children, ...args }) => {
-    return {
-      ...args,
-      component: isTopLevel || component !== "Layout" ? component : undefined,
-      //  递归处理children，标记为非顶层  todo 原样返回 children（undefined）
-      children: children && children.length > 0 ? processRoutes(children, false) : children,
-    };
+    return normalizedRoute;
   });
 };
 
-/**
- * 导出此hook函数用于在非组件环境(如其他store、工具函数等)中获取权限store实例
- *
- * 在组件中可直接使用usePermissionStore()，但在组件外部需要传入store实例
- * 此函数简化了这个过程，避免每次都手动传入store参数
- */
+/** 非组件环境使用权限store */
 export function usePermissionStoreHook() {
   return usePermissionStore(store);
 }
diff --git a/src/utils/auth.ts b/src/utils/auth.ts
index e5931c0f..3f55acea 100644
--- a/src/utils/auth.ts
+++ b/src/utils/auth.ts
@@ -1,5 +1,5 @@
 import { Storage } from "./storage";
-import { AUTH_KEYS } from "@/constants";
+import { AUTH_KEYS, ROLE_ROOT } from "@/constants";
 import { useUserStoreHook } from "@/store/modules/user-store";
 import router from "@/router";
 
@@ -44,6 +44,23 @@ export const AuthStorage = {
   },
 };
 
+/**
+ * 权限判断
+ */
+export function hasPerm(value: string | string[], type: "button" | "role" = "button"): boolean {
+  const { roles, perms } = useUserStoreHook().userInfo;
+
+  // 超级管理员拥有所有权限
+  if (type === "button" && roles.includes(ROLE_ROOT)) {
+    return true;
+  }
+
+  const auths = type === "button" ? perms : roles;
+  return typeof value === "string"
+    ? auths.includes(value)
+    : value.some((perm) => auths.includes(perm));
+}
+
 /**
  * 重定向到登录页面
  */