功能变化: 优化权限加载问题
parent
42372165ac
commit
d0a9147e84
|
@ -1,6 +1,5 @@
|
||||||
import { uniqueId } from 'lodash'
|
import { uniqueId } from 'lodash'
|
||||||
import { request } from '@/api/service'
|
import { request } from '@/api/service'
|
||||||
import store from '@/store'
|
|
||||||
import XEUtils from 'xe-utils'
|
import XEUtils from 'xe-utils'
|
||||||
import { frameInRoutes, frameOutRoutes } from '@/router/routes'
|
import { frameInRoutes, frameOutRoutes } from '@/router/routes'
|
||||||
const _import = require('@/libs/util.import.' + process.env.NODE_ENV)
|
const _import = require('@/libs/util.import.' + process.env.NODE_ENV)
|
||||||
|
@ -26,7 +25,6 @@ export const menuAside = supplementPath([])
|
||||||
|
|
||||||
// 请求菜单数据,用于解析路由和侧边栏菜单
|
// 请求菜单数据,用于解析路由和侧边栏菜单
|
||||||
export const getMenu = function () {
|
export const getMenu = function () {
|
||||||
store.dispatch('d2admin/permission/load')
|
|
||||||
return request({
|
return request({
|
||||||
url: '/api/system/menu/web_router/',
|
url: '/api/system/menu/web_router/',
|
||||||
method: 'get',
|
method: 'get',
|
||||||
|
|
|
@ -56,6 +56,7 @@ router.beforeEach(async (to, from, next) => {
|
||||||
})
|
})
|
||||||
await store.dispatch('d2admin/user/set', res.data, { root: true })
|
await store.dispatch('d2admin/user/set', res.data, { root: true })
|
||||||
await store.dispatch('d2admin/account/load')
|
await store.dispatch('d2admin/account/load')
|
||||||
|
await store.dispatch('d2admin/permission/load', routes)
|
||||||
store.dispatch('d2admin/dept/load')
|
store.dispatch('d2admin/dept/load')
|
||||||
store.dispatch('d2admin/settings/init')
|
store.dispatch('d2admin/settings/init')
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue