mirror of https://github.com/ElemeFE/element
TimePicker: set default value
parent
f600053962
commit
367018bb9e
|
@ -91,8 +91,8 @@
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
value1: '',
|
value1: '',
|
||||||
value2: '',
|
value2: new Date(2016, 9, 10, 18, 40),
|
||||||
value3: '',
|
value3: [new Date(2016, 9, 10, 8, 40), new Date(2016, 9, 10, 9, 40)],
|
||||||
startTime: '',
|
startTime: '',
|
||||||
endTime: ''
|
endTime: ''
|
||||||
};
|
};
|
||||||
|
|
|
@ -72,10 +72,12 @@
|
||||||
},
|
},
|
||||||
|
|
||||||
data() {
|
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();
|
const date = new Date();
|
||||||
date.setHours(date.getHours() + 1);
|
date.setHours(date.getHours() + 1);
|
||||||
const maxTime = date;
|
const maxTime = defaultValue[1] || date;
|
||||||
|
|
||||||
return {
|
return {
|
||||||
minTime: minTime,
|
minTime: minTime,
|
||||||
|
@ -164,7 +166,7 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
ready() {
|
mounted() {
|
||||||
this.$nextTick(() => this.handleConfirm(true, true));
|
this.$nextTick(() => this.handleConfirm(true, true));
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
@ -77,7 +77,7 @@
|
||||||
minutes: 0,
|
minutes: 0,
|
||||||
seconds: 0,
|
seconds: 0,
|
||||||
selectableRange: [],
|
selectableRange: [],
|
||||||
currentDate: this.date,
|
currentDate: this.$options.defaultValue || this.date,
|
||||||
currentVisible: this.visible
|
currentVisible: this.visible
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|
|
@ -399,6 +399,7 @@ export default {
|
||||||
|
|
||||||
showPicker() {
|
showPicker() {
|
||||||
if (!this.picker) {
|
if (!this.picker) {
|
||||||
|
this.panel.defaultValue = this.value;
|
||||||
this.picker = new Vue(merge({
|
this.picker = new Vue(merge({
|
||||||
el: document.createElement('div')
|
el: document.createElement('div')
|
||||||
}, this.panel));
|
}, this.panel));
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
ready() {
|
mounted() {
|
||||||
if (this.disabled) {
|
if (this.disabled) {
|
||||||
this.broadcast('option', 'disableOptions');
|
this.broadcast('option', 'disableOptions');
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue