Merge pull request #53 from QingWei-Li/fix/time-picker

TimePicker: set default value

examples/docs/time-picker.md

@@ -91,8 +91,8 @@
     data() {
       return {
         value1: '',
-        value2: '',
-        value3: '',
+        value2: new Date(2016, 9, 10, 18, 40),
+        value3: [new Date(2016, 9, 10, 8, 40), new Date(2016, 9, 10, 9, 40)],
         startTime: '',
         endTime: ''
       };

packages/date-picker/src/panel/time-range.vue

@@ -72,10 +72,12 @@
     },
 
     data() {
-      const minTime = new Date();
+      let defaultValue = this.$options.defaultValue;
+      defaultValue = Array.isArray(defaultValue) ? defaultValue : [defaultValue];
+      const minTime = defaultValue[0] || new Date();
       const date = new Date();
       date.setHours(date.getHours() + 1);
-      const maxTime = date;
+      const maxTime = defaultValue[1] || date;
 
       return {
         minTime: minTime,
@@ -164,7 +166,7 @@
       }
     },
 
-    ready() {
+    mounted() {
       this.$nextTick(() => this.handleConfirm(true, true));
     }
   };

packages/date-picker/src/panel/time.vue

@@ -77,7 +77,7 @@
         minutes: 0,
         seconds: 0,
         selectableRange: [],
-        currentDate: this.date,
+        currentDate: this.$options.defaultValue || this.date,
         currentVisible: this.visible
       };
     },

packages/date-picker/src/picker.vue

@@ -399,6 +399,7 @@ export default {
 
     showPicker() {
       if (!this.picker) {
+        this.panel.defaultValue = this.value;
         this.picker = new Vue(merge({
           el: document.createElement('div')
         }, this.panel));

packages/select/src/option-group.vue

@@ -25,7 +25,7 @@
       }
     },
 
-    ready() {
+    mounted() {
       if (this.disabled) {
         this.broadcast('option', 'disableOptions');
       }