浏览代码

DatePicker: support default-value for date-range

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

+ 10 - 1
packages/date-picker/src/panel/date-range.vue

@@ -153,6 +153,14 @@
   import DateTable from '../basic/date-table';
   import ElInput from 'element-ui/packages/input';
 
+  const calcDefaultValue = defaultValue => {
+    if (Array.isArray(defaultValue)) {
+      return new Date(defaultValue[0]);
+    } else {
+      return new Date(defaultValue);
+    }
+  };
+
   export default {
     mixins: [Locale],
 
@@ -221,7 +229,7 @@
         popperClass: '',
         minPickerWidth: 0,
         maxPickerWidth: 0,
-        date: new Date(),
+        date: this.$options.defaultValue ? calcDefaultValue(this.$options.defaultValue) : new Date(),
         minDate: '',
         maxDate: '',
         rangeState: {
@@ -297,6 +305,7 @@
       handleClear() {
         this.minDate = null;
         this.maxDate = null;
+        this.date = this.$options.defaultValue ? calcDefaultValue(this.$options.defaultValue) : new Date();
         this.handleConfirm(false);
       },