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

Merge pull request #911 from QingWei-Li/fix/timepicker-range 

TimePicker: fix maxtime over the mintime will cover mintime, fixed 894
pull/925/head
杨奕 2016-11-08 18:13:47 +08:00 committed by GitHub
parent 947b837ffa 8ac1ce0737
commit 8484f127d3
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -1,5 +1,11 @@
## 更新日志 ## 更新日志
### 1.0.0
*2016-11-9*
- 修复 TimePicker 选择范围时结束时间小于开始时间会重置开始时间, #894
- 修复结合 `vue-i18n` 使用时会提示不能覆盖 `$t` 方法的问题
### 1.0.0-rc.9 ### 1.0.0-rc.9
*2016-11-07* *2016-11-07*

1
packages/date-picker/src/panel/time-range.vue
View File

@ -132,6 +132,7 @@
}, },
handleChange() { handleChange() {
if (this.minTime > this.maxTime) return;
this.$refs.minSpinner.selectableRange = [[MIN_TIME, this.maxTime]]; this.$refs.minSpinner.selectableRange = [[MIN_TIME, this.maxTime]];
this.$refs.maxSpinner.selectableRange = [[this.minTime, MAX_TIME]]; this.$refs.maxSpinner.selectableRange = [[this.minTime, MAX_TIME]];
this.handleConfirm(true); this.handleConfirm(true);