From a860cf1a139d5b61aa45d86fb37cf4180c1959fe Mon Sep 17 00:00:00 2001 From: ibuler Date: Mon, 25 Mar 2024 18:17:37 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/theme/element-extra.css | 10 +++++++--- src/components/Apps/AccountCreateUpdateForm/const.js | 2 +- src/components/DataActions/index.vue | 5 +++++ .../Form/AutoDataForm/components/NestedField.vue | 2 +- .../el-form-renderer/components/render-form-item.vue | 1 - .../Table/TableFormatters/ActionsFormatter.vue | 8 +++++++- src/icons/svg/assets.svg | 2 +- src/icons/svg/users.svg | 4 +--- src/layout/components/Page/PageHeading.vue | 1 + src/layout/components/TabPage/index.vue | 3 +++ src/views/ops/Job/index.vue | 2 +- src/views/users/User/UserList.vue | 2 +- 12 files changed, 29 insertions(+), 13 deletions(-) diff --git a/public/theme/element-extra.css b/public/theme/element-extra.css index c9032c0a1..768df6a0e 100644 --- a/public/theme/element-extra.css +++ b/public/theme/element-extra.css @@ -21,13 +21,13 @@ } .el-alert--info.is-light { - background-color: light-9; - color: light-2; + background-color: rgba(255, 255, 255, 0.5); + color: info; border: 1px solid; } .el-alert--info .el-alert__description { - color: light-2; + color: info; } .el-pagination.is-background .el-pager li:not(.disabled):hover { @@ -87,6 +87,10 @@ td .el-button.el-button--mini { padding: 2px 4px; line-height: 1.5; + + .el-icon--right { + margin-bottom: 2px; + } } .el-tabs__item.is-active, .el-tabs--border-card>.el-tabs__header .el-tabs__item.is-active { diff --git a/src/components/Apps/AccountCreateUpdateForm/const.js b/src/components/Apps/AccountCreateUpdateForm/const.js index 3adedde4a..f15feceb7 100644 --- a/src/components/Apps/AccountCreateUpdateForm/const.js +++ b/src/components/Apps/AccountCreateUpdateForm/const.js @@ -151,7 +151,7 @@ export const accountFieldsMeta = (vm) => { } }, push_now: { - helpText: vm.$t('AccountPush.WindowsPushHelpText'), + helpText: vm.$t('WindowsPushHelpText'), hidden: (formValue) => { const automation = vm.iPlatform.automation || {} return !automation.push_account_enabled || diff --git a/src/components/DataActions/index.vue b/src/components/DataActions/index.vue index 06ba3b93d..4793b1a82 100644 --- a/src/components/DataActions/index.vue +++ b/src/components/DataActions/index.vue @@ -221,6 +221,11 @@ export default { .el-button-ungroup .action-item { margin-left: 4px; + line-height: 1; +} + +.action-item.el-dropdown { + font-size: 11px; } .el-button-ungroup .action-item:first-child { diff --git a/src/components/Form/AutoDataForm/components/NestedField.vue b/src/components/Form/AutoDataForm/components/NestedField.vue index f7ce8dedb..1ae236c2f 100644 --- a/src/components/Form/AutoDataForm/components/NestedField.vue +++ b/src/components/Form/AutoDataForm/components/NestedField.vue @@ -4,7 +4,7 @@ :disabled="disabled" :fields="iFields" :form="value" - style="margin-left: -26%;margin-right: -6%" + style="margin-left: -36%;margin-right: -6%" v-bind="kwargs" @change="updateValue($event)" @input="updateValue($event)" diff --git a/src/components/Form/DataForm/components/el-form-renderer/components/render-form-item.vue b/src/components/Form/DataForm/components/el-form-renderer/components/render-form-item.vue index 0d92ccd95..701cac420 100755 --- a/src/components/Form/DataForm/components/el-form-renderer/components/render-form-item.vue +++ b/src/components/Form/DataForm/components/el-form-renderer/components/render-form-item.vue @@ -26,7 +26,6 @@ {{ itemValue }}
- is select diff --git a/src/components/Table/TableFormatters/ActionsFormatter.vue b/src/components/Table/TableFormatters/ActionsFormatter.vue index caabe23f3..a7d427232 100644 --- a/src/components/Table/TableFormatters/ActionsFormatter.vue +++ b/src/components/Table/TableFormatters/ActionsFormatter.vue @@ -5,6 +5,7 @@ :more-actions="moreActions" :more-actions-title="moreActionsTitle" :size="'mini'" + class="table-actions" /> @@ -141,7 +142,7 @@ export default { colActions: colActions, defaultActions: defaultActions, extraActions: colActions.extraActions, - moreActionsTitle: colActions.moreActionsTitle || this.$t('More') + moreActionsTitle: colActions.moreActionsTitle || this.$t('...') } }, computed: { @@ -216,5 +217,10 @@ export default { diff --git a/src/icons/svg/assets.svg b/src/icons/svg/assets.svg index d576c51a2..245c576ce 100644 --- a/src/icons/svg/assets.svg +++ b/src/icons/svg/assets.svg @@ -1 +1 @@ - + diff --git a/src/icons/svg/users.svg b/src/icons/svg/users.svg index 56f79f67f..b68952e88 100644 --- a/src/icons/svg/users.svg +++ b/src/icons/svg/users.svg @@ -1,3 +1 @@ - - - \ No newline at end of file + diff --git a/src/layout/components/Page/PageHeading.vue b/src/layout/components/Page/PageHeading.vue index be0d9c220..a79beb3ff 100644 --- a/src/layout/components/Page/PageHeading.vue +++ b/src/layout/components/Page/PageHeading.vue @@ -52,6 +52,7 @@ export default { height: 50px; line-height: 50px; background-color: #ffffff; + border-bottom: solid 1px #ebeef5; .el-row { width: 100%; position: absolute; diff --git a/src/layout/components/TabPage/index.vue b/src/layout/components/TabPage/index.vue index 19c666735..a54cd5dcb 100644 --- a/src/layout/components/TabPage/index.vue +++ b/src/layout/components/TabPage/index.vue @@ -182,6 +182,9 @@ export default { } .tab-page { + >>> .page-heading { + border-bottom: none; + } >>> .page-content { overflow-y: hidden; padding: 0; diff --git a/src/views/ops/Job/index.vue b/src/views/ops/Job/index.vue index 1c1f13215..2e8996e17 100644 --- a/src/views/ops/Job/index.vue +++ b/src/views/ops/Job/index.vue @@ -51,7 +51,7 @@ export default { width: '240px' }, summary: { - label: this.$t('Summary(success/total)'), + label: this.$t('Ok/total'), formatter: (row) => { return row.summary['success'] + '/' + row.summary['total'] } diff --git a/src/views/users/User/UserList.vue b/src/views/users/User/UserList.vue index 78d06d89b..fe4c4201e 100644 --- a/src/views/users/User/UserList.vue +++ b/src/views/users/User/UserList.vue @@ -297,7 +297,7 @@ export default { if (data.length === 0) return this.$axios.patch(url, data).then(() => { reloadTable() - vm.$message.success(vm.$t(`common.${actionType}SuccessMsg`)) + vm.$message.success(vm.$t(`${actionType}SuccessMsg`)) }) }, handleInviteDialogClose() {