Showing
1 changed file
with
5 additions
and
2 deletions
| @@ -2,9 +2,12 @@ import store from '@/store' | @@ -2,9 +2,12 @@ import store from '@/store' | ||
| 2 | 2 | ||
| 3 | function authPermission(permission) { | 3 | function authPermission(permission) { |
| 4 | const all_permission = "*:*:*" | 4 | const all_permission = "*:*:*" |
| 5 | - const permissions = store.getters && store.getters.permissions | 5 | + const g = store.getters || {} |
| 6 | + const permissions = Array.isArray(g.permissions) ? g.permissions : [] | ||
| 7 | + const roles = Array.isArray(g.roles) ? g.roles : [] | ||
| 8 | + const sources = [...permissions, ...roles] | ||
| 6 | if (permission && permission.length > 0) { | 9 | if (permission && permission.length > 0) { |
| 7 | - return permissions.some(v => { | 10 | + return sources.some(v => { |
| 8 | return all_permission === v || v === permission | 11 | return all_permission === v || v === permission |
| 9 | }) | 12 | }) |
| 10 | } else { | 13 | } else { |