Mes
/
middle-admin-ant
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

持续修整内容

This commit is contained in:
zxx 2022-10-14 14:39:39 +08:00
parent d19ce89143
commit b5bf802ab2
23 changed files with 356 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.env
View File

@ -2,8 +2,11 @@ VUE_APP_PUBLIC_PATH=/
VUE_APP_NAME=Admin
VUE_APP_ROUTES_KEY=admin.routes
VUE_APP_PERMISSIONS_KEY=admin.permissions
VUE_APP_UID_KEY=admin.uid
VUE_APP_USER_KEY=admin.user
VUE_APP_SETTING_KEY=admin.setting
VUE_APP_USER_SETTINGS_KEY=admin.user.settings
VUE_APP_TBAS_KEY=admin.tabs
VUE_APP_TBAS_TITLES_KEY=admin.tabs.titles
VUE_APP_API_BASE_URL=http://192.168.31.91:19000
# VUE_APP_API_BASE_URL=http://192.168.31.91:19000
VUE_APP_API_BASE_URL=http://192.168.52.166:30000

3
.env.development
View File

@ -1 +1,2 @@
VUE_APP_API_BASE_URL=http://192.168.31.91:19000
VUE_APP_API_BASE_URL=http://192.168.52.166:30000

28
src/layouts/AdminLayout.vue
View File

