From c304655dc99ee253c56cbb50550b256a81858825 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E9=A3=8E?= <rufeng.zhou@qq.com>
Date: Fri, 17 Jul 2020 11:51:50 +0800
Subject: [PATCH] =?UTF-8?q?fix(calendar):=20confirmDisabledText=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E9=BB=98=E8=AE=A4=E5=80=BC=E5=92=8C=E6=96=87=E6=A1=A3?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=20(#3394)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(calendar): confirmDisabledText增加默认值和文档同步

* fix(datetime-picker): 默认值为string 解析时间错误
---
 dist/calendar/index.js        | 5 ++++-
 dist/datetime-picker/index.js | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/dist/calendar/index.js b/dist/calendar/index.js
index e953c6f4..280056fc 100644
--- a/dist/calendar/index.js
+++ b/dist/calendar/index.js
@@ -41,7 +41,10 @@ VantComponent({
       },
     },
     allowSameDay: Boolean,
-    confirmDisabledText: String,
+    confirmDisabledText: {
+      type: String,
+      value: '确定',
+    },
     type: {
       type: String,
       value: 'single',
diff --git a/dist/datetime-picker/index.js b/dist/datetime-picker/index.js
index ef9394d9..aa220e9c 100644
--- a/dist/datetime-picker/index.js
+++ b/dist/datetime-picker/index.js
@@ -203,8 +203,8 @@ VantComponent({
         return `${hour}:${minute}`;
       }
       // date type
-      value = Math.max(value, data.minDate);
-      value = Math.min(value, data.maxDate);
+      value = Math.max(new Date(value).getTime(), data.minDate);
+      value = Math.min(new Date(value).getTime(), data.maxDate);
       return value;
     },
     getBoundary(type, innerValue) {