From 035597d330c471040e7ce1904fbae6514924bb5b Mon Sep 17 00:00:00 2001 From: ibuler Date: Wed, 22 May 2024 16:46:51 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9=20auto=20form=20chec?= =?UTF-8?q?k=20box?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Form/AutoDataForm/utils.js | 18 +++++++++++++++++- .../components/render-form-item.vue | 9 ++++++++- src/views/dashboard/components/RankTable.vue | 4 ++++ src/views/users/User/UserCreateUpdate.vue | 5 ++++- 4 files changed, 33 insertions(+), 3 deletions(-) diff --git a/src/components/Form/AutoDataForm/utils.js b/src/components/Form/AutoDataForm/utils.js index 84ce2f5a7..231a075a4 100644 --- a/src/components/Form/AutoDataForm/utils.js +++ b/src/components/Form/AutoDataForm/utils.js @@ -173,7 +173,13 @@ export class FormFieldGenerator { let helpTextAsPlaceholder = field.helpTextAsPlaceholder const helpTextWordLength = helpText.split(' ').length - if ((helpTextWordLength <= 5 || helpText.length <= 10) && helpTextAsPlaceholder === undefined) { + const placeholderType = ['input', 'select', 'm2m_related_field'] + const placeholderComponent = [ObjectSelect2] + if (helpTextAsPlaceholder !== undefined) { + helpTextAsPlaceholder = !!helpTextAsPlaceholder + } else if (placeholderType.indexOf(field.type) === -1 && placeholderComponent.indexOf(field.component) === -1) { + helpTextAsPlaceholder = false + } else if (helpTextWordLength <= 5 || helpText.length <= 10) { helpTextAsPlaceholder = true } @@ -193,6 +199,16 @@ export class FormFieldGenerator { if (field.placeholder) { field.el.placeholder = field.placeholder } + + // 设置 checkbox 的 tips + if (field.tips && ['checkbox-group', 'radio-group'].indexOf(field.type) !== -1) { + field.options.map(option => { + if (!option.tip && field.tips[option.value]) { + option.tip = field.tips[option.value] + } + }) + } + return field } 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 8be3d8617..b5c35daed 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 @@ -61,6 +61,9 @@ v-bind="opt" > {{ opt.label }} + + + @@ -69,7 +72,11 @@ :key="opt.label" :label="'value' in opt ? opt.value : opt.label" v-bind="opt" - >{{ opt.label }} + > + {{ opt.label }} + + + diff --git a/src/views/dashboard/components/RankTable.vue b/src/views/dashboard/components/RankTable.vue index e44dcd23e..4e187f4d5 100644 --- a/src/views/dashboard/components/RankTable.vue +++ b/src/views/dashboard/components/RankTable.vue @@ -82,6 +82,10 @@ export default { } } +>>> .el-table td, .el-table th { + padding: 5px 0; +} + >>> .el-table th, .el-table tr { background-color: #F5F6F7!important; diff --git a/src/views/users/User/UserCreateUpdate.vue b/src/views/users/User/UserCreateUpdate.vue index 164f9895e..ca8bb2f72 100644 --- a/src/views/users/User/UserCreateUpdate.vue +++ b/src/views/users/User/UserCreateUpdate.vue @@ -46,7 +46,10 @@ export default { } }, mfa_level: { - disabled: false + disabled: false, + tips: { + 2: this.$t('If force enable, user can not disable by themselves') + } }, email: { rules: [