diff --git a/packages/date-picker/src/panel/date-range.vue b/packages/date-picker/src/panel/date-range.vue index c417a33f6..a3753847e 100644 --- a/packages/date-picker/src/panel/date-range.vue +++ b/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); },