From e82663bdb9ea38aa2c16ba8878df56942a3c1266 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Tue, 16 Aug 2022 17:00:52 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E9=A1=B9=E7=9B=AE=E8=AE=BE=E7=BD=AE):=20?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=BB=84=E4=B8=AD=E7=9A=84=E6=88=90=E5=91=98?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=9D=83=E9=99=90=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1015849 --user=李玉号 【系统设置】只有项目设置 - 用户组与权限 - 查询用户组与权限
的权限，但是可以编辑用户组中的成员 https://www.tapd.cn/55049933/s/1224436
---
 .../components/project/menu/UserGroup.vue     |  7 +++++-
 .../settings/system/group/GroupMember.vue     | 24 ++++++++++++++++++-
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/frontend/src/business/components/project/menu/UserGroup.vue b/frontend/src/business/components/project/menu/UserGroup.vue
index 59d1243098..2d54ceb4b7 100644
--- a/frontend/src/business/components/project/menu/UserGroup.vue
+++ b/frontend/src/business/components/project/menu/UserGroup.vue
@@ -67,7 +67,12 @@
           <ms-table-pagination :change="initData" :current-page.sync="currentPage" :page-size.sync="pageSize"
                                :total="total"/>
         </el-card>
-        <group-member ref="groupMember" @refresh="initData"/>
+        <group-member
+          ref="groupMember"
+          :edit-permission="['PROJECT_GROUP:READ+EDIT']"
+          :delete-permission="['PROJECT_GROUP:READ+EDIT']"
+          :create-permission="['PROJECT_GROUP:READ+EDIT']"
+          @refresh="initData"/>
         <edit-user-group ref="editUserGroup" @refresh="initData"/>
         <edit-permission ref="editPermission"/>
         <ms-delete-confirm :title="$t('group.delete')" @delete="_handleDel" ref="deleteConfirm"/>
diff --git a/frontend/src/business/components/settings/system/group/GroupMember.vue b/frontend/src/business/components/settings/system/group/GroupMember.vue
index 00b77597ed..73de4020b0 100644
--- a/frontend/src/business/components/settings/system/group/GroupMember.vue
+++ b/frontend/src/business/components/settings/system/group/GroupMember.vue
@@ -5,7 +5,7 @@
                class="group-member">
       <template v-slot:title>
         <ms-table-header :condition.sync="condition" @create="addMemberBtn" @search="search"
-                         :create-tip="$t('member.create')" :title="$t('commons.member')"/>
+                         :create-permission="createPermission" :create-tip="$t('member.create')" :title="$t('commons.member')"/>
       </template>
       <el-table :border="true" class="adjust-table" :data="memberData" style="width: 100%;margin-top:5px;">
         <el-table-column prop="id" label="ID"/>
@@ -41,6 +41,8 @@
             <div>
               <ms-table-operator :tip2="$t('commons.remove')"
                                  :show-edit="showTypeLabel"
+                                 :delete-permission="deletePermission"
+                                 :edit-permission="editPermission"
                                  @editClick="editMemberBtn(scope.row)"
                                  @deleteClick="removeMember(scope.row)"/>
             </div>
@@ -142,6 +144,26 @@ export default {
       }
     };
   },
+  props: {
+    editPermission: {
+      type: Array,
+      default() {
+        return [];
+      }
+    },
+    deletePermission: {
+      type: Array,
+      default() {
+        return [];
+      }
+    },
+    createPermission: {
+      type: Array,
+      default() {
+        return []
+      }
+    },
+  },
   computed: {
     typeLabel() {
       let type = this.group.type;