fix: #I5KCI6

yudao-ui-admin-vue3/src/store/modules/dict.ts

@@ -13,14 +13,12 @@ export interface DictTypeType {
   dictValue: DictValueType[]
 }
 export interface DictState {
-  isSetDict: boolean
   dictMap: Recordable
 }
 
 export const useDictStore = defineStore({
   id: 'dict',
   state: (): DictState => ({
-    isSetDict: false,
     dictMap: {}
   }),
   persist: {
@@ -30,8 +28,12 @@ export const useDictStore = defineStore({
     getDictMap(): Recordable {
       return this.dictMap
     },
-    getIsSetDict(): boolean {
-      return this.isSetDict
+    getHasDictData(): Boolean {
+      if (this.dictMap.length > 0) {
+        return true
+      } else {
+        return false
+      }
     }
   },
   actions: {
@@ -53,9 +55,6 @@ export const useDictStore = defineStore({
         })
       })
       this.dictMap = dictMap
-    },
-    setIsSetDict(isSetDict: boolean) {
-      this.isSetDict = isSetDict
     }
   }
 })

yudao-ui-admin-vue3/src/store/modules/permission.ts

@@ -2,12 +2,15 @@ import { defineStore } from 'pinia'
 import { store } from '../index'
 import { cloneDeep } from 'lodash-es'
 import remainingRouter from '@/router/modules/remaining'
-import { generateRoutes, flatMultiLevelRoutes } from '@/utils/routerHelper'
+import { generateRoute, flatMultiLevelRoutes } from '@/utils/routerHelper'
+import { getAsyncRoutesApi } from '@/api/login'
+import { useCache } from '@/hooks/web/useCache'
+
+const { wsCache } = useCache()
 
 export interface PermissionState {
   routers: AppRouteRecordRaw[]
   addRouters: AppRouteRecordRaw[]
-  isAddRouters: boolean
   menuTabRouters: AppRouteRecordRaw[]
 }
 
@@ -16,7 +19,6 @@ export const usePermissionStore = defineStore({
   state: (): PermissionState => ({
     routers: [],
     addRouters: [],
-    isAddRouters: false,
     menuTabRouters: []
   }),
   persist: {
@@ -29,18 +31,21 @@ export const usePermissionStore = defineStore({
     getAddRouters(): AppRouteRecordRaw[] {
       return flatMultiLevelRoutes(cloneDeep(this.addRouters))
     },
-    getIsAddRouters(): boolean {
-      return this.isAddRouters
-    },
     getMenuTabRouters(): AppRouteRecordRaw[] {
       return this.menuTabRouters
     }
   },
   actions: {
-    generateRoutes(routers?: AppCustomRouteRecordRaw[] | string[]): Promise<unknown> {
-      return new Promise<void>((resolve) => {
-        let routerMap: AppRouteRecordRaw[] = []
-        routerMap = generateRoutes(routers as AppCustomRouteRecordRaw[])
+    async generateRoutes(): Promise<unknown> {
+      return new Promise<void>(async (resolve) => {
+        let res: AppCustomRouteRecordRaw[]
+        if (wsCache.get('roleRouters')) {
+          res = wsCache.get('roleRouters') as AppCustomRouteRecordRaw[]
+        } else {
+          res = await getAsyncRoutesApi()
+          wsCache.set('roleRouters', res)
+        }
+        const routerMap: AppRouteRecordRaw[] = generateRoute(res as AppCustomRouteRecordRaw[])
         // 动态路由，404一定要放到最后面
         this.addRouters = routerMap.concat([
           {
@@ -58,9 +63,6 @@ export const usePermissionStore = defineStore({
         resolve()
       })
     },
-    setIsAddRouters(state: boolean): void {
-      this.isAddRouters = state
-    },
     setMenuTabRouters(routers: AppRouteRecordRaw[]): void {
       this.menuTabRouters = routers
     }

yudao-ui-admin-vue3/src/store/modules/user.ts

@@ -1,18 +1,19 @@
 import { store } from '../index'
 import { defineStore } from 'pinia'
-import { getAccessToken } from '@/utils/auth'
+import { getAccessToken, removeToken } from '@/utils/auth'
 import { useCache } from '@/hooks/web/useCache'
 
 const { wsCache } = useCache()
 
+interface UserVO {
+  id: number
+  avatar: string
+  nickname: string
+}
 interface UserInfoVO {
-  permissions: []
-  roles: []
-  user: {
-    avatar: string
-    id: number
-    nickname: string
-  }
+  permissions: string[]
+  roles: string[]
+  user: UserVO
 }
 
 export const useUserStore = defineStore({
@@ -26,6 +27,17 @@ export const useUserStore = defineStore({
       nickname: ''
     }
   }),
+  getters: {
+    getPermissions(): string[] {
+      return this.permissions
+    },
+    getRoles(): string[] {
+      return this.roles
+    },
+    getUser(): UserVO {
+      return this.user
+    }
+  },
   actions: {
     async getUserInfoAction(userInfo: UserInfoVO) {
       if (!getAccessToken()) {
@@ -37,6 +49,11 @@ export const useUserStore = defineStore({
       this.user = userInfo.user
       wsCache.set('user', userInfo)
     },
+    loginOut() {
+      removeToken()
+      wsCache.clear()
+      this.resetState()
+    },
     resetState() {
       this.permissions = []
       this.roles = []