From c80497c3c7ecbc81ebb2eb2eea21f4c16849348d Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Fri, 14 Jan 2022 17:28:06 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E9=A1=B9=E7=9B=AE=E8=AE=BE=E7=BD=AE):?=
 =?UTF-8?q?=20=E7=94=A8=E6=88=B7=E7=BB=84=E4=B8=8E=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E6=9F=A5=E7=9C=8B=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/project/menu/UserGroup.vue        |  4 ++++
 .../settings/system/group/EditPermission.vue     | 16 ++++++++++------
 .../settings/system/group/GroupPermission.vue    | 10 ++++++++--
 frontend/src/i18n/en-US.js                       |  1 +
 frontend/src/i18n/zh-CN.js                       |  1 +
 frontend/src/i18n/zh-TW.js                       |  1 +
 6 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/frontend/src/business/components/project/menu/UserGroup.vue b/frontend/src/business/components/project/menu/UserGroup.vue
index 74af7bb019..12dfb76a4e 100644
--- a/frontend/src/business/components/project/menu/UserGroup.vue
+++ b/frontend/src/business/components/project/menu/UserGroup.vue
@@ -57,6 +57,7 @@
                         icon="el-icon-s-tools"
                         @exec="setPermission(scope.row)"
                         :disabled="flagChange(scope.row.scopeId ==='global')"/>
+                      <ms-table-operator-button :tip="$t('group.view_permission')" icon="el-icon-view" @exec="viewPermission(scope.row)"/>
                     </template>
                   </ms-table-operator>
                 </div>
@@ -164,6 +165,9 @@ export default {
         return false;
       }
     },
+    viewPermission(row) {
+      this.$refs.editPermission.open(row, true, this.$t('group.view_permission'));
+    },
     create() {
       this.$refs.editUserGroup.open({}, 'create', this.$t('group.create'));
     },
diff --git a/frontend/src/business/components/settings/system/group/EditPermission.vue b/frontend/src/business/components/settings/system/group/EditPermission.vue
index 70be92a299..2193f0c25d 100644
--- a/frontend/src/business/components/settings/system/group/EditPermission.vue
+++ b/frontend/src/business/components/settings/system/group/EditPermission.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog :close-on-click-modal="false" :visible.sync="dialogVisible" width="65%"
-             :title="$t('group.set_permission')"
+             :title="title"
              :destroy-on-close="true"
              v-loading="result.loading"
              top="5%"
@@ -35,7 +35,7 @@
           prop="permissions"
           :label="$t('group.permission')">
           <template v-slot:default="scope">
-            <group-permission :permissions="scope.row.permissions" :selected.sync="tableData"/>
+            <group-permission :permissions="scope.row.permissions" :selected.sync="tableData" :read-only="readOnly"/>
           </template>
         </el-table-column>
         <el-table-column
@@ -43,7 +43,7 @@
           :label="$t('group.check_all')">
           <template v-slot:default="scope">
             <div style="text-align: center;">
-              <el-checkbox @change="handleSelectAll($event, scope.row.permissions)"/>
+              <el-checkbox @change="handleSelectAll($event, scope.row.permissions)" :disabled="readOnly"/>
             </div>
           </template>
         </el-table-column>
@@ -51,7 +51,7 @@
     </div>
     <template v-slot:footer>
       <el-button @click="cancel" size="medium">{{ $t('commons.cancel') }}</el-button>
-      <el-button type="primary" @click="onSubmit" size="medium" style="margin-top: 10px;margin-left: 5px;">
+      <el-button type="primary" @click="onSubmit" size="medium" style="margin-top: 10px;margin-left: 5px;" :disabled="readOnly">
         {{ $t('commons.confirm') }}
       </el-button>
     </template>
@@ -72,7 +72,9 @@ export default {
       selected: [],
       group: {},
       result: {},
-      spanArr: []
+      spanArr: [],
+      readOnly: false,
+      title: this.$t('group.set_permission')
     }
   },
   components: {
@@ -84,7 +86,9 @@ export default {
     }
   },
   methods: {
-    open(row) {
+    open(row, readOnly, title) {
+      this.readOnly = readOnly ? readOnly : false;
+      this.title = title ? title : this.$t('group.set_permission');
       this.tableData = [];
       this.spanArr = [];
       this.dialogVisible = true;
diff --git a/frontend/src/business/components/settings/system/group/GroupPermission.vue b/frontend/src/business/components/settings/system/group/GroupPermission.vue
index d743b8416f..4ebd2fb1de 100644
--- a/frontend/src/business/components/settings/system/group/GroupPermission.vue
+++ b/frontend/src/business/components/settings/system/group/GroupPermission.vue
@@ -2,11 +2,11 @@
   <div>
     <span v-for="(permission, index) in permissions" :key="index">
       <el-checkbox v-if="permission.license" v-xpack class="permission-checkbox"
-                   v-model="permission['checked']" @change="change($event, permission)">
+                   v-model="permission['checked']" @change="change($event, permission)" :disabled="readOnly">
         {{ $t(permission.name) }}
       </el-checkbox>
       <el-checkbox v-else class="permission-checkbox"
-                   v-model="permission['checked']" @change="change($event, permission)">
+                   v-model="permission['checked']" @change="change($event, permission)" :disabled="readOnly">
         {{ $t(permission.name) }}
       </el-checkbox>
     </span>
@@ -28,6 +28,12 @@ export default {
       default() {
         return []
       }
+    },
+    readOnly: {
+      type: Boolean,
+      default() {
+        return false;
+      }
     }
   },
   data() {
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 2a47dbdf62..e46e1abaed 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -850,6 +850,7 @@ export default {
     admin_not_allow_edit: 'admin not allow edit!',
     admin_not_allow_delete: 'admin not allow delete!',
     select_type: 'please select type',
+    view_permission: 'view permission',
     system: 'System',
     organization: 'Organization',
     workspace: 'Workspace',
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index fc314730a6..576d808d08 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -849,6 +849,7 @@ export default {
     operator: '操作人',
     description: '描述',
     set_permission: '设置权限',
+    view_permission: '查看权限',
     delete: '删除用户组',
     edit: '编辑用户组',
     admin_not_allow_edit: '系统管理员不支持编辑!',
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index f7bae1725e..7115a16fcb 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -849,6 +849,7 @@ export default {
     operator: '操作人',
     description: '描述',
     set_permission: '設置權限',
+    view_permission: '查看權限',
     delete: '刪除用戶組',
     edit: '編輯用戶組',
     admin_not_allow_edit: '系統管理員不支持編輯!',