From c334c2d76c1b51d0fbe1531bf524e1b90f921a7c Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 20 五月 2025 15:16:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/plugins/auth.js | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/plugins/auth.js b/src/plugins/auth.js
index af740aa..9b6ed1f 100644
--- a/src/plugins/auth.js
+++ b/src/plugins/auth.js
@@ -1,8 +1,8 @@
-import store from '@/store'
+import useUserStore from '@/store/modules/user'
function authPermission(permission) {
- const all_permission = "*:*:*";
- const permissions = store.getters && store.getters.permissions
+ const all_permission = "*:*:*"
+ const permissions = useUserStore().permissions
if (permission && permission.length > 0) {
return permissions.some(v => {
return all_permission === v || v === permission
@@ -13,8 +13,8 @@
}
function authRole(role) {
- const super_admin = "admin";
- const roles = store.getters && store.getters.roles
+ const super_admin = "admin"
+ const roles = useUserStore().roles
if (role && role.length > 0) {
return roles.some(v => {
return super_admin === v || v === role
@@ -27,7 +27,7 @@
export default {
// 楠岃瘉鐢ㄦ埛鏄惁鍏峰鏌愭潈闄�
hasPermi(permission) {
- return authPermission(permission);
+ return authPermission(permission)
},
// 楠岃瘉鐢ㄦ埛鏄惁鍚湁鎸囧畾鏉冮檺锛屽彧闇�鍖呭惈鍏朵腑涓�涓�
hasPermiOr(permissions) {
@@ -43,7 +43,7 @@
},
// 楠岃瘉鐢ㄦ埛鏄惁鍏峰鏌愯鑹�
hasRole(role) {
- return authRole(role);
+ return authRole(role)
},
// 楠岃瘉鐢ㄦ埛鏄惁鍚湁鎸囧畾瑙掕壊锛屽彧闇�鍖呭惈鍏朵腑涓�涓�
hasRoleOr(roles) {
--
Gitblit v1.9.3