From fb1b2583bfc1dd5c33c3d4bc9f37e2d1582e0304 Mon Sep 17 00:00:00 2001
From: Leo <98382335+gaoziman@users.noreply.github.com>
Date: Mon, 7 Jul 2025 01:14:21 +0800
Subject: [PATCH] =?UTF-8?q?feat(ui):=20=E5=AE=8C=E5=96=84=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修复用户管理页面操作按钮权限检查
- 完善角色管理页面权限控制逻辑
- 使用权限常量替代硬编码权限标识
- 确保权限控制逻辑的一致性和准确性
---
 src/views/system/role/index.vue | 54 +++++++++++++++++++++------------
 src/views/system/user/index.vue | 49 ++++++++++++++++++++++--------
 2 files changed, 71 insertions(+), 32 deletions(-)

diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 3e369a9..2b59f19 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -94,7 +94,7 @@
       <!-- 表格头部操作栏 -->
       <div class="flex items-center justify-between px-4 py-2 border-b border-gray-100">
         <div class="flex items-center gap-4">
-          <NButton type="primary" class="px-6 flex items-center" @click="handleAdd">
+          <NButton v-button="PERMISSIONS.ROLE.ADD" type="primary" class="px-6 flex items-center" @click="handleAdd">
             <template #icon>
               <NIcon class="mr-1" style="transform: translateY(-1px)">
                 <icon-park-outline:plus />
@@ -104,6 +104,7 @@
           </NButton>
 
           <NButton
+            v-button="PERMISSIONS.ROLE.DELETE"
             type="error"
             :disabled="selectedRows.length === 0"
             class="px-6 flex items-center"
@@ -356,6 +357,11 @@ import {
 } from '@/service/api/system/menu'
 import type { MenuPermissionData, MenuVo } from '@/service/api/system/menu'
 import { coiMsgBox, coiMsgError, coiMsgSuccess, coiMsgWarning } from '@/utils/coi'
+import { PERMISSIONS } from '@/constants/permissions'
+import { usePermission } from '@/hooks/usePermission'
+
+// 权限相关
+const { hasButton } = usePermission()
 
 // 响应式数据
 const loading = ref(false)
@@ -515,16 +521,23 @@ const columns: DataTableColumns<RoleVo> = [
     align: 'center',
     fixed: 'right',
     render: (row) => {
-      return h('div', { class: 'flex items-center justify-center gap-2' }, [
-        h(NButton, {
+      const buttons = []
+
+      // 编辑按钮
+      if (hasButton(PERMISSIONS.ROLE.UPDATE)) {
+        buttons.push(h(NButton, {
           type: 'primary',
           size: 'small',
           onClick: () => handleEdit(row),
         }, {
           icon: () => h(NIcon, { size: 14, style: 'transform: translateY(-1px)' }, { default: () => h('icon-park-outline:edit') }),
           default: () => '编辑',
-        }),
-        h(NPopconfirm, {
+        }))
+      }
+
+      // 删除按钮
+      if (hasButton(PERMISSIONS.ROLE.DELETE)) {
+        buttons.push(h(NPopconfirm, {
           onPositiveClick: () => handleDelete(row.roleId),
           negativeText: '取消',
           positiveText: '确定',
@@ -538,21 +551,22 @@ const columns: DataTableColumns<RoleVo> = [
             icon: () => h(NIcon, { size: 14, style: 'transform: translateY(-1px)' }, { default: () => h('icon-park-outline:delete') }),
             default: () => '删除',
           }),
-        }),
-        // 超级管理员不显示分配权限按钮
-        ...(row.roleId === 1
-          ? []
-          : [
-              h(NButton, {
-                type: 'warning',
-                size: 'small',
-                onClick: () => handleAssignMenu(row),
-              }, {
-                icon: () => h(NIcon, { size: 14, style: 'transform: translateY(-1px)' }, { default: () => h('icon-park-outline:setting') }),
-                default: () => '分配权限',
-              }),
-            ]),
-      ])
+        }))
+      }
+
+      // 分配权限按钮 - 超级管理员不显示
+      if (hasButton(PERMISSIONS.ROLE.MENU) && row.roleId !== 1) {
+        buttons.push(h(NButton, {
+          type: 'warning',
+          size: 'small',
+          onClick: () => handleAssignMenu(row),
+        }, {
+          icon: () => h(NIcon, { size: 14, style: 'transform: translateY(-1px)' }, { default: () => h('icon-park-outline:setting') }),
+          default: () => '分配权限',
+        }))
+      }
+
+      return h('div', { class: 'flex items-center justify-center gap-2' }, buttons)
     },
   },
 ]
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 142dd66..1874177 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -104,7 +104,7 @@
       <!-- 表格头部操作栏 -->
       <div class="flex items-center justify-between px-4 py-2 border-b border-gray-100">
         <div class="flex items-center gap-4">
