drip-public/iview
6
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

correct behaviour when initialising date-picker with a empty string

Browse source
This commit is contained in:
Sergio Crisostomo 2017-10-17 15:13:42 +02:00
parent 109465d3c5
commit 5d1c24c7f4
2 changed files with 27 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/date-picker/picker.vue
View file

@ -517,7 +517,7 @@
val = val.join(RANGE_SEPARATOR);
val = parser(val, this.format || DEFAULT_FORMATS[type]);
} else if (typeof val === 'string' && type.indexOf('time') !== 0 ){
val = parser(val, this.format || DEFAULT_FORMATS[type]);
val = parser(val, this.format || DEFAULT_FORMATS[type]) || val;
}
this.internalValue = val;

37
test/unit/specs/date-picker.spec.js
View file

@ -103,19 +103,19 @@ describe('DatePicker.vue', () => {
vm.dateType = 'year';
promissedTick(picker)
.then(() => {
expect(picker.type).to.equal('year');
expect(picker.selectionMode).to.equal('year');
.then(() => {
expect(picker.type).to.equal('year');
expect(picker.selectionMode).to.equal('year');
vm.dateType = 'date';
return promissedTick(picker);
})
.then(() => {
expect(picker.type).to.equal('date');
expect(picker.selectionMode).to.equal('day');
vm.dateType = 'date';
return promissedTick(picker);
})
.then(() => {
expect(picker.type).to.equal('date');
expect(picker.selectionMode).to.equal('day');
done();
});
done();
});
});
});
@ -176,4 +176,19 @@ describe('DatePicker.vue', () => {
});
});
});
it('should accept a empty string as input v-model value', done => {
vm = createVue({
template: '<date-picker v-model="value" type="date"></date-picker>',
data(){
return {value: ''};
}
});
vm.$nextTick(() => {
expect(vm.value).to.equal('');
done();
});
});
});