From 6b87a2ad31d75a34ca93b2eb9e4f93cb37e6bb23 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Mon, 11 Mar 2024 19:20:32 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ColumnSettingPopover.vue       | 25 +++++++++++++++++--
 src/components/Table/DataTable/index.vue      |  3 ++-
 src/styles/index.scss                         |  4 +++
 .../assets/Asset/AssetDetail/PermUser.vue     |  2 +-
 src/views/profile/ProfileImprovement.vue      |  2 +-
 .../profile/ProfileUpdate/ProfileUpdate.vue   |  2 +-
 src/views/users/User/UserCreateUpdate.vue     |  2 +-
 7 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/src/components/Table/AutoDataTable/components/ColumnSettingPopover.vue b/src/components/Table/AutoDataTable/components/ColumnSettingPopover.vue
index 893675452..29ced96de 100644
--- a/src/components/Table/AutoDataTable/components/ColumnSettingPopover.vue
+++ b/src/components/Table/AutoDataTable/components/ColumnSettingPopover.vue
@@ -20,7 +20,7 @@
           v-for="item in totalColumnsList"
           :key="item.prop"
           :span="8"
-          style="margin-top:5px;"
+          class="col-item"
         >
           <el-checkbox
             :disabled="item.prop==='actions' || minColumns.indexOf(item.prop)!==-1"
@@ -87,8 +87,29 @@ export default {
 }
 </script>
 
-<style lang='less' scoped>
+<style lang='scss' scoped>
 .column-setting {
   margin-left: 10px;
+
+  .col-item {
+    margin-top: 5px;
+
+    >>> .el-checkbox {
+      width: 100%;
+
+      .el-checkbox__input {
+        line-height: 16px
+      }
+
+      .el-checkbox__label {
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        overflow: hidden;
+        width: calc(100% - 20px); // 20px is the width of the checkbox
+        line-height: 16px;
+        vertical-align: text-top;
+      }
+    }
+  }
 }
 </style>
diff --git a/src/components/Table/DataTable/index.vue b/src/components/Table/DataTable/index.vue
index 4eff0e7bf..2ea1d451b 100644
--- a/src/components/Table/DataTable/index.vue
+++ b/src/components/Table/DataTable/index.vue
@@ -170,7 +170,8 @@ export default {
 <style lang="scss" scoped>
 .el-data-table {
   >>> .el-pagination.is-background .el-pager li {
-    margin: 0 1px ;
+    margin: 0 1px;
+    padding: 0 2px;
   }
 }
 </style>
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 50f6d8d3b..571347dfe 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -397,3 +397,7 @@ button, input, optgroup, select, textarea {
   border-radius: 2px;
 }
 
+
+.el-select .el-input .el-select__caret {
+  line-height: 1;
+}
diff --git a/src/views/assets/Asset/AssetDetail/PermUser.vue b/src/views/assets/Asset/AssetDetail/PermUser.vue
index 6159d2faf..ecaf4d552 100644
--- a/src/views/assets/Asset/AssetDetail/PermUser.vue
+++ b/src/views/assets/Asset/AssetDetail/PermUser.vue
@@ -38,7 +38,7 @@ export default {
       tableConfig: {
         url: `/api/v1/assets/assets/${this.object.id}/perm-users/`,
         columns: [
-          'name', 'username', 'email', 'phone', 'wechat',
+          'name', 'username', 'email', 'phone',
           'groups_display', 'total_role_display', 'source',
           'is_valid', 'login_blocked', 'mfa_enabled',
           'mfa_force_enabled', 'is_expired',
diff --git a/src/views/profile/ProfileImprovement.vue b/src/views/profile/ProfileImprovement.vue
index a93427e9a..f37b94a19 100644
--- a/src/views/profile/ProfileImprovement.vue
+++ b/src/views/profile/ProfileImprovement.vue
@@ -24,7 +24,7 @@ export default {
       fields: [
         [this.$t('Account'), ['username', 'name', 'email']],
         [this.$t('Authentication'), ['mfa_level', 'public_key']],
-        [this.$t('Other'), ['phone', 'wechat']],
+        [this.$t('Other'), ['phone']],
         [this.$t('TermsAndConditions'), ['terms']]
       ],
       fieldsMeta: {
diff --git a/src/views/profile/ProfileUpdate/ProfileUpdate.vue b/src/views/profile/ProfileUpdate/ProfileUpdate.vue
index 6de4aadfc..b8529aa55 100644
--- a/src/views/profile/ProfileUpdate/ProfileUpdate.vue
+++ b/src/views/profile/ProfileUpdate/ProfileUpdate.vue
@@ -30,7 +30,7 @@ export default {
       hasDetailInMsg: false,
       fields: [
         [this.$t('Account'), ['username', 'name', 'email']],
-        [this.$t('Other'), ['phone', 'wechat']]
+        [this.$t('Other'), ['phone']]
       ],
       fieldsMeta: {
         username: {
diff --git a/src/views/users/User/UserCreateUpdate.vue b/src/views/users/User/UserCreateUpdate.vue
index a3ee9219b..1f533e093 100644
--- a/src/views/users/User/UserCreateUpdate.vue
+++ b/src/views/users/User/UserCreateUpdate.vue
@@ -31,7 +31,7 @@ export default {
           'need_update_password', 'mfa_level', 'source'
         ]],
         [this.$t('Secure'), ['system_roles', 'org_roles', 'is_active', 'date_expired']],
-        [this.$t('Other'), ['phone', 'wechat', 'comment']]
+        [this.$t('Other'), ['phone', 'comment']]
       ],
       url: '/api/v1/users/users/',
       fieldsMeta: {