Commit 661dc090 authored by baiyaaaaa's avatar baiyaaaaa Committed by GitHub

Merge pull request #2177 from QingWei-Li/fix/date-select

TimeSelect: fix maxTime range, fixed #2158
parents b31ee664 9ee7afc1
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
result.push({ result.push({
value: current, value: current,
disabled: compareTime(current, this.minTime || '-1:-1') <= 0 || disabled: compareTime(current, this.minTime || '-1:-1') <= 0 ||
compareTime(current, this.maxTime || '100:100') > 0 compareTime(current, this.maxTime || '100:100') >= 0
}); });
current = nextTime(current, step); current = nextTime(current, step);
} }
......
...@@ -160,7 +160,7 @@ describe('TimeSelect', () => { ...@@ -160,7 +160,7 @@ describe('TimeSelect', () => {
setTimeout(_ => { setTimeout(_ => {
const elm = picker.picker.$el.querySelector('.disabled'); const elm = picker.picker.$el.querySelector('.disabled');
expect(elm.textContent).to.equal('15:00'); expect(elm.textContent).to.equal('14:30');
destroyVM(vm); destroyVM(vm);
done(); done();
}, 50); }, 50);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment