github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

date-picker: fix form change validation (#12328)

pull/12339/merge
Jiewei Qian 2018-08-13 14:26:36 +10:00 committed by hetech
parent 9303122f7f
commit 9f80cf91da
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/date-picker/src/picker.vue
View File

@ -428,6 +428,11 @@ export default {
if (this.picker) { if (this.picker) {
this.picker.defaultValue = val; this.picker.defaultValue = val;
} }
},
value(val, oldVal) {
if (!valueEquals(val, oldVal)) {
this.dispatch('ElFormItem', 'el.form.change', val);
}
} }
}, },
@ -894,7 +899,6 @@ export default {
// determine user real change only // determine user real change only
if (!valueEquals(val, this.valueOnOpen)) { if (!valueEquals(val, this.valueOnOpen)) {
this.$emit('change', val); this.$emit('change', val);
this.dispatch('ElFormItem', 'el.form.change', val);
this.valueOnOpen = val; this.valueOnOpen = val;
} }
}, },

8
test/unit/specs/form.spec.js
View File

@ -483,11 +483,11 @@ describe('Form', () => {
expect(valid).to.not.true; expect(valid).to.not.true;
setTimeout(_ => { setTimeout(_ => {
expect(field.validateMessage).to.equal('请选择日期'); expect(field.validateMessage).to.equal('请选择日期');
// programatic modification does not trigger change // programatic modification triggers change validation
vm.value = new Date(); vm.form.date = new Date();
setTimeout(_ => { setTimeout(_ => {
expect(field.validateMessage).to.equal('请选择日期'); expect(field.validateMessage).to.equal('');
vm.value = ''; vm.form.date = '';
// user modification triggers change // user modification triggers change
const input = vm.$refs.picker.$el.querySelector('input'); const input = vm.$refs.picker.$el.querySelector('input');
input.blur(); input.blur();