From 1471f6d5b5e6df4104376b15261cfc541f7a5892 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Thu, 30 Aug 2018 17:34:01 +0800
Subject: [PATCH] [bugfix] DatetimePicker: incorrect value when use minMinute
 (#1724)

---
 packages/datetime-picker/index.vue |  9 +++++----
 packages/picker/PickerColumn.vue   | 24 ++++++++++++++----------
 packages/utils/index.js            |  5 +++++
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/packages/datetime-picker/index.vue b/packages/datetime-picker/index.vue
index a51d633fb..8d6036f07 100644
--- a/packages/datetime-picker/index.vue
+++ b/packages/datetime-picker/index.vue
@@ -17,6 +17,7 @@
 <script>
 import Picker from '../picker';
 import create from '../utils/create';
+import { range } from '../utils';
 
 const currentYear = new Date().getFullYear();
 const isValidDate = date => Object.prototype.toString.call(date) === '[object Date]' && !isNaN(date.getTime());
@@ -178,11 +179,11 @@ export default create({
 
       // time type
       if (!isDateType) {
-        const [hour, minute] = value.split(':');
-        let correctedHour = Math.max(hour, this.minHour);
-        correctedHour = this.pad(Math.min(correctedHour, this.maxHour));
+        let [hour, minute] = value.split(':');
+        hour = this.pad(range(hour, this.minHour, this.maxHour));
+        minute = this.pad(range(minute, this.minMinute, this.maxMinute));
 
-        return `${correctedHour}:${minute}`;
+        return `${hour}:${minute}`;
       }
 
       // date type
diff --git a/packages/picker/PickerColumn.vue b/packages/picker/PickerColumn.vue
index 7c9ca2784..18818caea 100644
--- a/packages/picker/PickerColumn.vue
+++ b/packages/picker/PickerColumn.vue
@@ -27,10 +27,9 @@
 <script>
 import create from '../utils/create';
 import deepClone from '../utils/deep-clone';
-import { isObj } from '../utils';
+import { isObj, range } from '../utils';
 
 const DEFAULT_DURATION = 200;
-const range = (num, arr) => Math.min(Math.max(num, arr[0]), arr[1]);
 
 export default create({
   name: 'picker-column',
@@ -67,7 +66,8 @@ export default create({
   },
 
   destroyed() {
-    this.$parent.children && this.$parent.children.splice(this.$parent.children.indexOf(this), 1);
+    const { children } = this.$parent;
+    children && children.splice(children.indexOf(this), 1);
   },
 
   watch: {
@@ -87,7 +87,7 @@ export default create({
 
     columnStyle() {
       return {
-        height: (this.itemHeight * this.visibleItemCount) + 'px'
+        height: this.itemHeight * this.visibleItemCount + 'px'
       };
     },
 
@@ -115,25 +115,27 @@ export default create({
 
     onTouchMove(event) {
       const deltaY = event.touches[0].clientY - this.startY;
-      this.offset = range(this.startOffset + deltaY, [
+      this.offset = range(
+        this.startOffset + deltaY,
         -(this.count * this.itemHeight),
         this.itemHeight
-      ]);
+      );
     },
 
     onTouchEnd() {
       if (this.offset !== this.startOffset) {
         this.duration = DEFAULT_DURATION;
-        const index = range(Math.round(-this.offset / this.itemHeight), [
+        const index = range(
+          Math.round(-this.offset / this.itemHeight),
           0,
           this.count - 1
-        ]);
+        );
         this.setIndex(index, true);
       }
     },
 
     adjustIndex(index) {
-      index = range(index, [0, this.count]);
+      index = range(index, 0, this.count);
       for (let i = index; i < this.count; i++) {
         if (!this.isDisabled(this.options[i])) return i;
       }
@@ -147,7 +149,9 @@ export default create({
     },
 
     getOptionText(option) {
-      return isObj(option) && this.valueKey in option ? option[this.valueKey] : option;
+      return isObj(option) && this.valueKey in option
+        ? option[this.valueKey]
+        : option;
     },
 
     setIndex(index, userAction) {
diff --git a/packages/utils/index.js b/packages/utils/index.js
index 007009123..7186067a3 100644
--- a/packages/utils/index.js
+++ b/packages/utils/index.js
@@ -32,8 +32,13 @@ function isAndroid() {
   return isServer ? false : /android/.test(navigator.userAgent.toLowerCase());
 }
 
+function range(num, min, max) {
+  return Math.min(Math.max(num, min), max);
+};
+
 export {
   get,
+  range,
   isObj,
   isDef,
   isServer,