Przeglądaj źródła

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

TimePicker: fix maxtime over the mintime will cover mintime, fixed 894
杨奕 8 lat temu
rodzic
commit
8484f127d3
2 zmienionych plików z 7 dodań i 0 usunięć
  1. 6 0
      CHANGELOG.md
  2. 1 0
      packages/date-picker/src/panel/time-range.vue

+ 6 - 0
CHANGELOG.md

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

+ 1 - 0
packages/date-picker/src/panel/time-range.vue

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