blackteay/vant
1
0
Fork 0
mirror of https://gitee.com/vant-contrib/vant.git synced 2025-04-06 03:57:59 +08:00
Code Issues Projects Releases Wiki Activity

fix(TimePicker): incorrect value when set min-minute dynamically (#5767)

Browse Source
This commit is contained in:
chenjiahan 2020-03-08 08:56:42 +08:00
parent a73a304037
commit 6182b9b973
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/datetime-picker/TimePicker.js
View File

@ -55,7 +55,7 @@ export default createComponent({
if (val !== this.innerValue) {
this.innerValue = val;
this.updateColumnValue(val);
this.updateColumnValue();
}
},
},
@ -81,6 +81,7 @@ export default createComponent({
const minute = minuteColumn.values[minuteIndex] || minuteColumn.values[0];
this.innerValue = this.formatValue(`${hour}:${minute}`);
this.updateColumnValue();
},
onChange(picker) {

24
src/datetime-picker/test/time-picker.spec.js
View File

@ -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');
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');
});