From bf3c87575cffd5b58c6b15f611555f7a7b3966e0 Mon Sep 17 00:00:00 2001
From: feng <1304903146@qq.com>
Date: Mon, 19 Feb 2024 14:43:01 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E6=8E=88=E6=9D=83=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA=E8=A7=92=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assets/Asset/AssetDetail/PermUser.vue     | 24 ++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/views/assets/Asset/AssetDetail/PermUser.vue b/src/views/assets/Asset/AssetDetail/PermUser.vue
index 9da422299..a608162f0 100644
--- a/src/views/assets/Asset/AssetDetail/PermUser.vue
+++ b/src/views/assets/Asset/AssetDetail/PermUser.vue
@@ -39,7 +39,7 @@ export default {
         url: `/api/v1/assets/assets/${this.object.id}/perm-users/`,
         columns: [
           'name', 'username', 'email', 'phone', 'wechat',
-          'groups_display', 'total_role_display', 'source',
+          'groups_display', 'system_roles', 'org_roles', 'source',
           'is_valid', 'login_blocked', 'mfa_enabled',
           'mfa_force_enabled', 'is_expired',
           'last_login', 'date_joined', 'date_password_last_updated',
@@ -62,8 +62,26 @@ export default {
           source: {
             width: '120px'
           },
-          total_role_display: {
-            label: this.$t('users.Role')
+          system_roles: {
+            width: '100px',
+            label: this.$t('users.SystemRoles'),
+            formatter: (row) => {
+              return row['system_roles'].map(item => item['display_name']).join(', ') || '-'
+            },
+            filters: [],
+            columnKey: 'system_roles'
+          },
+          org_roles: {
+            width: '100px',
+            label: this.$t('users.OrgRoles'),
+            formatter: (row) => {
+              return row['org_roles'].map(item => item['display_name']).join(', ') || '-'
+            },
+            filters: [],
+            columnKey: 'org_roles',
+            has: () => {
+              return this.$store.getters.hasValidLicense && !this.currentOrgIsRoot
+            }
           },
           mfa_enabled: {
             label: 'MFA',