From a149828889e3579da0c7f46ed8a2223a0448a8c5 Mon Sep 17 00:00:00 2001 From: Jiewei Qian Date: Thu, 21 Mar 2019 20:18:27 +1100 Subject: [PATCH] date-picker: fix default-value DST (#14562) --- packages/date-picker/src/panel/date-range.vue | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/packages/date-picker/src/panel/date-range.vue b/packages/date-picker/src/panel/date-range.vue index ff9b3130b..a3c6b4c4e 100644 --- a/packages/date-picker/src/panel/date-range.vue +++ b/packages/date-picker/src/panel/date-range.vue @@ -197,6 +197,7 @@ nextYear, prevMonth, nextMonth, + nextDate, extractDateFormat, extractTimeFormat } from '../util'; @@ -207,17 +208,13 @@ import ElInput from 'element-ui/packages/input'; import ElButton from 'element-ui/packages/button'; - const advanceDate = (date, amount) => { - return new Date(new Date(date).getTime() + amount); - }; - const calcDefaultValue = (defaultValue) => { if (Array.isArray(defaultValue)) { return [new Date(defaultValue[0]), new Date(defaultValue[1])]; } else if (defaultValue) { - return [new Date(defaultValue), advanceDate(defaultValue, 24 * 60 * 60 * 1000)]; + return [new Date(defaultValue), nextDate(new Date(defaultValue), 1)]; } else { - return [new Date(), advanceDate(Date.now(), 24 * 60 * 60 * 1000)]; + return [new Date(), nextDate(new Date(), 1)]; } };