diff --git a/.vscode/settings.json b/.vscode/settings.json index e773ddf7e..a684cfb27 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -65,7 +65,7 @@ "editor.formatOnSave": false, "editor.codeActionsOnSave": { "source.fixAll": "explicit", - "source.organizeImports": "never" + "source.organizeImports": false }, "eslint.rules.customizations": [ { "rule": "style/*", "severity": "off" }, diff --git a/src/components/Form/src/components/FormItem.vue b/src/components/Form/src/components/FormItem.vue index fcd1d792f..2c9cc658d 100644 --- a/src/components/Form/src/components/FormItem.vue +++ b/src/components/Form/src/components/FormItem.vue @@ -5,7 +5,7 @@ import type { Rule as ValidationRule } from 'ant-design-vue/lib/form' import { Col, Divider, Form } from 'ant-design-vue' import { cloneDeep, upperFirst } from 'lodash-es' import type { FormActionType, FormProps, FormSchemaInner as FormSchema } from '../types/form' -import { isComponentFormSchema } from '../types/form' +import { isComponentFormSchema, InputAttribute } from '../types/form' import { componentMap } from '../componentMap' import { NO_AUTO_LINK_COMPONENTS, createPlaceholderMessage, setComponentRuleType } from '../helper' import { useItemLabelWidth } from '../hooks/useLabelWidth' @@ -255,6 +255,18 @@ export default defineComponent({ const eventKey = `on${upperFirst(changeEvent)}` + // Input/InputTextArea输入限制 + const inputAttr: InputAttribute = {} + if (component && ['Input', 'InputTextArea'.includes(component)]) { + const { maxlength, showCount } = props.schema + if (maxlength) { + inputAttr.maxlength = maxlength + } + if (showCount) { + inputAttr.showCount = showCount + } + } + const { autoSetPlaceHolder, size } = props.formProps const propsData: Recordable = { allowClear: true, @@ -293,6 +305,7 @@ export default defineComponent({ ...propsData, ...on, ...bindValue, + ...inputAttr } if (!renderComponentContent) diff --git a/src/components/Form/src/types/form.ts b/src/components/Form/src/types/form.ts index 6dfecbbe8..b852298a8 100644 --- a/src/components/Form/src/types/form.ts +++ b/src/components/Form/src/types/form.ts @@ -189,6 +189,12 @@ interface BaseFormSchema { isAdvanced?: boolean + // Input/InputTextArea是否显示字数 + showCount?: boolean + + // Input/InputTextArea是否字限制长度 + maxlength?: number + // Matching details components span?: number @@ -258,3 +264,10 @@ export interface HelpComponentProps { // Positioning position: any } + +export interface InputAttribute { + // 输入框默认输入的最大长度 + maxlength?: number + // 是否显示输入的最大长度 + showCount?: boolean +}