From cef008c865757842f89793edfab59d947e5f7794 Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Sat, 28 May 2022 09:35:48 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=B7=A5=E4=BD=9C=E7=A9=BA=E9=97=B4?=
 =?UTF-8?q?=E6=9D=83=E9=99=90):=20=E7=BB=86=E5=8C=96=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E7=A9=BA=E9=97=B4=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86=E7=9A=84?=
 =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1013628 --user=刘瑞斌 【系统设置】工作空间成员管理批量添加到项目未受权限配置限制 https://www.tapd.cn/55049933/s/1167242
---
 backend/src/main/resources/permission.json        | 15 +++++++++++++++
 .../components/settings/workspace/MsProject.vue   |  6 +++---
 .../settings/workspace/WorkspaceMember.vue        |  8 +++++---
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/backend/src/main/resources/permission.json b/backend/src/main/resources/permission.json
index d5eab8b6ee..1891a9c7be 100644
--- a/backend/src/main/resources/permission.json
+++ b/backend/src/main/resources/permission.json
@@ -185,6 +185,21 @@
       "name": "permission.workspace_project_manager.upload_jar",
       "resourceId": "WORKSPACE_PROJECT_MANAGER"
     },
+    {
+      "id": "WORKSPACE_PROJECT_MANAGER:READ+ADD_USER",
+      "name": "permission.workspace_user.create",
+      "resourceId": "WORKSPACE_PROJECT_MANAGER"
+    },
+    {
+      "id": "WORKSPACE_PROJECT_MANAGER:READ+EDIT_USER",
+      "name": "permission.workspace_user.edit",
+      "resourceId": "WORKSPACE_PROJECT_MANAGER"
+    },
+    {
+      "id": "WORKSPACE_PROJECT_MANAGER:READ+DELETE_USER",
+      "name": "permission.workspace_user.delete",
+      "resourceId": "WORKSPACE_PROJECT_MANAGER"
+    },
     {
       "id": "WORKSPACE_PROJECT_ENVIRONMENT:READ",
       "name": "permission.workspace_project_environment.read",
diff --git a/frontend/src/business/components/settings/workspace/MsProject.vue b/frontend/src/business/components/settings/workspace/MsProject.vue
index a1808fb71c..3dbdb90f3a 100644
--- a/frontend/src/business/components/settings/workspace/MsProject.vue
+++ b/frontend/src/business/components/settings/workspace/MsProject.vue
@@ -100,7 +100,7 @@
                class="dialog-css">
       <template v-slot:title>
         <ms-table-header :condition.sync="dialogCondition" @create="open" @search="list" :have-search="false"
-                         :create-permission="['WORKSPACE_USER:READ+CREATE']"
+                         :create-permission="['WORKSPACE_PROJECT_MANAGER:READ+ADD_USER']"
                          :create-tip="$t('member.create')" :title="$t('commons.member')"/>
       </template>
       <div>
@@ -118,8 +118,8 @@
             <template v-slot:default="scope">
               <div>
                 <ms-table-operator :tip2="$t('commons.remove')"
-                                   :edit-permission="['WORKSPACE_USER:READ+EDIT']"
-                                   :delete-permission="['WORKSPACE_USER:READ+DELETE']"
+                                   :edit-permission="['WORKSPACE_PROJECT_MANAGER:READ+EDIT_USER']"
+                                   :delete-permission="['WORKSPACE_PROJECT_MANAGER:READ+DELETE_USER']"
                                    @editClick="editMember(scope.row)"
                                    @deleteClick="delMember(scope.row)"/>
               </div>
diff --git a/frontend/src/business/components/settings/workspace/WorkspaceMember.vue b/frontend/src/business/components/settings/workspace/WorkspaceMember.vue
index 047d598fb7..53ac00e04c 100644
--- a/frontend/src/business/components/settings/workspace/WorkspaceMember.vue
+++ b/frontend/src/business/components/settings/workspace/WorkspaceMember.vue
@@ -11,7 +11,7 @@
                 @select-all="handleSelectAll"
                 @select="handleSelect"
                 ref="userTable">
-        <el-table-column type="selection" width="50"/>
+        <el-table-column v-if="hasPermission('WORKSPACE_PROJECT_MANAGER:READ+ADD_USER')" type="selection" width="50"/>
         <ms-table-header-select-popover v-show="total>0"
                                         :page-size="pageSize>total?total:pageSize"
                                         :total="total"
@@ -21,7 +21,8 @@
                                         @selectAll="isSelectDataAll(true)"/>
         <el-table-column width="30" min-width="30" :resizable="false" align="center">
           <template v-slot:default="scope">
-            <show-more-btn :is-show="scope.row.showMore" :buttons="buttons" :size="selectDataCounts"/>
+            <show-more-btn v-permission="['WORKSPACE_PROJECT_MANAGER:READ+ADD_USER']"
+                           :is-show="scope.row.showMore" :buttons="buttons" :size="selectDataCounts"/>
           </template>
         </el-table-column>
         <el-table-column prop="id" label="ID"/>
@@ -101,7 +102,7 @@ import MsDialogFooter from "../../common/components/MsDialogFooter";
 import {
   getCurrentProjectID,
   getCurrentUser,
-  getCurrentWorkspaceId,
+  getCurrentWorkspaceId, hasPermission,
   listenGoBack,
   removeGoBackListener
 } from "@/common/js/utils";
@@ -172,6 +173,7 @@ export default {
     this.initTableData();
   },
   methods: {
+    hasPermission,
     currentUser: () => {
       return getCurrentUser();
     },