blackteay/vant
1
0
Fork 0
mirror of https://gitee.com/vant-contrib/vant.git synced 2025-04-06 03:57:59 +08:00
Code Issues Projects Releases Wiki Activity

feat(Form): stop validation when a rule fails

Browse Source
This commit is contained in:
陈嘉涵 2020-02-12 11:37:10 +08:00
parent 48d2f64aba
commit dd11f17693
1 changed files with 44 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
src/field/index.js
View File

@ -151,41 +151,51 @@ export default createComponent({
resolve();
}
Promise.all(
this.rules.map(rule => {
if (rule.required && this.formValueEmpty) {
return Promise.resolve(rule.message);
let message;
this.rules
.reduce(
(promise, rule) =>
promise.then(() => {
if (message) {
return;
}
if (rule.required && this.formValueEmpty) {
({ message } = rule);
return;
}
if (rule.validator) {
const returnVal = rule.validator(this.formValue);
if (returnVal === false) {
({ message } = rule);
return;
}
if (isPromise(returnVal)) {
return returnVal.then(result => {
if (result === false) {
({ message } = rule);
}
});
}
}
}),
Promise.resolve()
)
.then(() => {
if (message) {
this.validateMessage = message;
resolve({
name: this.name,
message,
});
} else {
resolve();
}
if (rule.validator) {
const returnVal = rule.validator(this.formValue);
if (returnVal === false) {
return Promise.resolve(rule.message);
}
if (isPromise(returnVal)) {
return returnVal.then(
result => result === false && rule.message
);
}
}
return Promise.resolve();
})
).then(messages => {
messages = messages.filter(item => item);
if (messages.length) {
this.validateMessage = messages[0];
resolve({
name: this.name,
messages,
});
} else {
resolve();
}
});
});
});
},