refactor: 拆分并调整路由守卫,优化顶部进度条展示

This commit is contained in:
2024-11-21 22:47:54 +08:00
parent 246d638a8f
commit e8941adde4
6 changed files with 113 additions and 100 deletions

View File

@@ -3,7 +3,7 @@ import { defineStore } from 'pinia'
import type { RouteRecordRaw } from 'vue-router'
import { mapTree, toTreeArray } from 'xe-utils'
import { cloneDeep, omit } from 'lodash-es'
import { constantRoutes } from '@/router'
import { constantRoutes, systemRoutes } from '@/router/route'
import ParentView from '@/components/ParentView/index.vue'
import { type RouteItem, getUserRoute } from '@/apis'
import { transformPathToName } from '@/utils'
@@ -103,7 +103,7 @@ const storeSetup = () => {
// 合并路由
const setRoutes = (data: RouteRecordRaw[]) => {
routes.value = constantRoutes.concat(data)
routes.value = [...constantRoutes, ...systemRoutes].concat(data)
asyncRoutes.value = data
}

View File

@@ -14,7 +14,7 @@ import {
socialLogin as socialLoginApi,
} from '@/apis'
import { clearToken, getToken, setToken } from '@/utils/auth'
import { resetHasRouteFlag } from '@/router/permission'
import { resetHasRouteFlag } from '@/router/guard'
const storeSetup = () => {
const userInfo = reactive<UserInfo>({