From 41e4b1d549dd2d1aa85a2f05f43194b898dfae60 Mon Sep 17 00:00:00 2001
From: QiuShuiBai <33334963+QiuShuiBai@users.noreply.github.com>
Date: Mon, 2 Dec 2019 11:28:36 +0800
Subject: [PATCH] fix(segment-picker): fix no hidden animation (#646)

* fix(segment-picker): fix no hidden animation

* fix(time-picker): value last choose was changed when open again

* test(time-picker): add the value of the selected test
---
 .../segment-picker/segment-picker.vue         |  2 +-
 src/components/time-picker/time-picker.vue    |  4 +--
 test/unit/specs/time-picker.spec.js           | 30 +++++++++++++++++++
 3 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/src/components/segment-picker/segment-picker.vue b/src/components/segment-picker/segment-picker.vue
index e10019318..3bc51aaeb 100644
--- a/src/components/segment-picker/segment-picker.vue
+++ b/src/components/segment-picker/segment-picker.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="cube-segment-picker" v-show="isVisible">
+  <div class="cube-segment-picker">
     <!-- Direct props will recover the property from v-bind Object expect 'is'. -->
     <!-- To ensure the priority of v-bind Object which is from user configure, we check the property of item in every prop. -->
     <component
diff --git a/src/components/time-picker/time-picker.vue b/src/components/time-picker/time-picker.vue
index 3d4d0f20c..b9f59f1c7 100644
--- a/src/components/time-picker/time-picker.vue
+++ b/src/components/time-picker/time-picker.vue
@@ -258,8 +258,8 @@
       _updateSelectedIndex() {
         const value = this.value
         const minTime = this.minTime
-
-        if (value <= +minTime) {
+        // fix the value last choose was changed when time-picker is opened again
+        if (value < Math.floor(minTime / MINUTE_TIMESTAMP) * MINUTE_TIMESTAMP) {
           this.selectedIndex = [0, 0, 0]
         } else {
           // calculate dayIndex
diff --git a/test/unit/specs/time-picker.spec.js b/test/unit/specs/time-picker.spec.js
index df29a3d5a..44badcf81 100644
--- a/test/unit/specs/time-picker.spec.js
+++ b/test/unit/specs/time-picker.spec.js
@@ -235,6 +235,36 @@ describe('TimePicker', () => {
     console.warn = originWarn
   })
 
+  it('should show the value last choose when time-picker is opened again', function (done) {
+    const selectHandle = sinon.spy()
+    vm = createPicker({
+    }, {
+      select: selectHandle
+    })
+    new Promise((resolve) => {
+      vm.show()
+      vm.selectedIndex = [0, 1, 0]
+      setTimeout(() => {
+        let confirmBtn = vm.$el.querySelector('.cube-picker-confirm')
+        confirmBtn.click()
+        let value = selectHandle.lastCall.args[0]
+        setTimeout(() => {
+          resolve(value)
+        })
+      }, 100)
+    }).then((firstValue) => {
+      vm.show()
+      setTimeout(() => {
+        let confirmBtn = vm.$el.querySelector('.cube-picker-confirm')
+        confirmBtn.click()
+        let value = selectHandle.lastCall.args[0]
+        expect(firstValue)
+          .to.be.equal(value)
+        done()
+      }, 100)
+    })
+  })
+
   testMinuteStep()
 
   testMin()