From 75c9806430d21f5779431477fb5d830e8dc45abc Mon Sep 17 00:00:00 2001 From: Sergio Crisostomo Date: Wed, 23 May 2018 08:21:27 +0200 Subject: [PATCH 1/2] Don't use undefined --- src/components/date-picker/picker.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/date-picker/picker.vue b/src/components/date-picker/picker.vue index 42fa6296..c8403155 100644 --- a/src/components/date-picker/picker.vue +++ b/src/components/date-picker/picker.vue @@ -651,7 +651,7 @@ this.internalValue = Array.isArray(dates) ? dates : [dates]; } - this.focusedDate = this.internalValue[0]; + if (this.internalValue[0]) this.focusedDate = this.internalValue[0]; this.focusedTime = { ...this.focusedTime, time: this.internalValue.map(extractTime) From 88156b0b835110914b0af8669ab908b11ec86d9e Mon Sep 17 00:00:00 2001 From: Sergio Crisostomo Date: Wed, 23 May 2018 08:22:30 +0200 Subject: [PATCH 2/2] Handle data more detailed --- src/components/date-picker/util.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/components/date-picker/util.js b/src/components/date-picker/util.js index 0531b4ad..db9858b5 100644 --- a/src/components/date-picker/util.js +++ b/src/components/date-picker/util.js @@ -226,7 +226,15 @@ export const TYPE_VALUE_RESOLVER_MAP = { formatter: (value, format) => { return value.filter(Boolean).map(date => formatDate(date, format)).join(','); }, - parser: (text, format) => text.split(',').map(string => parseDate(string.trim(), format)) + parser: (value, format) => { + const values = typeof value === 'string' ? value.split(',') : value; + return values.map(value => { + if (value instanceof Date) return value; + if (typeof value === 'string') value = value.trim(); + else if (typeof value !== 'number' && !value) value = ''; + return parseDate(value, format); + }); + } }, number: { formatter(value) {