diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1cb072626..9d80aedab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 *2016-XX-XX*
 
 - 修复 Tabs 切换后 Tab-panel 被销毁的问题
+- 修复 TimePicker 错误的隐藏面板
 - 修复 Table Cell 的样式, #204
 
 ### 1.0.0-rc.5
diff --git a/packages/date-picker/src/panel/time.vue b/packages/date-picker/src/panel/time.vue
index c9413cced..7448ea643 100644
--- a/packages/date-picker/src/panel/time.vue
+++ b/packages/date-picker/src/panel/time.vue
@@ -28,7 +28,7 @@
   </transition>
 </template>
 
-<script type="text/ecmascript-6">
+<script type="text/babel">
   import { limitRange } from '../util';
   import Vue from 'vue';
 
diff --git a/packages/date-picker/src/picker.vue b/packages/date-picker/src/picker.vue
index 4af237061..083dc9fee 100644
--- a/packages/date-picker/src/picker.vue
+++ b/packages/date-picker/src/picker.vue
@@ -211,7 +211,7 @@ export default {
 
   watch: {
     pickerVisible(val) {
-      val === true ? this.showPicker() : this.hidePicker();
+      val ? this.showPicker() : this.hidePicker();
     },
     value(val) {
       this.dispatch('form-item', 'el.form.change');
@@ -289,8 +289,8 @@ export default {
     handleFocus() {
       const type = this.type;
 
-      if (HAVE_TRIGGER_TYPES.indexOf(type) !== -1) {
-        this.pickerVisible = !this.pickerVisible;
+      if (HAVE_TRIGGER_TYPES.indexOf(type) !== -1 && !this.pickerVisible) {
+        this.pickerVisible = true;
       }
       this.$emit('focus', this);
     },