@ -1,10 +1,15 @@
<template>
<a-layout :class="['admin-layout', 'beauty-scroll']">
<drawer v-if="isMobile" v-model="drawerOpen">
<side-menu :theme="theme.mode" :menuData="menuData" :collapsed="false" :collapsible="false" @menuSelect="onMenuSelect"/>
<side-menu :theme="theme.mode" :menuData="menuData" :collapsed="false" :collapsible="false"
@menuSelect="onMenuSelect" />
</drawer>
<side-menu :class="[fixedSideBar ? 'fixed-side' : '']" :theme="theme.mode" v-else-if="layout === 'side' || layout === 'mix'" :menuData="sideMenuData" :collapsed="collapsed" :collapsible="true" />
<div v-if="fixedSideBar && !isMobile" :style="`width: ${sideMenuWidth}; min-width: ${sideMenuWidth};max-width: ${sideMenuWidth};`" class="virtual-side"></div>
<side-menu :class="[fixedSideBar ? 'fixed-side' : '']" :theme="theme.mode"
v-else-if="layout === 'side' || layout === 'mix'" :menuData="sideMenuData" :collapsed="collapsed"
:collapsible="true" />
<div v-if="fixedSideBar && !isMobile"
:style="`width: ${sideMenuWidth}; min-width: ${sideMenuWidth};max-width: ${sideMenuWidth};`" class="virtual-side">
</div>
<drawer v-if="!hideSetting" v-model="showSetting" placement="right">
<div class="setting" slot="handler">
<a-icon :type="showSetting ? 'close' : 'setting'" />
@ -12,8 +17,11 @@
<setting />
</drawer>
<a-layout class="admin-layout-main beauty-scroll">
<admin-header :class="[{'fixed-tabs': fixedTabs, 'fixed-header': fixedHeader, 'multi-page': multiPage}]" :style="headerStyle" :menuData="headMenuData" :collapsed="collapsed" @toggleCollapse="toggleCollapse"/>
<a-layout-header :class="['virtual-header', {'fixed-tabs' : fixedTabs, 'fixed-header': fixedHeader, 'multi-page': multiPage}]" v-show="fixedHeader"></a-layout-header>
<admin-header :class="[{'fixed-tabs': fixedTabs, 'fixed-header': fixedHeader, 'multi-page': multiPage}]"
:style="headerStyle" :menuData="headMenuData" :collapsed="collapsed" @toggleCollapse="toggleCollapse" />
<a-layout-header
:class="['virtual-header', {'fixed-tabs' : fixedTabs, 'fixed-header': fixedHeader, 'multi-page': multiPage}]"
v-show="fixedHeader"></a-layout-header>
<a-layout-content class="admin-layout-content" :style="`min-height: ${minHeight}px;`">
<div style="position: relative">
<slot></slot>
@ -35,8 +43,6 @@ import Setting from '../components/setting/Setting' // 加载设置组件
import { mapState, mapMutations, mapGetters } from 'vuex' // 加载vuex
// const minHeight = window.innerHeight - 64 - 122
export default {
@ -116,6 +122,7 @@ export default {
created() { // 创建
this.correctPageMinHeight(this.minHeight - 24) // 设置页面最小高度
this.setActivated(this.$route) // 设置激活
},
beforeDestroy() { // 销毁前
this.correctPageMinHeight(-this.minHeight + 24) // 设置页面最小高度
@ -133,32 +140,39 @@ export default {
top: 0;
}
}
.virtual-side {
transition: all 0.2s;
}
.virtual-header {
transition: all 0.2s;
opacity: 0;
&.fixed-tabs.multi-page:not(.fixed-header) {
height: 0;
}
}
.admin-layout-main {
.admin-header {
top: 0;
right: 0;
overflow: hidden;
transition: all 0.2s;
&.fixed-tabs.multi-page:not(.fixed-header) {
height: 0;
}
}
}
.admin-layout-content {
padding: 24px 24px 0;
/*overflow-x: hidden;*/
/*min-height: calc(100vh - 64px - 122px);*/
}
.setting {
background-color: @primary-color;
color: @base-bg-color;

2
src/layouts/PageLayout.vue
View File

@ -86,6 +86,8 @@ export default {
marginCorrect() { // 间距修正
return this.multiPage ? 24 : 0 // 返回多页签间距修正
}
},
methods: {
...mapMutations('setting', ['correctPageMinHeight']), // 获取vuex方法 更新页面最小高度

1
src/layouts/PageView.vue
View File

@ -14,6 +14,7 @@ import PageLayout from './PageLayout'
import PageToggleTransition from '../components/transition/PageToggleTransition';
import {mapState} from 'vuex'
export default {
name: 'PageView',
components: {PageToggleTransition, PageLayout},

69
src/pages/login/Login.vue
View File

@ -82,10 +82,15 @@
<script>
import CommonLayout from '@/layouts/CommonLayout'
import {login, getRoutesConfig} from '@/services/base/user'
import {login,getUserInfo, getRoutesConfig,getPermission,getSettings} from '@/services/base/user'
import {setAuthorization} from '@/utils/request'
import {loadRoutes} from '@/utils/routerUtil'
import {mapMutations} from 'vuex'
// import axios from 'axios'
export default {
name: 'Login',
@ -120,29 +125,9 @@ export default {
}) // loadsh的pick方法
// // axios.post("http://192.168.52.166:30000/AdminUser/v1/login")
// axios.post("http://192.168.31.91:19000/AdminUser/v1/login",{
// // "mobile": "18678390480",
// // "password": "888888"
// },
// {
// // withCredentials: false
// })
// axios.post("http://192.168.31.91:19000/AdminUser/v1/routers",{
// // 跨域请求
// withCredentials: false,
// headers: {
// 'Content-Type': 'application/x-www-form-urlencoded',
// 'Access-Control-Allow-Origin': '*',
// 'Access-Control-Allow-Methods': 'GET, POST, PUT, DELETE, OPTIONS',
// }
// })
},
methods: {
...mapMutations('account', ['setUser']),
...mapMutations('account', ['setUid','setUser','setPermissions','setRoutesConfig','setSettings']),
onSubmit (e) {
e.preventDefault()
@ -160,23 +145,39 @@ export default {
this.logging = false
const loginRes = res.data
if (loginRes.code == 200) {
const user = loginRes.data.uid
console.log("user",user)
console.log("loginRes.data.access_expire",loginRes.data.access_expire)
console.log("loginRes.data.access_token",loginRes.data.access_token)
this.setUser(user)
// this.setPermissions(permissions)
setAuthorization({token: loginRes.data.access_token, expireAt: new Date(loginRes.data.access_expire*1000)})
// 获取路由配置
getRoutesConfig().then(result => {
const uid = loginRes.data.uid
setAuthorization({token: loginRes.data.access_token, expireAt: new Date(loginRes.data.access_expire*1000)}) // 设置token
this.setUid(uid) // 设置用户id
getUserInfo().then(result =>{ // 获取用户信息
console.log("UserInforesult:",result)
const UserInfo = result.data.data.user_info
console.log("UserInfo",UserInfo)
this.setUser(UserInfo)
})
getPermission().then(result => { // 获取权限
const Permission = result.data.data.permission
console.log("Permissionresult:",result)
this.setPermissions(Permission)
})
getRoutesConfig().then(result => { // 获取路由配置
const routesConfig = result.data.data
console.log("获取路由配置",[routesConfig])
this.setRoutesConfig(routesConfig)
loadRoutes([routesConfig])
console.log("开始跳转")
this.$router.push('/dashboard/workplace')
console.log("跳转结束")
this.$message.success(loginRes.msg, 3)
})
getSettings().then(result => { // 获取系统配置
const settings = result.data.data
this.setSettings(settings)
})
} else {
console.log("登录失败")
this.error = loginRes.message

23
src/router/Middle/Admin/AdminUser/router.map.js Normal file
View File

@ -0,0 +1,23 @@
// 中台用户路由
// 视图组件
const view = {
tabs: () => import('@/layouts/tabs'),
blank: () => import('@/layouts/BlankView'),
page: () => import('@/layouts/PageView')
}
// 路由组件注册
const BaseAdminRouterMap = {
Admin:{
name: '用户管理',
icon: 'idcard',
component: view.page,
authority: {
permission:[''],
}
},
}
export default BaseAdminRouterMap

4
src/router/Middle/Base/BaseAdmin/router.map.js
View File

@ -14,7 +14,9 @@ const BaseAdminRouterMap = {
name: '用户管理',
icon: 'idcard',
component: view.page,
authority: ['Admin-All']
authority: {
permission:[''],
}
},
}

4
src/router/Middle/Base/BaseCompany/router.map.js
View File

@ -14,7 +14,9 @@ const BaseCompanyRouterMap = {
name: '公司管理',
icon: 'idcard',
component: view.page,
authority: ['Service-All']
authority: {
permission:[''],
}
},
}

4
src/router/Middle/Base/BaseConfig/router.map.js
View File

@ -14,7 +14,9 @@ const BaseConfigRouterMap = {
name: '项目管理',
icon: 'idcard',
component: view.page,
authority: ['Config-All']
authority: {
permission:[],
}
},
}

4
src/router/Middle/Base/BaseService/router.map.js
View File

@ -14,7 +14,9 @@ const BaseServiceRouterMap = {
name: '服务管理',
icon: 'idcard',
component: view.page,
authority: ['Service-All']
authority: {
permission:[''],
}
},
}

20
src/router/async/base.map.js
View File

@ -169,29 +169,39 @@ const view = {
name: '报工管理',
icon: 'idcard',
component: view.page,
authority: ['WorkReport-All']
authority: {
permission:['']
}
},
WorkReporList:{
name: '报工列表',
component: () => import('@/pages/base/plan/WorkReporList'),
authority: ['WorkReport-All','WorkRepor-List']
authority: {
permission:[''],
}
},
Payroll:{
name: '工资管理',
icon: 'idcard',
component: view.page,
authority: ['Payroll-All']
authority: {
permission: ['Payroll-All'],
}
},
PayrollList:{
name: '工资列表',
component: () => import('@/pages/base/plan/PayrollList'),
authority: ['Payroll-All','Payroll-List']
authority: {
permission:['Payroll-All','Payroll-List'],
}
},
PayrollSettings:{
name: '工资设置',
component: () => import('@/pages/base/plan/PayrollSettings'),
authority: ['Payroll-All','Payroll-Settings']
authority: {
permission:['Payroll-All','Payroll-Settings'],
}
},
}

2
src/router/guards.js
View File

@ -52,10 +52,8 @@ const loginGuard = (to, from, next, options) => {
*/
const authorityGuard = (to, from, next, options) => {
// console.log("进入authorityGuard权限守卫")
const {store, message} = options
const permissions = store.getters['account/permissions'] // 获取权限数据
console.log("store.getters['account/permissions']:", permissions)
if (!hasAuthority(to, permissions)) { // 判断是否有权限
// 如果没有权限，跳转到403页面
message.warning(`对不起，您无权访问页面: ${to.fullPath}，请联系管理员`)

42
src/router/index.js
View File

@ -2,6 +2,46 @@ import Vue from 'vue'
import Router from 'vue-router'
import { formatRoutes } from '@/utils/routerUtil' // 引入路由格式化工具
// -------------------------------- 以下为刷新页面时，重新加载路由 权限 用户信息的代码 --------------------------------
import { getUserInfo, getRoutesConfig, getPermission,getSettings } from '@/services/base/user' // 刷新用户信息
import { loadRoutes } from '@/utils/routerUtil'
import store from '@/store' // 引入vuex store 实例
import xsrfHeaderName from '@/utils/request' // 引入request
import Cookie from 'js-cookie'
// 如果cookie中存在认证信息
const Authorization = Cookie.get(xsrfHeaderName).Authorization
if (Authorization != null) {
getUserInfo().then(result => { // 获取用户信息
const UserInfo = result.data.data.user_info
console.log("UserInfo: ", UserInfo)
store.commit('account/setRoutesConfig', UserInfo) // 将用户信息存入vuex
})
getPermission().then(result => { // 获取权限
const Permission = result.data.data.permission
console.log("Permission: ", Permission)
store.commit('account/setPermissions', Permission) // 将权限信息存入vuex
})
getRoutesConfig().then(result => { // 获取路由配置
const routesConfig = result.data.data
console.log("routesConfig: ", routesConfig)
store.commit('account/setRoutesConfig', routesConfig) // 将路由配置信息存入vuex
loadRoutes([routesConfig]) // 加载路由
})
getSettings().then(result => { // 获取系统配置
const settings = result.data.data
store.commit('account/setRoutesConfig', settings) // 将系统配置信息存入vuex
})
}
// -------------------------------- 以上为刷新页面时，重新加载路由 权限 用户信息的代码 --------------------------------
Vue.use(Router)
// 不需要登录拦截的路由配置
@ -14,8 +54,6 @@ const loginIgnore = { // 登录白名单
* @returns {boolean}
*/
includes(route) { // 判断路由是否包含在该配置中
console.log("route", route)
console.log("this.names.includes(route.name) || this.paths.includes(route.path)",this.names.includes(route.name) || this.paths.includes(route.path))
return this.names.includes(route.name) || this.paths.includes(route.path) // 返回true则不需要登录拦截
}
}

5
src/services/Middle/Admin/api.js
View File

@ -1,7 +1,4 @@
import BASE_URL from '@/services/api.js';
import BASE_URL from '@/services/base/api.js';
module.exports = {
LOGIN: `${BASE_URL}/AdminUser/v1/login`,
ROUTES: `${BASE_URL}/AdminUser/v1/routers`,
USERINFO: `${BASE_URL}/AdminUser/v1/userinfo`,
PERMISSION: `${BASE_URL}/AdminUser/v1/permission`,
}

2
src/services/base/api.js
View File

@ -4,8 +4,10 @@
const BASE_URL = process.env.VUE_APP_API_BASE_URL // 获取环境变量VUE_APP_API_BASE_URL
module.exports = {
BASE_URL,
LOGIN: `${BASE_URL}/AdminUser/v1/login`,
ROUTES: `${BASE_URL}/AdminUser/v1/routers`,
USERINFO: `${BASE_URL}/AdminUser/v1/userinfo`,
PERMISSION: `${BASE_URL}/AdminUser/v1/permission`,
SETTINGS: `${BASE_URL}/AdminUser/v1/settings`,
}

12
src/services/base/dataSource.js
View File

@ -1,12 +0,0 @@
// import {GOODS, GOODS_COLUMNS} from './api' // 引入api.js中的常量
// import {METHOD, request} from '@/utils/request'
// export async function goodsList(params) {
// return request(GOODS, METHOD.GET, params)
// }
// export async function goodsColumns() {
// return request(GOODS_COLUMNS, METHOD.GET)
// }
// export default {goodsList, goodsColumns}

28
src/services/base/user.js
View File

@ -1,4 +1,4 @@
import {LOGIN, ROUTES, USERINFO,PERMISSION} from '@/services/base/api'
import {LOGIN, ROUTES, USERINFO,PERMISSION,SETTINGS} from '@/services/base/api'
import {request, METHOD, removeAuthorization} from '@/utils/request'
/**
* 登录服务
@ -19,7 +19,7 @@ export async function login(name, password) {
* @returns {Promise<AxiosResponse<T>>}
*/
export async function getUserInfo() { // 获取用户信息
const userId = parseInt(localStorage.getItem(process.env.VUE_APP_USER_KEY)) // 获取用户id并转换为整数
const userId = parseInt(localStorage.getItem(process.env.VUE_APP_UID_KEY)) // 获取用户id并转换为整数
return request(USERINFO, METHOD.POST, {
uid: userId
})
@ -30,7 +30,7 @@ export async function getUserInfo() { // 获取用户信息
* @returns {Promise<AxiosResponse<T>>}
*/
export async function getRoutesConfig() { // 获取路由配置
const userId = parseInt(localStorage.getItem(process.env.VUE_APP_USER_KEY)) // 获取用户id并转换为整数
const userId = parseInt(localStorage.getItem(process.env.VUE_APP_UID_KEY)) // 获取用户id并转换为整数
return request(ROUTES, METHOD.POST, {
uid:userId
})
@ -42,23 +42,39 @@ export async function getRoutesConfig() { // 获取路由配置
* @returns {Promise<AxiosResponse<T>>}
*/
export async function getPermission() { // 获取权限配置
const userId = parseInt(localStorage.getItem(process.env.VUE_APP_USER_KEY)) // 获取用户id并转换为整数
const userId = parseInt(localStorage.getItem(process.env.VUE_APP_UID_KEY)) // 获取用户id并转换为整数
return request(PERMISSION, METHOD.POST, {
uid:userId
})
}
/**
* 获取用户设置
* @param uid
* @returns {Promise<AxiosResponse<Tuple>>}
*/
export async function getSettings() { // 获取用户设置
const userId = parseInt(localStorage.getItem(process.env.VUE_APP_UID_KEY)) // 获取用户id并转换为整数
return request(SETTINGS, METHOD.POST, {
uid:userId
})
}
/**
* 退出登录
*/
export function logout() {
localStorage.removeItem(process.env.VUE_APP_ROUTES_KEY) // 删除路由配置
localStorage.removeItem(process.env.VUE_APP_PERMISSIONS_KEY) // 删除权限配置
localStorage.removeItem(process.env.VUE_APP_USER_KEY) // 删除用户id
localStorage.removeItem(process.env.VUE_APP_USER_KEY) // 删除用户信息
localStorage.removeItem(process.env.VUE_APP_UID_KEY) // 删除用户id
removeAuthorization()
}
export default {
login,
logout,
getRoutesConfig
getRoutesConfig,
getPermission,
getUserInfo,
getSettings
}

4
src/services/index.js
View File

@ -1,7 +1,7 @@
import userService from './base/user'
import dataSource from './base/dataSource'
export {
userService,
dataSource
}

46
src/store/modules/account.js
View File

@ -1,16 +1,30 @@
export default {
namespaced: true,
state: {
uid: 0,
user: undefined, // 用户信息
permissions: null, // 权限
routesConfig: null // 路由配置
permissions: undefined, // 权限
routesConfig: undefined, // 路由配置
settings: undefined // 用户配置
},
getters: {
uid: state => { // 用户id
if (!state.uid) { // 如果没有用户uid
try {
const uid = localStorage.getItem(process.env.VUE_APP_UID_KEY) // 获取用户id
state.uid = uid // 将用户信息赋值给state.user
} catch (e) { // 捕获异常
console.error(e)
}
}
return state.uid // 如果有用户信息，直接返回
},
user: state => { // 用户信息
if (!state.user) { // 如果没有用户信息
try {
const user = localStorage.getItem(process.env.VUE_APP_USER_KEY) // 获取用户信息
state.user = user // 将用户信息赋值给state.user
state.user = JSON.parse(user) // 将用户信息赋值给state.user
state.user = state.user ? state.user : [] // 如果用户信息为空，赋值为空对象
} catch (e) { // 捕获异常
console.error(e)
}
@ -24,7 +38,7 @@ export default {
state.permissions = JSON.parse(permissions) // 将权限赋值给state.permissions
state.permissions = state.permissions ? state.permissions : [] // 如果state.permissions为空，则赋值为空数组
} catch (e) { // 捕获异常
console.error(e.message)
// console.error(e.message)
}
}
return state.permissions // 如果有权限，则返回权限
@ -41,12 +55,29 @@ export default {
}
}
return state.routesConfig // 如果有路由配置，则返回路由配置
},
settings: state => { // 用户配置
if (!state.settings) { // 如果没有用户配置
try {
const settings = localStorage.getItem(process.env.VUE_APP_USER_SETTINGS_KEY) // 获取用户配置
state.settings = JSON.parse(settings) // 将字符串转换为json对象
state.settings = state.settings ? state.settings : {} // 如果state.settings为null，则赋值为空对象
} catch (e) { // 捕获异常
console.error(e.message)
}
}
return state.settings // 如果有用户配置，则返回用户配置
}
},
mutations: {
setUid (state, uid) { // 设置用户uid
state.uid = uid
localStorage.setItem(process.env.VUE_APP_UID_KEY, JSON.stringify(uid))// 将所有用户信息存储到process.env.VUE_APP_UID_KEY key中
},
setUser (state, user) { // 设置用户信息
state.user = user
localStorage.setItem(process.env.VUE_APP_USER_KEY, user)// 将所有用户信息存储到process.env.VUE_APP_USER_KEY中
localStorage.setItem(process.env.VUE_APP_USER_KEY, JSON.stringify(user))// 将所有用户信息存储到process.env.VUE_APP_USER_KEY中
},
setPermissions(state, permissions) { // 设置权限
state.permissions = permissions
@ -54,8 +85,11 @@ export default {
},
setRoutesConfig(state, routesConfig) { // 设置路由配置
state.routesConfig = routesConfig
console.log("存入路由配置：", routesConfig)
localStorage.setItem(process.env.VUE_APP_ROUTES_KEY, JSON.stringify(routesConfig)) // 将所有路由信息存储到process.env.VUE_APP_ROUTES_KEY中
},
setSettings(state, settings) { // 设置用户配置
state.settings = settings
localStorage.setItem(process.env.VUE_APP_USER_SETTINGS_KEY, JSON.stringify(settings)) // 将所有用户配置信息存储到process.env.VUE_APP_USER_SETTINGS_KEY中
}
}
}

13
src/utils/authority-utils.js
View File

@ -11,8 +11,17 @@
* @param roles 用户角色集合
* @returns {boolean}
*/
function hasAuthority() { // 权限校验
function hasAuthority(to, permissions) { // 权限校验
// 循环 to.meta.authority.permission 集合
if (to.meta && to.meta.authority.permission.length > 0) {
for (let i = 0; i < to.meta.authority.permission.length; i++) {
// 判断用户权限集合中是否包含 to.meta.authority.permission 中的权限
if (permissions.includes(to.meta.authority.permission[i])) {
return false
}
}
}
// 如果 to.meta.authority.permission 匹配到了 permissions 中的某个权限，就返回false
return true // 如果都满足，返回true
}

1
src/utils/request.js
View File

@ -33,6 +33,7 @@ const METHOD = {
* @returns {Promise<AxiosResponse<T>>}
*/
async function request(url, method, params, config) { // 请求方法
axios.defaults.headers.common[xsrfHeaderName] = Cookie.get(xsrfHeaderName)
switch (method) {
case METHOD.GET:
return axios.get(url, {params, ...config})

60
src/utils/routerUtil.js
View File

@ -86,14 +86,39 @@ function parseRoutes(routesConfig, routerMap) { // 解析路由
return routes
}
// 根据权限过滤路由
function filterRoutesConfig(routes, permissions) {
const res = []
routes.forEach(route => {
const tmp = { ...route }
if (hasPermission(permissions, tmp)) {
if (tmp.children) {
tmp.children = filterRoutesConfig(tmp.children, permissions)
}
res.push(tmp)
}
})
return res
}
// 判断是否有权限
function hasPermission(permissions, route) {
if (route.meta && route.meta.authority.permission) {
return permissions.some(permission => {
return route.meta.authority.permission === '' || route.meta.authority.permission === permission
})
} else {
return true
}
}
/**
* 加载路由
* @param routesConfig {RouteConfig[]} 路由配置
*/
function loadRoutes(routesConfig) { // 加载路由
console.log("加载路由")
console.log("+++++routesConfig:",routesConfig)
console.log("+++++arguments:",arguments)
//兼容 0.6.1 以下版本
/*************** 兼容 version < v0.6.1 *****************/
@ -112,20 +137,24 @@ function loadRoutes(routesConfig) { // 加载路由
// 应用配置
const { router, store, i18n } = appOptions
const Permission = store.getters['account/permissions'] // 获取权限
console.log("======Permission:",Permission)
if (routesConfig) { // 如果routesConfig已经存在
store.commit('account/setRoutesConfig', routesConfig) // 通过store的account模块的setRoutesConfig方法更新路由配置
} else {
routesConfig = store.getters['account/routesConfig'] // 通过store的account模块的routesConfig方法获取路由配置
}
// 如果 routesConfig 有值，则更新到本地，否则从本地获取
console.log("=====setRoutesConfig:", routesConfig)
if (routesConfig) { // 如果routesConfig已经存在
console.log("routesConfig存在store.commit('account/setRoutesConfig', routesConfig)")
store.commit('account/setRoutesConfig', routesConfig) // 通过store的account模块的setRoutesConfig方法更新路由配置
} else {
console.log("routesConfig不存在routesConfig = store.state.account.routesConfig")
routesConfig = store.getters['account/routesConfig'] // 通过store的account模块的routesConfig方法获取路由配置
console.log("=====getRoutesConfig:", routesConfig)
}
// 根据权限过滤路由配置
const filteredRoutesConfig = filterRoutesConfig(routesConfig, Permission) // 根据权限过滤路由配置
console.log("=====filteredRoutesConfig:", filteredRoutesConfig)
// routesConfig = filteredRoutesConfig // 路由配置等于过滤后的路由配置
// 如果开启了异步路由，则加载异步路由配置
const asyncRoutes = store.state.setting.asyncRoutes // 获取store的setting模块的asyncRoutes
console.log("asyncRoutes",asyncRoutes)
if (asyncRoutes) { // 如果动态路由存在
console.log("routesConfig && routesConfig.length > 0", routesConfig.length > 0)
if (routesConfig && routesConfig.length > 0) { // 如果本地路由配置存在 并且 数量大于0
@ -137,7 +166,10 @@ function loadRoutes(routesConfig) { // 加载路由
console.log('最终路由表finalRoutes:', finalRoutes) // 最终路由表
router.options = { ...router.options, routes: finalRoutes } // 路由配置
router.matcher = new Router({ ...router.options, routes: [] }).matcher // 重置路由
router.addRoutes(finalRoutes) // 添加路由
// router.addRoutes(finalRoutes) // 添加路由
for (let x of finalRoutes) {
router.addRoute(x)
}
}
}
// 提取路由国际化数据
@ -150,6 +182,8 @@ function loadRoutes(routesConfig) { // 加载路由
}
}
/**
* 合并路由
* @param target {Route[]}