From d31b08019914da5209e802e4b6c6aa941385d32a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= Date: Fri, 23 Dec 2016 12:24:48 +0800 Subject: [PATCH] fixed DatePicker bug edit date when Do Not use options props --- src/components/date-picker/picker.vue | 4 ++-- test/routers/date.vue | 33 ++++++++------------------- 2 files changed, 11 insertions(+), 26 deletions(-) diff --git a/src/components/date-picker/picker.vue b/src/components/date-picker/picker.vue index e3cc84c7..badc67ba 100644 --- a/src/components/date-picker/picker.vue +++ b/src/components/date-picker/picker.vue @@ -295,8 +295,8 @@ const parsedDate = parseDate(value, format); if (parsedDate instanceof Date) { - const options = this.options; - if (options.disabledDate && typeof options.disabledDate === 'function' && options.disabledDate(new Date(parsedDate))) { + const options = this.options || false; + if (options && options.disabledDate && typeof options.disabledDate === 'function' && options.disabledDate(new Date(parsedDate))) { correctValue = oldValue; } else { correctValue = formatDate(parsedDate, format); diff --git a/test/routers/date.vue b/test/routers/date.vue index d8e89d3b..0713eb9b 100644 --- a/test/routers/date.vue +++ b/test/routers/date.vue @@ -1,30 +1,15 @@