perf: 授权用户列表显示角色

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',