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.

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

fix(wd-form): empty toast when reject is Error #668

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion src/uni_modules/wot-design-uni/components/wd-form/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,10 @@ export interface FormItemRule {
required: boolean
message: string
pattern?: RegExp
validator?: (value: any, rule: FormItemRuleWithoutValidator) => boolean | Promise<string> | Promise<boolean> | Promise<void> | Promise<unknown>
validator?: (
value: any,
rule: FormItemRuleWithoutValidator
) => boolean | Promise<string> | Promise<Error> | Promise<boolean> | Promise<void> | Promise<unknown>
}

export type FormItemRuleWithoutValidator = Omit<FormItemRule, 'validator'>
Expand Down
22 changes: 17 additions & 5 deletions src/uni_modules/wot-design-uni/components/wd-form/wd-form.vue
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,23 @@ async function validate(prop?: string): Promise<{ valid: boolean; errors: ErrorM
valid = false
}
})
.catch((error) => {
errors.push({
prop,
message: error || rule.message
})
.catch((error: any) => {
if (error instanceof Error) {
errors.push({
prop,
message: error.message || rule.message
})
} else if (typeof error === 'string') {
errors.push({
prop,
message: error
})
} else {
errors.push({
prop,
message: rule.message
})
}
valid = false
})
)
Expand Down