-          <NButton type="primary" class="px-6 flex items-center" @click="handleAdd">
+          <NButton v-button="PERMISSIONS.USER.ADD" type="primary" class="px-6 flex items-center" @click="handleAdd">
             <template #icon>
               <NIcon class="mr-1" style="transform: translateY(-1px)">
                 <icon-park-outline:plus />
@@ -114,6 +114,7 @@
           </NButton>
 
           <NButton
+            v-button="PERMISSIONS.USER.DELETE"
             type="error"
             :disabled="selectedRows.length === 0"
             class="px-6 flex items-center"
@@ -128,6 +129,7 @@
           </NButton>
 
           <NButton
+            v-button="PERMISSIONS.USER.ROLE"
             type="info"
             :disabled="selectedRows.length !== 1"
             class="px-6 flex items-center"
@@ -142,6 +144,7 @@
           </NButton>
 
           <NDropdown
+            v-button="PERMISSIONS.USER.EXPORT"
             trigger="click"
             :show="showExportDropdown"
             :options="[
@@ -180,7 +183,7 @@
             </NButton>
           </NDropdown>
 
-          <NButton class="px-6 flex items-center" @click="handleImport">
+          <NButton v-button="PERMISSIONS.USER.IMPORT" class="px-6 flex items-center" @click="handleImport">
             <template #icon>
               <NIcon class="mr-1" style="transform: translateY(-1px)">
                 <icon-park-outline:upload />
@@ -693,6 +696,11 @@ import {
 } from '@/service/api/system/role'
 import type { RoleVo } from '@/service/api/system/role'
 import { coiMsgBox, coiMsgError, coiMsgInfo, coiMsgSuccess, coiMsgWarning } from '@/utils/coi'
+import { PERMISSIONS } from '@/constants/permissions'
+import { usePermission } from '@/hooks/usePermission'
+
+// 权限相关
+const { hasButton } = usePermission()
 
 // 响应式数据
 const loading = ref(false)
@@ -974,16 +982,23 @@ const columns: DataTableColumns<UserVo> = [
     align: 'center',
     fixed: 'right',
     render: (row) => {
-      return h('div', { class: 'flex items-center justify-center gap-2' }, [
-        h(NButton, {
+      const buttons = []
+
+      // 编辑按钮
+      if (hasButton(PERMISSIONS.USER.UPDATE)) {
+        buttons.push(h(NButton, {
           type: 'primary',
           size: 'small',
           onClick: () => handleEdit(row),
         }, {
           icon: () => h(NIcon, { size: 14, style: 'transform: translateY(-1px)' }, { default: () => h('icon-park-outline:edit') }),
           default: () => '编辑',
-        }),
-        h(NPopconfirm, {
+        }))
+      }
+
+      // 删除按钮
+      if (hasButton(PERMISSIONS.USER.DELETE)) {
+        buttons.push(h(NPopconfirm, {
           onPositiveClick: () => handleDelete(row.userId),
           negativeText: '取消',
           positiveText: '确定',
@@ -996,24 +1011,34 @@ const columns: DataTableColumns<UserVo> = [
             icon: () => h(NIcon, { size: 14, style: 'transform: translateY(-1px)' }, { default: () => h('icon-park-outline:delete') }),
             default: () => '删除',
           }),
-        }),
-        h(NButton, {
+        }))
+      }
+
+      // 重置密码按钮
+      if (hasButton(PERMISSIONS.USER.RESET_PWD)) {
+        buttons.push(h(NButton, {
           type: 'warning',
           size: 'small',
           onClick: () => handleResetPassword(row),
         }, {
           icon: () => h(NIcon, { size: 14, style: 'transform: translateY(-1px)' }, { default: () => h('icon-park-outline:refresh') }),
           default: () => '重置密码',
-        }),
-        h(NButton, {
+        }))
+      }
+
+      // 分配角色按钮
+      if (hasButton(PERMISSIONS.USER.ROLE)) {
+        buttons.push(h(NButton, {
           type: 'info',
           size: 'small',
           onClick: () => handleAssignRole(row),
         }, {
           icon: () => h(NIcon, { size: 14, style: 'transform: translateY(-1px)' }, { default: () => h('icon-park-outline:setting') }),
           default: () => '分配角色',
-        }),
-      ])
+        }))
+      }
+
+      return h('div', { class: 'flex items-center justify-center gap-2' }, buttons)
     },
   },
 ]