From c0e60fcf57879889d7b4b17e2a9c2fbd1f7281a6 Mon Sep 17 00:00:00 2001 From: rex Date: Sun, 25 Nov 2018 09:26:29 +0800 Subject: [PATCH] =?UTF-8?q?[bug=20fix]=20DatetimePicker:=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E8=AE=BE=E7=BD=AE=E4=BA=86minDate=E6=97=B6=E5=88=9D?= =?UTF-8?q?=E5=A7=8Bvalue=E9=94=99=E8=AF=AF=20(#942)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/datetime-picker/index.ts | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/packages/datetime-picker/index.ts b/packages/datetime-picker/index.ts index 3e6a7668..3a5e9dc5 100644 --- a/packages/datetime-picker/index.ts +++ b/packages/datetime-picker/index.ts @@ -1,7 +1,8 @@ import { VantComponent } from '../common/component'; +import { isDef } from '../common/utils'; const currentYear = new Date().getFullYear(); -const isValidDate = date => !isNaN(new Date(date).getTime()); +const isValidDate = date => isDef(date) && !isNaN(new Date(date).getTime()); function range(num, min, max) { return Math.min(Math.max(num, min), max); @@ -169,12 +170,8 @@ VantComponent({ } // date type - const { maxYear, maxDate, maxMonth, maxHour, maxMinute } = this.getBoundary('max', value); - const { minYear, minDate, minMonth, minHour, minMinute } = this.getBoundary('min', value); - const minDay = new Date(minYear, minMonth - 1, minDate, minHour, minMinute); - const maxDay = new Date(maxYear, maxMonth - 1, maxDate, maxHour, maxMinute); - value = Math.max(value, minDay.getTime()); - value = Math.min(value, maxDay.getTime()); + value = Math.max(value, data.minDate); + value = Math.min(value, data.maxDate); return value; },