From d9895619aaa1a93dd2b12243d4fe5cd5aedf137b Mon Sep 17 00:00:00 2001 From: Junling Bu Date: Sun, 10 Feb 2019 17:33:40 +0800 Subject: [PATCH] =?UTF-8?q?chore[litemall-admin]:=20=E6=9D=83=E9=99=90?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E6=94=AF=E6=8C=81=E8=B6=85=E7=BA=A7=E6=9D=83?= =?UTF-8?q?=E9=99=90*?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/directive/permission/permission.js | 12 +++++++++--- litemall-admin/src/utils/permission.js | 12 +++++++++--- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/litemall-admin/src/directive/permission/permission.js b/litemall-admin/src/directive/permission/permission.js index 40e45b6c..51a88342 100644 --- a/litemall-admin/src/directive/permission/permission.js +++ b/litemall-admin/src/directive/permission/permission.js @@ -9,9 +9,15 @@ export default{ if (value && value instanceof Array && value.length > 0) { const permissions = value - const hasPermission = perms.some(perm => { - return permissions.includes(perm) - }) + var hasPermission = false + + if (perms.indexOf('*') >= 0) { + hasPermission = true + } else { + hasPermission = perms.some(perm => { + return permissions.includes(perm) + }) + } if (!hasPermission) { el.parentNode && el.parentNode.removeChild(el) diff --git a/litemall-admin/src/utils/permission.js b/litemall-admin/src/utils/permission.js index e4a3ef01..a80f4772 100644 --- a/litemall-admin/src/utils/permission.js +++ b/litemall-admin/src/utils/permission.js @@ -10,9 +10,15 @@ export default function checkPermission(value) { const perms = store.getters && store.getters.perms const permissions = value - const hasPermission = perms.some(perm => { - return permissions.includes(perm) - }) + var hasPermission = false + + if (perms.indexOf('*') >= 0) { + hasPermission = true + } else { + hasPermission = perms.some(perm => { + return permissions.includes(perm) + }) + } if (!hasPermission) { return false