From 5f97bc9ba344e843d02d5ed90598e01a4a69f488 Mon Sep 17 00:00:00 2001
From: song-cc-rock <changchang.song@fit2cloud.com>
Date: Mon, 24 Jul 2023 15:10:09 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):?=
 =?UTF-8?q?=20=E7=B3=BB=E7=BB=9F=E7=94=A8=E6=88=B7=E7=BB=84=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E5=88=97=E8=A1=A8=E6=88=90=E5=91=98=E6=9F=A5=E7=9C=8B?=
 =?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=1028063 --user=宋昌昌 【系统设置】用户组与权限-只读用户无法点击成员查看 https://www.tapd.cn/55049933/s/1396529
---
 .../frontend/src/business/system/group/GroupMember.vue    | 8 +++++++-
 .../frontend/src/business/system/group/UserGroup.vue      | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/system-setting/frontend/src/business/system/group/GroupMember.vue b/system-setting/frontend/src/business/system/group/GroupMember.vue
index 4b1fc2d84e..201558a630 100644
--- a/system-setting/frontend/src/business/system/group/GroupMember.vue
+++ b/system-setting/frontend/src/business/system/group/GroupMember.vue
@@ -4,7 +4,7 @@
                :destroy-on-close="true" @close="close" v-loading="loading" z-index="1000"
                class="group-member">
       <template v-slot:title>
-        <ms-table-header :condition.sync="condition" @create="addMemberBtn" @search="search"
+        <ms-table-header :condition.sync="condition" @create="addMemberBtn" @search="search" :create-permission="['SYSTEM_GROUP:READ+EDIT']"
                          :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;">
@@ -41,6 +41,8 @@
             <div>
               <ms-table-operator :tip2="$t('commons.remove')"
                                  :show-edit="showTypeLabel"
+                                 :edit-permission="['SYSTEM_GROUP:READ+EDIT']"
+                                 :delete-permission="['SYSTEM_GROUP:READ+EDIT']"
                                  @editClick="editMemberBtn(scope.row)"
                                  @deleteClick="removeMember(scope.row)"/>
             </div>
@@ -121,6 +123,7 @@ import {
 import {getUserListByResourceUrl} from "../../../api/user";
 import {getGroupResource} from "../../../api/workspace";
 import {operationConfirm} from "metersphere-frontend/src/utils";
+import {hasPermissions} from "metersphere-frontend/src/utils/permission";
 
 export default {
   name: "GroupMember",
@@ -183,6 +186,9 @@ export default {
     }
   },
   methods: {
+    hasPermissions(permission) {
+      return hasPermissions(permission[0]);
+    },
     init() {
       this.condition.userGroupId = this.group.id;
       this.loading = getUserGroupByResourceUrlAndPage(this.initUserGroupUrl, this.currentPage, this.pageSize, this.condition)
diff --git a/system-setting/frontend/src/business/system/group/UserGroup.vue b/system-setting/frontend/src/business/system/group/UserGroup.vue
index b2bfe9325f..c905d3c944 100644
--- a/system-setting/frontend/src/business/system/group/UserGroup.vue
+++ b/system-setting/frontend/src/business/system/group/UserGroup.vue
@@ -136,7 +136,7 @@ export default {
       return USER_GROUP_SCOPE;
     },
     disabledEditGroupMember() {
-      return !hasPermission('SYSTEM_GROUP:READ+EDIT');
+      return !hasPermission('SYSTEM_GROUP:READ');
     }
   },
   methods: {