mirror of https://github.com/ElemeFE/element
TimePicker: fix cancel button
parent
e90823898b
commit
a750f5d6b1
|
@ -54,6 +54,11 @@
|
||||||
watch: {
|
watch: {
|
||||||
visible(val) {
|
visible(val) {
|
||||||
this.currentVisible = val;
|
this.currentVisible = val;
|
||||||
|
if (val) {
|
||||||
|
this.oldHours = this.hours;
|
||||||
|
this.oldMinutes = this.minutes;
|
||||||
|
this.oldSeconds = this.seconds;
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
pickerWidth(val) {
|
pickerWidth(val) {
|
||||||
|
@ -89,6 +94,9 @@
|
||||||
hours: 0,
|
hours: 0,
|
||||||
minutes: 0,
|
minutes: 0,
|
||||||
seconds: 0,
|
seconds: 0,
|
||||||
|
oldHours: 0,
|
||||||
|
oldMinutes: 0,
|
||||||
|
oldSeconds: 0,
|
||||||
selectableRange: [],
|
selectableRange: [],
|
||||||
currentDate: this.$options.defaultValue || this.date || new Date(),
|
currentDate: this.$options.defaultValue || this.date || new Date(),
|
||||||
currentVisible: this.visible || false,
|
currentVisible: this.visible || false,
|
||||||
|
@ -108,7 +116,14 @@
|
||||||
},
|
},
|
||||||
|
|
||||||
handleCancel() {
|
handleCancel() {
|
||||||
this.$emit('pick');
|
this.currentDate.setHours(this.oldHours);
|
||||||
|
this.currentDate.setMinutes(this.oldMinutes);
|
||||||
|
this.currentDate.setSeconds(this.oldSeconds);
|
||||||
|
this.hours = this.currentDate.getHours();
|
||||||
|
this.minutes = this.currentDate.getMinutes();
|
||||||
|
this.seconds = this.currentDate.getSeconds();
|
||||||
|
const date = new Date(limitRange(this.currentDate, this.selectableRange, 'HH:mm:ss'));
|
||||||
|
this.$emit('pick', date);
|
||||||
},
|
},
|
||||||
|
|
||||||
handleChange(date) {
|
handleChange(date) {
|
||||||
|
|
Loading…
Reference in New Issue