mirror of
https://gitee.com/vant-contrib/vant.git
synced 2025-04-06 03:57:59 +08:00
fix(TimePicker): incorrect value when set min-minute dynamically (#5767)
This commit is contained in:
parent
a73a304037
commit
6182b9b973
@ -55,7 +55,7 @@ export default createComponent({
|
|||||||
|
|
||||||
if (val !== this.innerValue) {
|
if (val !== this.innerValue) {
|
||||||
this.innerValue = val;
|
this.innerValue = val;
|
||||||
this.updateColumnValue(val);
|
this.updateColumnValue();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@ -81,6 +81,7 @@ export default createComponent({
|
|||||||
const minute = minuteColumn.values[minuteIndex] || minuteColumn.values[0];
|
const minute = minuteColumn.values[minuteIndex] || minuteColumn.values[0];
|
||||||
|
|
||||||
this.innerValue = this.formatValue(`${hour}:${minute}`);
|
this.innerValue = this.formatValue(`${hour}:${minute}`);
|
||||||
|
this.updateColumnValue();
|
||||||
},
|
},
|
||||||
|
|
||||||
onChange(picker) {
|
onChange(picker) {
|
||||||
|
@ -126,3 +126,27 @@ test('set max-hour & max-minute smaller than current then emit correct value', a
|
|||||||
wrapper.find('.van-picker__confirm').trigger('click');
|
wrapper.find('.van-picker__confirm').trigger('click');
|
||||||
expect(wrapper.emitted('confirm')[0][0]).toEqual('00:00');
|
expect(wrapper.emitted('confirm')[0][0]).toEqual('00:00');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test('set min-minute dynamically', async () => {
|
||||||
|
const wrapper = mount({
|
||||||
|
template: `
|
||||||
|
<van-datetime-picker
|
||||||
|
v-model="currentTime"
|
||||||
|
type="time"
|
||||||
|
:min-minute="currentTime.split(':')[0] > 12 ? 0 : 30"
|
||||||
|
min-hour="12"
|
||||||
|
max-hour="13"
|
||||||
|
@confirm="$emit('confirm', $event)"
|
||||||
|
/>
|
||||||
|
`,
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
currentTime: '12:30',
|
||||||
|
};
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
triggerDrag(wrapper.find('.van-picker-column'), 0, -100);
|
||||||
|
wrapper.find('.van-picker__confirm').trigger('click');
|
||||||
|
expect(wrapper.emitted('confirm')[0][0]).toEqual('13:00');
|
||||||
|
});
|
||||||
|
Loading…
x
Reference in New Issue
Block a user