浏览代码

DatePicker: fix date not disabled when type=datetime and input by text

xingoxu 8 年之前
父节点
当前提交
46650289b7
共有 1 个文件被更改,包括 10 次插入6 次删除
  1. 10 6
      packages/date-picker/src/panel/date.vue

+ 10 - 6
packages/date-picker/src/panel/date.vue

@@ -407,13 +407,17 @@
 
         set(val) {
           const date = parseDate(val, 'yyyy-MM-dd');
-          if (date) {
-            date.setHours(this.date.getHours());
-            date.setMinutes(this.date.getMinutes());
-            date.setSeconds(this.date.getSeconds());
-            this.date = date;
-            this.resetView();
+          if (!date) {
+            return;
+          }
+          if (typeof this.disabledDate === 'function' && this.disabledDate(date)) {
+            return;
           }
+          date.setHours(this.date.getHours());
+          date.setMinutes(this.date.getMinutes());
+          date.setSeconds(this.date.getSeconds());
+          this.date = date;
+          this.resetView();
         }
       },