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

Fix date manual input so it falls back to old value when parser don't parse the input

Browse source
This commit is contained in:
Sergio Crisostomo 2018-01-24 14:54:03 +01:00
parent 22ff9a62f2
commit 72f225e938
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -255,8 +255,9 @@
this.options.disabledDate; this.options.disabledDate;
const valueToTest = isArrayValue ? newDate : newDate[0]; const valueToTest = isArrayValue ? newDate : newDate[0];
const isDisabled = disabledDateFn && disabledDateFn(valueToTest); const isDisabled = disabledDateFn && disabledDateFn(valueToTest);
const isValidDate = newDate.reduce((valid, date) => valid && date instanceof Date, true);
if (newValue !== oldValue && !isDisabled) { if (newValue !== oldValue && !isDisabled && isValidDate) {
this.emitChange(); this.emitChange();
this.internalValue = newDate; this.internalValue = newDate;
} else { } else {
@ -324,7 +325,7 @@
} }
} }
} else if (typeof val === 'string' && type.indexOf('time') !== 0){ } else if (typeof val === 'string' && type.indexOf('time') !== 0){
val = parser(val, format) || val; val = parser(val, format) || null;
} }
return (isRange || this.multiple) ? (val || []) : [val]; return (isRange || this.multiple) ? (val || []) : [val];
@ -344,7 +345,6 @@
} }
}, },
onPick(dates, visible = false) { onPick(dates, visible = false) {
if (this.multiple){ if (this.multiple){
const allDates = [...this.internalValue, dates].filter(Boolean); const allDates = [...this.internalValue, dates].filter(Boolean);
const timeStamps = allDates.map(date => date.getTime()).filter((ts, i, arr) => arr.indexOf(ts) === i); // filter away duplicates const timeStamps = allDates.map(date => date.getTime()).filter((ts, i, arr) => arr.indexOf(ts) === i); // filter away duplicates