Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(formitem): 提供控件级别的 showErrorMessage 配置，优先级高于 Form.showErrorMessage #514

Merged
merged 8 commits into from
Mar 11, 2022
Merged

feat(formitem): 提供控件级别的 showErrorMessage 配置，优先级高于 Form.showErrorMessage #514

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7f7560d
feat(formitem): 提供控件级别的 showErrorMessage 配置，优先级高于 Form.showErrorMessage
YikaJ Mar 7, 2022
dc43d24
docs(form): update docs
YikaJ Mar 11, 2022
b7a7d45
docs(uploader): update uploader docs
YikaJ Mar 11, 2022
c39c03a
docs(uploader): upload docs update
YikaJ Mar 11, 2022
32f95ec
docs(upload): update docs
YikaJ Mar 11, 2022
3746652
test(upload): update batchUpload to isBatchUpload
YikaJ Mar 11, 2022
b294c97
test(upload): snapshots update
YikaJ Mar 11, 2022
25c398a
test(upload): update snapshots
YikaJ Mar 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/form/form-item-props.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,10 @@ export default {
},
/** 是否显示校验成功的边框，默认不显示 */
successBorder: Boolean,

/** 校验不通过时，是否显示错误提示信息，优先级高于 Form.showErrorMessage */
showErrorMessage: {
type: Boolean,
default: undefined,
},
};
12 changes: 8 additions & 4 deletions src/form/form-item.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,12 @@ export default mixins(getConfigReceiverMixins<FormItemContructor, FormConfig>('f
},

computed: {
needErrorMessage(): Boolean {
if (typeof this.showErrorMessage === 'boolean') return this.showErrorMessage;

const parent = this.form;
return parent?.showErrorMessage;
},
classes(): ClassName {
return [
CLASS_NAMES.formItem,
Expand Down Expand Up @@ -95,8 +101,7 @@ export default mixins(getConfigReceiverMixins<FormItemContructor, FormConfig>('f
];
},
errorClasses(): string {
const parent = this.form;
if (!parent.showErrorMessage) return '';
if (!this.needErrorMessage) return '';
if (this.verifyStatus === VALIDATE_STATUS.SUCCESS) {
return this.successBorder ? [CLASS_NAMES.success, CLASS_NAMES.successBorder].join(' ') : CLASS_NAMES.success;
}
Expand Down Expand Up @@ -284,13 +289,12 @@ export default mixins(getConfigReceiverMixins<FormItemContructor, FormConfig>('f
);
},
renderTipsInfo(): VNode {
const parent = this.form;
let helpVNode: VNode;
if (this.help) {
helpVNode = <div class={CLASS_NAMES.help}>{this.help}</div>;
}
const list = this.errorList;
if (parent.showErrorMessage && list && list[0] && list[0].message) {
if (this.needErrorMessage && list && list[0] && list[0].message) {
return <p class={CLASS_NAMES.extra}>{list[0].message}</p>;
}
if (this.successList.length) {
Expand Down
5 changes: 5 additions & 0 deletions src/form/type.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,11 @@ export interface TdFormItemProps {
* @default false
*/
successBorder?: boolean;
/**
* 校验不通过时，是否显示错误提示信息，优先级高于 Form.showErrorMessage
* @default undefined
* */
showErrorMessage?: boolean;
}

export interface FormRule {
Expand Down