From 8ac1ce07372316b0046536f308c4f76baebd0cd4 Mon Sep 17 00:00:00 2001
From: "qingwei.li" <cinwell.li@gmail.com>
Date: Tue, 8 Nov 2016 16:30:25 +0800
Subject: [PATCH] TimePicker: fix maxtime over the mintime will cover mintime,
 fixed 894

---
 CHANGELOG.md                                  | 6 ++++++
 packages/date-picker/src/panel/time-range.vue | 1 +
 2 files changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9a66d4254..a3b70b97c 100644
--- a/CHANGELOG.md
+++ b/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*
diff --git a/packages/date-picker/src/panel/time-range.vue b/packages/date-picker/src/panel/time-range.vue
index c61b63b35..0e2101a90 100644
--- a/packages/date-picker/src/panel/time-range.vue
+++ b/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);