From 8a1556ccdba2f9119e342f94a675f1ad2458ce10 Mon Sep 17 00:00:00 2001
From: "Jiangjie.Bai" <bugatti_it@163.com>
Date: Mon, 14 Mar 2022 16:18:06 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6(?=
 =?UTF-8?q?=E8=B5=84=E4=BA=A7=E8=B4=A6=E5=8F=B7/=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E8=B4=A6=E5=8F=B7)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AccountListTable/index.vue    |  2 +-
 src/components/AppAccountListTable/index.vue |  2 +-
 src/views/users/Role/RoleDetail/RoleInfo.vue | 21 ++++++++++----------
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/components/AccountListTable/index.vue b/src/components/AccountListTable/index.vue
index bce89d0e2..800afc0c5 100644
--- a/src/components/AccountListTable/index.vue
+++ b/src/components/AccountListTable/index.vue
@@ -70,7 +70,7 @@ export default {
             prop: 'hostname',
             label: this.$t('assets.Hostname'),
             showOverflowTooltip: true,
-            formatter: DetailFormatter,
+            formatter: this.$hasPerm('assets.view_asset') ? DetailFormatter : (row) => row.hostname,
             formatterArgs: {
               getRoute({ row }) {
                 return {
diff --git a/src/components/AppAccountListTable/index.vue b/src/components/AppAccountListTable/index.vue
index c34bf0021..ff30a3a1b 100644
--- a/src/components/AppAccountListTable/index.vue
+++ b/src/components/AppAccountListTable/index.vue
@@ -82,7 +82,7 @@ export default {
           },
           systemuser: {
             showOverflowTooltip: true,
-            formatter: DetailFormatter,
+            formatter: this.$hasPerm('assets.view_systemuser') ? DetailFormatter : (row) => row.systemuser_display,
             formatterArgs: {
               getTitle({ row }) {
                 return row.systemuser_display
diff --git a/src/views/users/Role/RoleDetail/RoleInfo.vue b/src/views/users/Role/RoleDetail/RoleInfo.vue
index 6d585b8e8..b9f9ef1b0 100644
--- a/src/views/users/Role/RoleDetail/RoleInfo.vue
+++ b/src/views/users/Role/RoleDetail/RoleInfo.vue
@@ -78,25 +78,22 @@ export default {
         'view_audit': ['rbac.view_audit'],
         'view_workspace': ['rbac.view_workspace'],
         'view_setting': ['settings.view_setting', 'settings.change_setting'],
+        'cloud_import': ['assets.view_asset'],
+        'rbac.orgrolebinding': ['rbac.view_orgrole'],
+        'rbac.systemrolebinding': ['rbac.view_systemrole'],
         'users.invite_user': [
           'users.match_user', 'rbac.add_orgrolebinding', 'rbac.change_orgrolebinding',
           'rbac.view_orgrolebinding', 'rbac.view_orgrole'
         ],
+        'acls.loginacl': ['users.view_user'],
         'assets.view_asset': ['assets.view_node'],
         'assets.commandfilterrule': ['assets.view_commandfilter'],
         'assets.gateway': ['assets.view_domain'],
-        'cloud_import': ['assets.view_asset'],
-        'xpack.add_syncinstancetask': [
-          'assets.view_asset', 'assets.view_node', 'assets.view_systemuser',
-          'xpack.view_account'
-        ],
+        'assets.view_authbook': ['assets.view_node'],
         'applications.add_application': ['assets.view_asset'],
+        'applications.view_account': ['applications.view_application'],
         'perms.view_assetpermission': ['assets.view_node'],
         'perms.view_applicationpermission': ['applications.view_application'],
-        'acls.loginacl': ['users.view_user'],
-        'rbac.orgrolebinding': ['rbac.view_orgrole'],
-        'rbac.systemrolebinding': ['rbac.view_systemrole'],
-        'settings.change_systemmsgsubscription': ['users.view_user'],
         'perms.assetpermission': [
           'assets.view_asset', 'assets.view_node', 'assets.view_systemuser',
           'users.view_user', 'users.view_usergroup'
@@ -105,7 +102,11 @@ export default {
           'applications.view_application', 'assets.view_systemuser',
           'users.view_user', 'users.view_usergroup'
         ],
-        'assets.view_authbook': ['assets.view_node']
+        'settings.change_systemmsgsubscription': ['users.view_user'],
+        'xpack.add_syncinstancetask': [
+          'assets.view_asset', 'assets.view_node', 'assets.view_systemuser',
+          'xpack.view_account'
+        ]
       }
     }
   },