Merge pull request #186 from mfish-qf/develop

fix: 租户增删改权限与管理员增删改权限剥离

Author: mfish-qf

src/views/sys/account/index.vue

@@ -8,10 +8,21 @@
       :class="$props.source === 1 ? prefixCls : ''"
     >
       <template #toolbar>
-        <a-button type="primary" @click="handleCreate" v-auth="['sys:account:insert', 'sys:tenantUser:insert']"
+        <a-button
+          type="primary"
+          @click="handleCreate"
+          v-if="
+            (source === 1 && hasPermission('sys:tenantUser:insert')) ||
+            (source !== 1 && hasPermission('sys:account:insert'))
+          "
           >新建账号
         </a-button>
-        <a-button type="primary" @click="handleSelectAccount" v-auth="'sys:tenantUser:insert'">添加成员 </a-button>
+        <a-button
+          type="primary"
+          @click="handleSelectAccount"
+          v-if="source === 1 && hasPermission('sys:tenantUser:insert')"
+          >添加成员
+        </a-button>
       </template>
       <template #bodyCell="{ column, record }">
         <template v-if="column.key === 'action'">
@@ -22,7 +33,7 @@
                 tooltip: '编辑用户资料',
                 onClick: handleEdit.bind(null, record),
                 auth: 'sys:account:update',
-                ifShow: $props.source !== 1
+                ifShow: source !== 1
               },
               {
                 icon: 'ant-design:delete-outlined',
@@ -53,7 +64,7 @@
                   confirm: handleRemoveUser.bind(null, record)
                 },
                 auth: 'sys:tenantUser:delete',
-                ifShow: $props.source === 1
+                ifShow: source === 1
               }
             ]"
           />
@@ -93,7 +104,7 @@
       default: null
     }
   });
-  const { hasRole, SUPER_ROLE } = usePermission();
+  const { hasRole, SUPER_ROLE, hasPermission } = usePermission();
   const [registerModal, { openModal }] = useModal();
   const [registerSelectModal, { openModal: openSelectModal }] = useModal();
   const [registerPwdModal, { openModal: openPwdModal }] = useModal();

src/views/sys/org/index.vue

@@ -2,7 +2,12 @@
   <div>
     <BasicTable @register="registerTable" @fetch-success="onFetchSuccess" :class="$props.source === 1 ? prefixCls : ''">
       <template #toolbar>
-        <a-button type="primary" @click="handleCreate" v-auth="['sys:org:insert', 'sys:tenantOrg:insert']"
+        <a-button
+          type="primary"
+          @click="handleCreate"
+          v-if="
+            (source === 1 && hasPermission('sys:tenantOrg:insert')) || (source !== 1 && hasPermission('sys:org:insert'))
+          "
           >新增组织
         </a-button>
       </template>
@@ -13,7 +18,9 @@
               {
                 icon: 'ant-design:edit-outlined',
                 onClick: handleEdit.bind(null, record),
-                auth: ['sys:org:update', 'sys:tenantOrg:update']
+                ifShow:
+                  (source === 1 && hasPermission('sys:tenantOrg:update')) ||
+                  (source !== 1 && hasPermission('sys:org:update'))
               },
               {
                 icon: 'ant-design:delete-outlined',
@@ -23,7 +30,11 @@
                   placement: 'left',
                   confirm: handleDelete.bind(null, record)
                 },
-                ifShow: !record?.tenantId && hasPermission(['sys:org:delete', 'sys:tenantOrg:delete'])
+                //最顶层租户组织不允许删除
+                ifShow:
+                  !record?.tenantId &&
+                  ((source === 1 && hasPermission('sys:tenantOrg:delete')) ||
+                    (source !== 1 && hasPermission('sys:org:delete')))
               }
             ]"
           />

src/views/sys/role/index.vue

@@ -2,7 +2,13 @@
   <div>
     <BasicTable @register="registerTable" :class="$props.source === 1 ? prefixCls : ''">
       <template #toolbar>
-        <a-button type="primary" @click="handleCreate" v-auth="['sys:role:insert', 'sys:tenantRole:insert']"
+        <a-button
+          type="primary"
+          @click="handleCreate"
+          v-if="
+            (source === 1 && hasPermission('sys:tenantRole:insert')) ||
+            (source !== 1 && hasPermission('sys:role:insert'))
+          "
           >新增角色
         </a-button>
       </template>
@@ -13,7 +19,9 @@
               {
                 icon: 'ant-design:edit-outlined',
                 onClick: handleEdit.bind(null, record),
-                auth: ['sys:role:update', 'sys:tenantRole:update']
+                ifShow:
+                  (source === 1 && hasPermission('sys:tenantRole:update')) ||
+                  (source !== 1 && hasPermission('sys:role:update'))
               },
               {
                 icon: 'ant-design:delete-outlined',
@@ -23,7 +31,10 @@
                   placement: 'left',
                   confirm: handleDelete.bind(null, record)
                 },
-                ifShow: record.id !== '1' && hasPermission(['sys:role:delete', 'sys:tenantRole:delete'])
+                ifShow:
+                  !isSuperRole(record.id) &&
+                  ((source === 1 && hasPermission('sys:tenantRole:delete')) ||
+                    (source !== 1 && hasPermission('sys:role:delete')))
               }
             ]"
           />
@@ -63,7 +74,7 @@
       default: null
     }
   });
-  const { hasPermission } = usePermission();
+  const { hasPermission, isSuperRole } = usePermission();
   const [registerModal, { openModal }] = useModal();
   const { prefixCls } = useDesign("role");
   const api = ref();
@@ -108,7 +119,12 @@
     });
   }
   const statusLoading = ref(false);
-  const statusDisabled = (record) => record.id === "1" || !hasPermission(["sys:role:update", "sys:tenantRole:update"]);
+  const statusDisabled = (record) =>
+    isSuperRole(record.id) ||
+    !(
+      (props.source === 1 && hasPermission("sys:tenantRole:update")) ||
+      (props.source !== 1 && hasPermission("sys:role:update"))
+    );
 
   function handleStatus(record: SsoRole) {
     statusLoading.value = true;