|
@@ -1,18 +1,5 @@
|
|
|
import { constantRoutes, asyncRoutes } from '@/router'
|
|
|
|
|
|
-// function hetAllRoleChecked(roles) {
|
|
|
-// let res = []
|
|
|
-// roles.forEach(role => {
|
|
|
-// if (role.checked) {
|
|
|
-// res.push(role.value)
|
|
|
-// }
|
|
|
-// if (role.data && role.data.length > 0) {
|
|
|
-// res = res.concat(hetAllRoleChecked(role.data))
|
|
|
-// }
|
|
|
-// })
|
|
|
-// return res
|
|
|
-// }
|
|
|
-
|
|
|
/**
|
|
|
* Use meta.role to determine if the current user has permission
|
|
|
* @param roles
|
|
@@ -20,7 +7,6 @@ import { constantRoutes, asyncRoutes } from '@/router'
|
|
|
*/
|
|
|
function hasPermission (roles, route) {
|
|
|
if (route.meta && route.meta.roleValue) {
|
|
|
- // return roles.some(role => route.meta.roleValue.includes(role))
|
|
|
return roles.includes(route.meta.roleValue)
|
|
|
} else {
|
|
|
return true
|
|
@@ -34,7 +20,6 @@ function hasPermission (roles, route) {
|
|
|
*/
|
|
|
export function filterAsyncRoutes (routes, roles) {
|
|
|
const res = []
|
|
|
- // let roleIds = hetAllRoleChecked(roles)
|
|
|
let roleIds = roles
|
|
|
routes.forEach(route => {
|
|
|
const tmp = { ...route }
|
|
@@ -67,17 +52,10 @@ const actions = {
|
|
|
async generateRoutes ({ commit }, roles) {
|
|
|
return new Promise(resolve => {
|
|
|
let accessedRoutes
|
|
|
- // accessedRoutes = asyncRoutes
|
|
|
accessedRoutes = filterAsyncRoutes(asyncRoutes, roles.user_rules)
|
|
|
- // accessedRoutes = [...accessedRoutes, {
|
|
|
- // path: '/',
|
|
|
- // redirect: accessedRoutes[0].path
|
|
|
- // }]
|
|
|
- console.log({ accessedRoutes })
|
|
|
commit('SET_ROUTES', accessedRoutes)
|
|
|
|
|
|
// 把所有roleId放在一个数组里
|
|
|
- // let pageRoleArray = hetAllRoleChecked(roles.user_rules)
|
|
|
let pageRoleArray = roles.user_rules
|
|
|
commit('SET_PAGE_ROLE_ARRAY', pageRoleArray)
|
|
|
|