diff --git a/packages/date-picker/src/panel/date-range.vue b/packages/date-picker/src/panel/date-range.vue index 05487771e..f1779b673 100644 --- a/packages/date-picker/src/panel/date-range.vue +++ b/packages/date-picker/src/panel/date-range.vue @@ -293,7 +293,7 @@ handleClear() { this.minDate = null; this.maxDate = null; - this.handleConfirm(); + this.handleConfirm(false); }, handleDateInput(event, type) { @@ -376,10 +376,8 @@ this.maxDate = val.maxDate; this.minDate = val.minDate; - if (!close) return; - if (!this.showTime) { - this.$emit('pick', [this.minDate, this.maxDate]); - } + if (!close || this.showTime) return; + this.handleConfirm(); }, changeToToday() { @@ -456,7 +454,7 @@ this.resetDate(); }, - handleConfirm(visible) { + handleConfirm(visible = false) { this.$emit('pick', [this.minDate, this.maxDate], visible); }, diff --git a/packages/date-picker/src/panel/date.vue b/packages/date-picker/src/panel/date.vue index 0eaa0a4a3..bca527547 100644 --- a/packages/date-picker/src/panel/date.vue +++ b/packages/date-picker/src/panel/date.vue @@ -189,7 +189,7 @@ methods: { handleClear() { this.date = new Date(); - this.$emit('pick', ''); + this.$emit('pick'); }, resetDate() { diff --git a/packages/date-picker/src/panel/time-select.vue b/packages/date-picker/src/panel/time-select.vue index d9cdc39a6..13c5f1e26 100644 --- a/packages/date-picker/src/panel/time-select.vue +++ b/packages/date-picker/src/panel/time-select.vue @@ -85,7 +85,7 @@ }, handleClear() { - this.$emit('pick', ''); + this.$emit('pick'); } }, diff --git a/packages/date-picker/src/panel/time.vue b/packages/date-picker/src/panel/time.vue index 000bb5733..059145aae 100644 --- a/packages/date-picker/src/panel/time.vue +++ b/packages/date-picker/src/panel/time.vue @@ -104,7 +104,7 @@ methods: { handleClear() { - this.$emit('pick', ''); + this.$emit('pick'); }, handleCancel() { diff --git a/packages/date-picker/src/picker.vue b/packages/date-picker/src/picker.vue index 2ea6f536f..87dca9d9e 100644 --- a/packages/date-picker/src/picker.vue +++ b/packages/date-picker/src/picker.vue @@ -26,7 +26,7 @@