修复admin独有权限错误的问题

master
toesbieya 6 years ago
parent 2ccb62d9a2
commit 54d21cbe52
  1. 18
      vue/src/store/modules/resource.js
  2. 20
      vue/src/utils/storage.js

@ -3,8 +3,7 @@ import constantRoutes from '@/router/constant'
import authorityRoutes from '@/router/authority' import authorityRoutes from '@/router/authority'
import {needAuth} from "@/utils/auth" import {needAuth} from "@/utils/auth"
import {createTree} from "@/utils/tree" import {createTree} from "@/utils/tree"
import {getLocalResource, setLocalResource} from "@/utils/storage" import {getAllResources} from "@/api/system/resource"
import {getResources} from "@/api/system/resource"
import {isEmpty} from "@/utils" import {isEmpty} from "@/utils"
const finalConstantRoutes = transformOriginRoutes(constantRoutes) const finalConstantRoutes = transformOriginRoutes(constantRoutes)
@ -12,14 +11,11 @@ const finalAuthorityRoutes = transformOriginRoutes(authorityRoutes)
clean(finalConstantRoutes, false) clean(finalConstantRoutes, false)
clean(finalAuthorityRoutes, false) clean(finalAuthorityRoutes, false)
const localResource = getLocalResource()
const state = { const state = {
routes: [], routes: [],
sidebarMenus: [], sidebarMenus: [],
data: localResource,
dataMap: {}, dataMap: {},
tree: createTree(localResource), tree: [],
hasInitRoutes: false hasInitRoutes: false
} }
@ -38,13 +34,12 @@ const mutations = {
state.sidebarMenus = sidebarMenus state.sidebarMenus = sidebarMenus
}, },
data(state, data) { data(state, data) {
state.data = data || [] data = data || []
state.dataMap = state.data.reduce((map, item) => { state.dataMap = data.reduce((map, item) => {
map[item.url] = item.id map[item.url] = item.id
return map return map
}, {}) }, {})
state.tree = createTree(state.data) state.tree = createTree(data.filter(resource => resource.admin !== 1))
setLocalResource(data)
}, },
hasInitRoutes(state, sign) { hasInitRoutes(state, sign) {
state.hasInitRoutes = sign state.hasInitRoutes = sign
@ -69,8 +64,7 @@ const actions = {
}, },
initResource({commit}) { initResource({commit}) {
return new Promise(resolve => { return new Promise(resolve => {
//if (state.data.length > 0) return resolve(); getAllResources()
getResources()
.then(data => { .then(data => {
commit('data', data) commit('data', data)
resolve() resolve()

@ -25,26 +25,6 @@ export function setUser(user) {
sessionStorage.setItem(sessionUserKey, zip(JSON.stringify(user))) sessionStorage.setItem(sessionUserKey, zip(JSON.stringify(user)))
} }
export function getLocalResource() {
let obj = localStorage.getItem(localResourceKey)
if (isEmpty(obj)) return []
try {
obj = JSON.parse(unzip(obj))
}
catch (e) {
console.error('权限数据异常!', e)
removeLocalResource()
return []
}
return obj
}
export function setLocalResource(resource) {
isEmpty(resource) ?
removeLocalResource() :
localStorage.setItem(localResourceKey, zip(JSON.stringify(resource)))
}
export function getLocalPersonalSettings() { export function getLocalPersonalSettings() {
let obj = localStorage.getItem(localPersonalSettingsKey) let obj = localStorage.getItem(localPersonalSettingsKey)
if (isEmpty(obj)) return {} if (isEmpty(obj)) return {}

Loading…
Cancel
Save