feat: remove support single role permission

chansee97 · chansee97 · commit 30f0ac090499 · 2025-01-20T22:47:43.000+08:00
diff --git a/src/hooks/usePermission.ts b/src/hooks/usePermission.ts
@@ -1,12 +1,11 @@
 import { useAuthStore } from '@/store'
-import { isArray, isString } from 'radash'
 
 /** 权限判断 */
 export function usePermission() {
   const authStore = useAuthStore()
 
   function hasPermission(
-    permission: Entity.RoleType | Entity.RoleType[] | undefined,
+    permission?: Entity.RoleType[],
   ) {
     if (!permission)
       return true
@@ -15,13 +14,9 @@ export function usePermission() {
       return false
     const { role } = authStore.userInfo
 
-    let has = role === 'super'
+    let has = role.includes('super')
     if (!has) {
-      if (isArray(permission))
-        has = permission.includes(role)
-
-      if (isString(permission))
-        has = permission === role
+      has = permission.every(i => role.includes(i))
     }
     return has
   }
diff --git a/src/typings/api/login.d.ts b/src/typings/api/login.d.ts
@@ -7,7 +7,7 @@ namespace Api {
       /** 用户id */
       id: number
       /** 用户角色类型 */
-      role: Entity.RoleType
+      role: Entity.RoleType[]
       /** 访问toekn */
       accessToken: string
       /** 刷新toekn */
diff --git a/src/views/demo/permission/permission/index.vue b/src/views/demo/permission/permission/index.vue
@@ -4,7 +4,7 @@ import { useAuthStore } from '@/store'
 
 const authStore = useAuthStore()
 const { hasPermission } = usePermission()
-const { role } = authStore.userInfo!
+const { role } = authStore.userInfo
 
 const roleList: Entity.RoleType[] = ['super', 'admin', 'user']
 
@@ -23,7 +23,7 @@ function toggleUserRole(role: Entity.RoleType) {
     </n-button-group>
     <n-h2>v-permission 指令用法</n-h2>
     <n-space>
-      <n-button v-permission="'super'">
+      <n-button v-permission="['super']">
         仅super可见
       </n-button>
       <n-button v-permission="['admin']">
@@ -33,10 +33,10 @@ function toggleUserRole(role: Entity.RoleType) {
 
     <n-h2>usePermission 函数用法</n-h2>
     <n-space>
-      <n-button v-if="hasPermission('super')">
+      <n-button v-if="hasPermission(['super'])">
         super可见
       </n-button>
-      <n-button v-if="hasPermission('admin')">
+      <n-button v-if="hasPermission(['admin'])">
         admin可见
       </n-button>
       <n-button v-if="hasPermission(['admin', 'user'])">
@@ -45,5 +45,3 @@ function toggleUserRole(role: Entity.RoleType) {
     </n-space>
   </n-card>
 </template>
-
-<style scoped></style>
