diff --git a/packages/date-picker/src/picker.vue b/packages/date-picker/src/picker.vue index 95f70a7d6..6977b3a5b 100644 --- a/packages/date-picker/src/picker.vue +++ b/packages/date-picker/src/picker.vue @@ -502,6 +502,8 @@ export default { gpuAcceleration: false }; this.placement = PLACEMENT_MAP[this.align] || PLACEMENT_MAP.left; + + this.$on('fieldReset', this.handleFieldReset); }, methods: { @@ -634,6 +636,10 @@ export default { this.pickerVisible = false; }, + handleFieldReset(initialValue) { + this.userInput = initialValue; + }, + handleFocus() { const type = this.type; diff --git a/packages/date-picker/src/picker/time-select.js b/packages/date-picker/src/picker/time-select.js index fca8d5648..7fba4d041 100644 --- a/packages/date-picker/src/picker/time-select.js +++ b/packages/date-picker/src/picker/time-select.js @@ -6,8 +6,16 @@ export default { name: 'ElTimeSelect', + componentName: 'ElTimeSelect', + + props: { + type: { + type: String, + default: 'time-select' + } + }, + beforeCreate() { - this.type = 'time-select'; this.panel = Panel; } }; diff --git a/packages/form/src/form-item.vue b/packages/form/src/form-item.vue index d73d7f25e..662f33916 100644 --- a/packages/form/src/form-item.vue +++ b/packages/form/src/form-item.vue @@ -227,6 +227,8 @@ 这里需要强行触发一次,刷新 validateDisabled 的值, 确保 Select 下一次值改变时能正确触发校验 */ this.broadcast('ElSelect', 'fieldReset'); + + this.broadcast('ElTimeSelect', 'fieldReset', this.initialValue); }, getRules() { let formRules = this.form.rules;