diff --git a/.gitattributes b/.gitattributes
index 61780eb5c..1e73b4efc 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1 @@
-*.js linguist-language=Vue
+test/**/*.js linguist-language=Vue
diff --git a/packages/date-picker/src/basic/month-table.vue b/packages/date-picker/src/basic/month-table.vue
index b56a0c497..fc543df89 100644
--- a/packages/date-picker/src/basic/month-table.vue
+++ b/packages/date-picker/src/basic/month-table.vue
@@ -47,7 +47,7 @@
   </table>
 </template>
 
-<script type="text/ecmascript-6">
+<script type="text/babel">
   import { $t } from '../util';
 
   export default {
diff --git a/packages/date-picker/src/basic/time-spinner.vue b/packages/date-picker/src/basic/time-spinner.vue
index ad75ef4b2..b111d7ae5 100644
--- a/packages/date-picker/src/basic/time-spinner.vue
+++ b/packages/date-picker/src/basic/time-spinner.vue
@@ -78,7 +78,6 @@
           this.hoursPrivate = oldVal;
         }
         this.$refs.hour.scrollTop = Math.max(0, (this.hoursPrivate - 2.5) * 32 + 80);
-
         this.$emit('change', { hours: newVal });
       },
 
diff --git a/packages/date-picker/src/panel/date-range.vue b/packages/date-picker/src/panel/date-range.vue
index 32845dadb..3889954e4 100644
--- a/packages/date-picker/src/panel/date-range.vue
+++ b/packages/date-picker/src/panel/date-range.vue
@@ -400,6 +400,9 @@
       },
 
       handleRangePick(val, close = true) {
+        if (this.maxDate === val.maxDate && this.minDate === val.minDate) {
+          return;
+        }
         this.maxDate = val.maxDate;
         this.minDate = val.minDate;
 
diff --git a/packages/date-picker/src/panel/date.vue b/packages/date-picker/src/panel/date.vue
index c7d2741aa..8a216269f 100644
--- a/packages/date-picker/src/panel/date.vue
+++ b/packages/date-picker/src/panel/date.vue
@@ -260,8 +260,8 @@
         } else {
           this.date.setMonth(month);
           this.resetDate();
-          this.value = new Date(this.date.getFullYear(), month, 1);
-          this.$emit('pick', this.value);
+          const value = new Date(this.date.getFullYear(), month, 1);
+          this.$emit('pick', value);
         }
       },
 
diff --git a/packages/date-picker/src/panel/time-range.vue b/packages/date-picker/src/panel/time-range.vue
index 9a6593012..94d21fcee 100644
--- a/packages/date-picker/src/panel/time-range.vue
+++ b/packages/date-picker/src/panel/time-range.vue
@@ -87,6 +87,9 @@
     watch: {
       value(val) {
         const time = clacTime(val);
+        if (time.minTime === this.minTime && time.maxTime === this.maxTime) {
+          return;
+        }
 
         this.handleMinChange({
           hours: time.minTime.getHours(),
@@ -183,6 +186,7 @@
         this.minTime = limitRange(this.minTime, minSelectableRange);
         this.maxTime = limitRange(this.maxTime, maxSelectableRange);
 
+        if (first) return;
         this.$emit('pick', [this.minTime, this.maxTime], visible, first);
       },
 
diff --git a/packages/date-picker/src/panel/time-select.vue b/packages/date-picker/src/panel/time-select.vue
index c1487f8be..56654fb02 100644
--- a/packages/date-picker/src/panel/time-select.vue
+++ b/packages/date-picker/src/panel/time-select.vue
@@ -72,14 +72,6 @@
         if (this.value && val && compareTime(this.value, val) === -1) {
           this.$emit('pick');
         }
-      },
-
-      value(val, old) {
-        if (val && this.items.some(i => i.value === val && !i.disabled)) {
-          this.$emit('pick', val, true);
-        } else {
-          this.$emit('pick', old, true);
-        }
       }
     },
 
diff --git a/packages/date-picker/src/panel/time.vue b/packages/date-picker/src/panel/time.vue
index 42aa78ad8..dc089f9a0 100644
--- a/packages/date-picker/src/panel/time.vue
+++ b/packages/date-picker/src/panel/time.vue
@@ -129,6 +129,7 @@
       },
 
       handleConfirm(visible = false, first) {
+        if (first) return;
         const date = new Date(limitRange(this.currentDate, this.selectableRange));
         this.$emit('pick', date, visible, first);
       },
diff --git a/packages/date-picker/src/picker.vue b/packages/date-picker/src/picker.vue
index d09131d48..e226c6db0 100644
--- a/packages/date-picker/src/picker.vue
+++ b/packages/date-picker/src/picker.vue
@@ -46,7 +46,6 @@ const newPopper = {
   beforeDestroy: Popper.beforeDestroy
 };
 
-// const FUNCTION_KEYS = [13, 16, 17, 18, 19, 20, 27, 33, 34, 35, 36, 37, 38, 39, 40];
 const RANGE_SEPARATOR = ' - ';
 const DEFAULT_FORMATS = {
   date: 'yyyy-MM-dd',