mirror of
https://github.com/continew-org/continew-admin-ui.git
synced 2025-09-12 06:57:11 +08:00
refactor: 拆分并调整路由守卫,优化顶部进度条展示
This commit is contained in:
@@ -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
|
||||
}
|
||||
|
||||
|
@@ -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>({
|
||||
|
Reference in New Issue
Block a user