From f54e2c8ddc7a04022fab49a9c2798a46cc6a7534 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Tue, 11 Feb 2025 14:32:08 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9=E6=8E=88=E6=9D=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Apps/AccountListTable/AccountList.vue  | 11 ++++++++++-
 src/layout/components/Page/TwoColPage.vue             |  2 +-
 .../AssetPermissionDetail/AssetPermissionAccount.vue  |  7 ++++---
 .../perms/AssetPermission/AssetPermissionList.vue     | 11 +++++++++--
 src/views/perms/const.js                              |  8 +++++++-
 5 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/src/components/Apps/AccountListTable/AccountList.vue b/src/components/Apps/AccountListTable/AccountList.vue
index 63e94de78..a166c89a6 100644
--- a/src/components/Apps/AccountListTable/AccountList.vue
+++ b/src/components/Apps/AccountListTable/AccountList.vue
@@ -133,6 +133,10 @@ export default {
     extraQuery: {
       type: Object,
       default: () => ({})
+    },
+    showQuickFilters: {
+      type: Boolean,
+      default: true
     }
   },
   data() {
@@ -151,7 +155,7 @@ export default {
       iAsset: this.asset,
       account: {},
       secretUrl: '',
-      quickFilters: accountQuickFilters(this),
+      quickFilters: this.showQuickFilters ? accountQuickFilters(this) : [],
       tableConfig: {
         url: this.url,
         permissions: {
@@ -205,6 +209,11 @@ export default {
               platformAttr: 'asset.platform'
             }
           },
+          asset: {
+            formatter: function(row) {
+              return row.asset.name
+            }
+          },
           username: {
             width: '120px'
           },
diff --git a/src/layout/components/Page/TwoColPage.vue b/src/layout/components/Page/TwoColPage.vue
index 3b6fd3e72..a47c60803 100644
--- a/src/layout/components/Page/TwoColPage.vue
+++ b/src/layout/components/Page/TwoColPage.vue
@@ -12,7 +12,7 @@
     </template>
     <template v-else>
       <!-- 默认插槽内容，全宽 -->
-      <el-col :md="single" :sm="24">
+      <el-col :md="single" :offset="(24 - single)/2" :sm="24">
         <slot />
       </el-col>
     </template>
diff --git a/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionAccount.vue b/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionAccount.vue
index 580c3d480..b1a6f0053 100644
--- a/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionAccount.vue
+++ b/src/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionAccount.vue
@@ -4,16 +4,16 @@
       <AccountListTable
         ref="ListTable"
         :asset="object"
+        :columns-default="columns"
         :has-clone="false"
         :has-column-actions="false"
         :has-delete-action="false"
         :has-export="false"
         :has-import="false"
         :has-left-actions="false"
+        :show-quick-filters="false"
         :url="url"
       />
-    </template>
-    <template #right>
       <IBox :title="$tc('Account')" type="primary">
         <AccountFormatter
           :assets="assetIds"
@@ -54,7 +54,8 @@ export default {
       relation: {
         disabled: false,
         username: ''
-      }
+      },
+      columns: ['name', 'username', 'secret', 'asset']
     }
   },
   computed: {
diff --git a/src/views/perms/AssetPermission/AssetPermissionList.vue b/src/views/perms/AssetPermission/AssetPermissionList.vue
index 659e4d272..95cf33bef 100644
--- a/src/views/perms/AssetPermission/AssetPermissionList.vue
+++ b/src/views/perms/AssetPermission/AssetPermissionList.vue
@@ -20,7 +20,7 @@ import Page from '@/layout/components/Page'
 import AssetTreeTable from '@/components/Apps/AssetTreeTable'
 import PermBulkUpdateDialog from './components/PermBulkUpdateDialog'
 import { mapGetters } from 'vuex'
-import { AssetPermissionListPageSearchConfigOptions, AssetPermissionTableMeta } from '../const'
+import { AssetPermissionListPageSearchConfigOptions, AssetPermissionTableMeta } from '../const.js'
 
 export default {
   components: {
@@ -41,9 +41,16 @@ export default {
                 is_valid: false
               }
             },
+            {
+              label: this.$t('Valid'),
+              filter: {
+                is_valid: true
+              }
+            },
             {
               label: this.$t('Expired'),
               filter: {
+                is_expired: true
               }
             },
             {
@@ -55,7 +62,7 @@ export default {
             {
               label: this.$t('NoResource'),
               filter: {
-                no_resource: true
+                is_no_resource: true
               }
             }
           ]
diff --git a/src/views/perms/const.js b/src/views/perms/const.js
index e359d326d..ed867bf96 100644
--- a/src/views/perms/const.js
+++ b/src/views/perms/const.js
@@ -35,7 +35,8 @@ export const AssetPermissionTableMeta = {
   name: {
     minWidth: '120px',
     formatterArgs: {
-      route: 'AssetPermissionDetail'
+      route: 'AssetPermissionDetail',
+      drawer: true
     }
   },
   action: {
@@ -65,6 +66,7 @@ export const AssetPermissionTableMeta = {
     formatterArgs: {
       async: true,
       route: 'AssetPermissionDetail',
+      drawer: true,
       routeQuery: {
         tab: 'AssetPermissionUser'
       }
@@ -75,6 +77,7 @@ export const AssetPermissionTableMeta = {
     formatter: AmountFormatter,
     formatterArgs: {
       async: true,
+      drawer: true,
       route: 'AssetPermissionDetail',
       routeQuery: {
         tab: 'AssetPermissionUser'
@@ -85,6 +88,7 @@ export const AssetPermissionTableMeta = {
     formatter: AmountFormatter,
     formatterArgs: {
       async: true,
+      drawer: true,
       route: 'AssetPermissionDetail',
       routeQuery: {
         tab: 'AssetPermissionAsset'
@@ -96,6 +100,7 @@ export const AssetPermissionTableMeta = {
     formatter: AmountFormatter,
     formatterArgs: {
       async: true,
+      drawer: true,
       route: 'AssetPermissionDetail',
       routeQuery: {
         tab: 'AssetPermissionAsset'
@@ -106,6 +111,7 @@ export const AssetPermissionTableMeta = {
     formatter: AmountFormatter,
     formatterArgs: {
       cellValueToRemove: ['@SPEC'],
+      drawer: true,
       getItem(item) {
         if (item !== '@SPEC') {
           return AccountLabelMapper[item] || item