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): rule message can be empty (#6536)

Browse Source
This commit is contained in:
neverland 2020-06-14 20:49:53 +08:00 committed by GitHub
parent 42768fe577
commit 4b786cdba3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/field/index.js
View File

@ -74,6 +74,7 @@ export default createComponent({
data() {
return {
focused: false,
validateFailed: false,
validateMessage: '',
};
},
@ -117,7 +118,7 @@ export default createComponent({
if (this.error !== null) {
return this.error;
}
if (this.vanForm && this.vanForm.showError && this.validateMessage) {
if (this.vanForm && this.vanForm.showError && this.validateFailed) {
return true;
}
},
@ -208,7 +209,7 @@ export default createComponent({
return rules.reduce(
(promise, rule) =>
promise.then(() => {
if (this.validateMessage) {
if (this.validateFailed) {
return;
}
@ -219,6 +220,7 @@ export default createComponent({
}
if (!this.runSyncRule(value, rule)) {
this.validateFailed = true;
this.validateMessage = this.getRuleMessage(value, rule);
return;
}
@ -226,6 +228,7 @@ export default createComponent({
if (rule.validator) {
return this.runValidator(value, rule).then((result) => {
if (result === false) {
this.validateFailed = true;
this.validateMessage = this.getRuleMessage(value, rule);
}
});
@ -242,7 +245,7 @@ export default createComponent({
}
this.runRules(rules).then(() => {
if (this.validateMessage) {
if (this.validateFailed) {
resolve({
name: this.name,
message: this.validateMessage,
@ -271,6 +274,7 @@ export default createComponent({
resetValidation() {
if (this.validateMessage) {
this.validateFailed = false;
this.validateMessage = '';
}
},

27
src/form/test/events.spec.js
View File

@ -38,3 +38,30 @@ test('failed event', async () => {
values: { A: '', B: '' },
});
});
test('failed event when rule message is empty', async () => {
const onFailed = jest.fn();
const wrapper = mountForm({
template: `
<van-form ref="form" @failed="onFailed">
<van-field name="A" :rules="rulesA" value="" />
<van-button native-type="submit" />
</van-form>
`,
data() {
return {
rulesA: [{ required: true }],
};
},
methods: {
onFailed,
},
});
await submitForm(wrapper);
expect(onFailed).toHaveBeenCalledWith({
errors: [{ name: 'A' }],
values: { A: '' },
});
});