From 79184f4eebb22a3d327abd2595ad31b0b060b2ae Mon Sep 17 00:00:00 2001
From: Hooray Hu <304327508@qq.com>
Date: Thu, 28 Mar 2024 21:50:48 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=96=87=E4=BB=B6=E8=B7=AF=E7=94=B1?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E4=B8=8B,=E7=94=A8=E6=88=B7=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E5=8F=98=E5=8C=96=E5=90=8E,=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E4=B8=8D=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/components/Menu/index.vue |  2 +-
 src/router/index.ts                   |  8 ++++---
 src/store/modules/menu.ts             | 32 +++++----------------------
 src/store/modules/route.ts            | 23 +++++--------------
 src/store/modules/user.ts             |  1 -
 5 files changed, 18 insertions(+), 48 deletions(-)

diff --git a/src/layouts/components/Menu/index.vue b/src/layouts/components/Menu/index.vue
index 01f38b99..a3c7d703 100644
--- a/src/layouts/components/Menu/index.vue
+++ b/src/layouts/components/Menu/index.vue
@@ -169,7 +169,7 @@ provide(rootMenuInjectionKey, reactive({
       'flex-row! w-auto': isMenuPopup && props.mode === 'horizontal',
     }"
   >
-    <template v-for="(item, index) in menu" :key="index">
+    <template v-for="item in menu" :key="item.path ?? JSON.stringify(item)">
       <SubMenu v-if="item.children?.length" :menu="item" :unique-key="[item.path ?? JSON.stringify(item)]" />
       <Item v-else :item="item" :unique-key="[item.path ?? JSON.stringify(item)]" @click="handleMenuItemClick(item.path ?? JSON.stringify(item))" />
     </template>
diff --git a/src/router/index.ts b/src/router/index.ts
index 8ac655e1..7384a95c 100755
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -57,20 +57,22 @@ router.beforeEach(async (to, from, next) => {
       }
     }
     else {
+      // 获取用户权限
+      settingsStore.settings.app.enablePermission && await userStore.getPermissions()
       // 生成动态路由
       switch (settingsStore.settings.app.routeBaseOn) {
         case 'frontend':
-          await routeStore.generateRoutesAtFront(asyncRoutes)
+          routeStore.generateRoutesAtFront(asyncRoutes)
           break
         case 'backend':
           await routeStore.generateRoutesAtBack()
           break
         case 'filesystem':
-          await routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
+          routeStore.generateRoutesAtFilesystem(asyncRoutesByFilesystem)
           // 文件系统生成的路由，需要手动生成导航数据
           switch (settingsStore.settings.menu.baseOn) {
             case 'frontend':
-              await menuStore.generateMenusAtFront()
+              menuStore.generateMenusAtFront()
               break
             case 'backend':
               await menuStore.generateMenusAtBack()
diff --git a/src/store/modules/menu.ts b/src/store/modules/menu.ts
index 925236a5..3fdf552a 100755
--- a/src/store/modules/menu.ts
+++ b/src/store/modules/menu.ts
@@ -72,14 +72,14 @@ const useMenuStore = defineStore(
       let returnMenus: Menu.recordMainRaw[] = []
       if (settingsStore.settings.app.routeBaseOn !== 'filesystem') {
         returnMenus = convertRouteToMenu(routeStore.routesRaw)
-        // 如果权限功能开启，则需要对导航数据进行筛选过滤
-        if (settingsStore.settings.app.enablePermission) {
-          returnMenus = filterAsyncMenus(returnMenus, userStore.permissions)
-        }
       }
       else {
         returnMenus = filesystemMenusRaw.value
       }
+      // 如果权限功能开启，则需要对导航数据进行筛选过滤
+      if (settingsStore.settings.app.enablePermission) {
+        returnMenus = filterAsyncMenus(returnMenus, userStore.permissions)
+      }
       return returnMenus
     })
     // 次导航数据
@@ -176,32 +176,12 @@ const useMenuStore = defineStore(
     }
     // 生成导航（前端生成）
     async function generateMenusAtFront() {
-      let accessedMenus
-      // 如果权限功能开启，则需要对导航数据进行筛选过滤
-      if (settingsStore.settings.app.enablePermission) {
-        const permissions = await userStore.getPermissions()
-        accessedMenus = filterAsyncMenus(menu, permissions)
-      }
-      else {
-        accessedMenus = cloneDeep(menu)
-      }
-      filesystemMenusRaw.value = accessedMenus.filter(item => item.children.length !== 0)
+      filesystemMenusRaw.value = menu.filter(item => item.children.length !== 0)
     }
     // 生成导航（后端生成）
     async function generateMenusAtBack() {
       await apiApp.menuList().then(async (res) => {
-        const settingsStore = useSettingsStore()
-        const userStore = useUserStore()
-        let accessedMenus: Menu.recordMainRaw[]
-        // 如果权限功能开启，则需要对导航数据进行筛选过滤
-        if (settingsStore.settings.app.enablePermission) {
-          const permissions = await userStore.getPermissions()
-          accessedMenus = filterAsyncMenus(res.data, permissions)
-        }
-        else {
-          accessedMenus = cloneDeep(res.data)
-        }
-        filesystemMenusRaw.value = accessedMenus.filter(item => item.children.length !== 0)
+        filesystemMenusRaw.value = (res.data as Menu.recordMainRaw[]).filter(item => item.children.length !== 0)
       }).catch(() => {})
     }
     // 设置主导航
diff --git a/src/store/modules/route.ts b/src/store/modules/route.ts
index 5b4b3da7..dd5eb5f9 100755
--- a/src/store/modules/route.ts
+++ b/src/store/modules/route.ts
@@ -1,7 +1,6 @@
 import { cloneDeep } from 'lodash-es'
 import type { RouteMeta, RouteRecordRaw } from 'vue-router'
 import useSettingsStore from './settings'
-import useUserStore from './user'
 import { resolveRoutePath } from '@/utils'
 import { systemRoutes } from '@/router/routes'
 import apiApp from '@/api/modules/app'
@@ -12,7 +11,6 @@ const useRouteStore = defineStore(
   'route',
   () => {
     const settingsStore = useSettingsStore()
-    const userStore = useUserStore()
 
     const isGenerate = ref(false)
     const routesRaw = ref<Route.recordMainRaw[]>([])
@@ -147,13 +145,10 @@ const useRouteStore = defineStore(
       return routes
     }
 
-    // 根据权限动态生成路由（前端生成）
-    async function generateRoutesAtFront(asyncRoutes: Route.recordMainRaw[]) {
+    // 生成路由（前端生成）
+    function generateRoutesAtFront(asyncRoutes: Route.recordMainRaw[]) {
       // 设置 routes 数据
       routesRaw.value = converDeprecatedAttribute(cloneDeep(asyncRoutes) as any)
-      if (settingsStore.settings.app.enablePermission) {
-        await userStore.getPermissions()
-      }
       isGenerate.value = true
     }
     // 格式化后端路由数据
@@ -177,24 +172,18 @@ const useRouteStore = defineStore(
         return route
       })
     }
-    // 根据权限动态生成路由（后端获取）
+    // 生成路由（后端获取）
     async function generateRoutesAtBack() {
-      await apiApp.routeList().then(async (res) => {
+      await apiApp.routeList().then((res) => {
         // 设置 routes 数据
         routesRaw.value = converDeprecatedAttribute(formatBackRoutes(res.data) as any)
-        if (settingsStore.settings.app.enablePermission) {
-          await userStore.getPermissions()
-        }
         isGenerate.value = true
       }).catch(() => {})
     }
-    // 根据权限动态生成路由（文件系统生成）
-    async function generateRoutesAtFilesystem(asyncRoutes: RouteRecordRaw[]) {
+    // 生成路由（文件系统生成）
+    function generateRoutesAtFilesystem(asyncRoutes: RouteRecordRaw[]) {
       // 设置 routes 数据
       filesystemRoutesRaw.value = cloneDeep(asyncRoutes) as any
-      if (settingsStore.settings.app.enablePermission) {
-        await userStore.getPermissions()
-      }
       isGenerate.value = true
     }
     // 记录 accessRoutes 路由，用于登出时删除路由
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 4ae54d87..7c89fdf7 100755
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -58,7 +58,6 @@ const useUserStore = defineStore(
     async function getPermissions() {
       const res = await apiUser.permission()
       permissions.value = res.data.permissions
-      return permissions.value
     }
     // 修改密码
     async function editPassword(data: {