Skip to content
Merged
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
15 changes: 7 additions & 8 deletions packages/vantui/src/form/core/formstore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -393,8 +393,13 @@ class FormStore {
break
}
} else if (typeof rule === 'function') {
// 检查函数是否返回Promise
const result = rule(value)
// 传统的回调函数形式
const validateCallback = (callbackMessage: string) => {
this.model[name].message = callbackMessage
status = !callbackMessage ? 'resolve' : 'reject'
}
// 检查函数是否返回Promise,传入callback兼容同步回调
const result = rule(value, validateCallback)
if (isPromise(result)) {
try {
// 规则函数返回Promise的情况
Expand All @@ -413,12 +418,6 @@ class FormStore {
break
}
} else {
// 传统的回调函数形式
const validateCallback = (callbackMessage: string) => {
this.model[name].message = callbackMessage
status = !callbackMessage ? 'resolve' : 'reject'
}

// 执行规则函数
rule(value, validateCallback)

Expand Down
Loading