diff --git a/examples/docs/time-picker.md b/examples/docs/time-picker.md index b91063e9e..65776544d 100644 --- a/examples/docs/time-picker.md +++ b/examples/docs/time-picker.md @@ -7,7 +7,7 @@ ## Time Picker 时间选择器 - + 用于选择或输入日期 ### 固定时间点 @@ -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: '' }; diff --git a/packages/date-picker/src/panel/time-range.vue b/packages/date-picker/src/panel/time-range.vue index 66b1a6dce..c2e40e1eb 100644 --- a/packages/date-picker/src/panel/time-range.vue +++ b/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)); } }; diff --git a/packages/date-picker/src/panel/time.vue b/packages/date-picker/src/panel/time.vue index e47debcdc..566c206ad 100644 --- a/packages/date-picker/src/panel/time.vue +++ b/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 }; }, diff --git a/packages/date-picker/src/picker.vue b/packages/date-picker/src/picker.vue index 27085e9f0..c12b34010 100644 --- a/packages/date-picker/src/picker.vue +++ b/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)); diff --git a/packages/select/src/option-group.vue b/packages/select/src/option-group.vue index 4019d3281..ec54bd9bd 100644 --- a/packages/select/src/option-group.vue +++ b/packages/select/src/option-group.vue @@ -25,7 +25,7 @@ } }, - ready() { + mounted() { if (this.disabled) { this.broadcast('option', 'disableOptions'); }