From 6a84ae42a5473f45cb5d2b27a16ea91d52f9b363 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期二, 21 七月 2020 15:52:11 +0800
Subject: [PATCH] 代码生成支持选择上级菜单
---
ruoyi-ui/src/utils/permission.js | 39 ++++++++++++++++++++++++++++++++-------
1 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/ruoyi-ui/src/utils/permission.js b/ruoyi-ui/src/utils/permission.js
index efb4cc8..784e379 100644
--- a/ruoyi-ui/src/utils/permission.js
+++ b/ruoyi-ui/src/utils/permission.js
@@ -1,16 +1,17 @@
import store from '@/store'
/**
- * @param {Array} value
+ * 瀛楃鏉冮檺鏍￠獙
+ * @param {Array} value 鏍￠獙鍊�
* @returns {Boolean}
*/
-export default function checkPermission(value) {
+export function checkPermi(value) {
if (value && value instanceof Array && value.length > 0) {
- const roles = store.getters && store.getters.roles
- const permissionRoles = value
+ const permissions = store.getters && store.getters.permissions
+ const permissionDatas = value
- const hasPermission = roles.some(role => {
- return permissionRoles.includes(role)
+ const hasPermission = permissions.some(permission => {
+ return permissionDatas.includes(permission)
})
if (!hasPermission) {
@@ -18,7 +19,31 @@
}
return true
} else {
- console.error(`need roles! Like v-permission="['admin','editor']"`)
+ console.error(`need roles! Like checkPermi="['system:user:add','system:user:edit']"`)
return false
}
}
+
+/**
+ * 瑙掕壊鏉冮檺鏍￠獙
+ * @param {Array} value 鏍￠獙鍊�
+ * @returns {Boolean}
+ */
+export function checkRole(value) {
+ if (value && value instanceof Array && value.length > 0) {
+ const roles = store.getters && store.getters.roles
+ const permissionRoles = value
+
+ const hasRole = roles.some(role => {
+ return permissionRoles.includes(role)
+ })
+
+ if (!hasRole) {
+ return false
+ }
+ return true
+ } else {
+ console.error(`need roles! Like checkRole="['admin','editor']"`)
+ return false
+ }
+}
\ No newline at end of file
--
Gitblit v1.9.3