github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

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

TimeSelect: fix maxTime range, fixed #2158
pull/2192/head
baiyaaaaa 2017-01-04 08:36:11 +08:00 committed by GitHub
parent b31ee664e2 9ee7afc1c5
commit 661dc09002
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/date-picker/src/panel/time-select.vue
View File

@ -124,7 +124,7 @@
result.push({
value: current,
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);
}

2
test/unit/specs/time-select.spec.js
View File

@ -160,7 +160,7 @@ describe('TimeSelect', () => {
setTimeout(_ => {
const elm = picker.picker.$el.querySelector('.disabled');
expect(elm.textContent).to.equal('15:00');
expect(elm.textContent).to.equal('14:30');
destroyVM(vm);
done();
}, 50);