blackteay/vue-element-admin
1
0
Fork 0
mirror of https://github.com/PanJiaChen/vue-element-admin.git synced 2025-08-07 18:25:45 +08:00
Code Issues Releases Wiki Activity

Merge 6a557cf7b9118e54fd39a06e2531eb19b4485896 into 0caa975ee224074c77540107b1fe076081cdf306

Browse Source
This commit is contained in:
Inclusive Coding Bot 2022-04-12 10:12:59 +08:00 committed by GitHub
commit 132098cd46
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/permission.js
View File

@ -26,7 +26,7 @@ router.beforeEach(async(to, from, next) => {
next({ path: '/' })
NProgress.done() // hack: https://github.com/PanJiaChen/vue-element-admin/pull/2939
} else {
// determine whether the user has obtained his permission roles through getInfo
// determine whether the user has obtained their permission roles through getInfo
const hasRoles = store.getters.roles && store.getters.roles.length > 0
if (hasRoles) {
next()

2
src/views/permission/role.vue
View File

@ -164,7 +164,7 @@ export default {
this.$nextTick(() => {
const routes = this.generateRoutes(this.role.routes)
this.$refs.tree.setCheckedNodes(this.generateArr(routes))
// set checked state of a node not affects its father and child nodes
// set checked state of a node not affects its parent and child nodes
this.checkStrictly = false
})
},