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" > - 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 { 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: {