open-source/eladmin-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into deploy

Browse Source
This commit is contained in:
Zheng Jie
2021-03-03 14:49:29 +08:00
parent 5bd03ab67f 04c1ab9923
commit 2c60f27175
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/utils/permission.js
View File

@@ -11,15 +11,9 @@ export default {
if (value && value instanceof Array && value.length > 0) { if (value && value instanceof Array && value.length > 0) {
const roles = store.getters && store.getters.roles const roles = store.getters && store.getters.roles
const permissionRoles = value const permissionRoles = value
return roles.some(role => {
const hasPermission = roles.some(role => {
return permissionRoles.includes(role) return permissionRoles.includes(role)
}) })
if (!hasPermission) {
return false
}
return true
} else { } else {
console.error(`need roles! Like v-permission="['admin','editor']"`) console.error(`need roles! Like v-permission="['admin','editor']"`)
return false return false

4
src/views/login.vue
View File

@@ -74,8 +74,8 @@ export default {
watch: { watch: {
$route: { $route: {
handler: function(route) { handler: function(route) {
if (route.query) { const data = route.query
const data = route.query if (data && data.redirect) {
this.redirect = data.redirect this.redirect = data.redirect
delete data.redirect delete data.redirect
this.redirect = this.redirect + '&' + qs.stringify(data, { indices: false }) this.redirect = this.redirect + '&' + qs.stringify(data, { indices: false })