Merge branch 'main' into release/v1

CHANGELOG.md

@@ -1,6 +1,18 @@
 # Changelog
 
 
+## v1.6.0
+
+[compare changes](https://github.com/yisibell/vue3-admin-starter/compare/v1.5.2...v1.6.0)
+
+### 🚀 Enhancements
+
+- Remove dynamic routes when logout ([0556b26](https://github.com/yisibell/vue3-admin-starter/commit/0556b26))
+
+### ❤️ Contributors
+
+- Wenqing <wenqing@kerrylan.com>
+
 ## v1.5.2
 
 [compare changes](https://github.com/yisibell/vue3-admin-starter/compare/v1.5.1...v1.5.2)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue3-admin-starter",
-  "version": "1.5.2",
+  "version": "1.6.0",
   "description": "A vue admin template powered by vite + typescript + vue3 + vue-router + pinia + element-plus + axios.",
   "author": {
     "name": "elenh",

src/stores/permission.ts

@@ -6,6 +6,21 @@ import type { IGetAllResourceParams, IRouteResourceInfo } from '@/api/resource/i
 import { getAllResource } from '@/api/resource'
 import cloneDeep from 'lodash/cloneDeep'
 import settings from '@/settings'
+import router from '@/router'
+
+const flatRouteNames = (routes: IRouteRecord[], res: (string | symbol)[] = []) => {
+  routes.forEach((v) => {
+    if (v.name) {
+      res.push(v.name)
+    }
+
+    if (v.children && v.children.length > 0) {
+      flatRouteNames(v.children, res)
+    }
+  })
+
+  return res
+}
 
 export const usePermissionStore = defineStore('permission', {
   state: () => ({
@@ -15,6 +30,11 @@ export const usePermissionStore = defineStore('permission', {
     resources: [] as IRouteResourceInfo[],
     resourceAuthCodes: [] as string[]
   }),
+  getters: {
+    dynamicRouteNames(): (string | symbol)[] {
+      return [...new Set([...flatRouteNames(this.dynamicRoutes)])]
+    }
+  },
   actions: {
     SET_ROUTES(routes: IRouteRecord[]) {
       this.dynamicRoutes = routes
@@ -66,6 +86,14 @@ export const usePermissionStore = defineStore('permission', {
 
       this.SET_ROUTES(addRoutes)
       this.SET_RESOURCE_AUTH_CODES(createAuthList(this.resources, resourceIds, isAdmin))
+    },
+    /** 删除动态路由 */
+    removeDynamicRoutes() {
+      this.dynamicRouteNames.forEach((name) => {
+        if (router.hasRoute(name)) {
+          router.removeRoute(name)
+        }
+      })
     }
   }
 })

src/stores/user.ts

@@ -1,6 +1,7 @@
 import { defineStore } from 'pinia'
 import { computed, ref } from 'vue'
 import { useTagsViewStore } from '@/stores/tagsView'
+import { usePermissionStore } from '@/stores/permission'
 import type { IUserInfo } from '@/api/user/index.interface'
 import { getUserInfo } from '@/api/user'
 
@@ -16,6 +17,7 @@ export const useUserStore = defineStore(
   'user',
   () => {
     const TagsViewStore = useTagsViewStore()
+    const PermissionStore = usePermissionStore()
 
     const accessToken = ref('')
     const setToken = (token: string = '') => {
@@ -42,6 +44,7 @@ export const useUserStore = defineStore(
     const logout = () => {
       setToken('')
       TagsViewStore.delAllViews()
+      PermissionStore.removeDynamicRoutes()
       setUserInfo(defaultUserInfo())
     }