fix: when select time picker option close popup (#154)

mengxiong10 · Sep 28, 2018 · 12907ad · 12907ad
1 parent 2444331
commit 12907ad
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/src/calendar.vue b/src/calendar.vue
@@ -64,7 +64,8 @@
         :value="value"
         :disabled-time="isDisabledTime"
         :time-type="timeType"
-        @select="selectTime" />
+        @select="selectTime"
+        @pick="pickTime" />
     </div>
   </div>
 </template>
@@ -323,7 +324,10 @@ export default {
       this.showPanelDate()
     },
     selectTime (time) {
-      this.$emit('select-time', time)
+      this.$emit('select-time', time, false)
+    },
+    pickTime (time) {
+      this.$emit('select-time', time, true)
     },
     changeCalendarYear (year) {
       this.now = new Date(year, this.calendarMonth)

diff --git a/src/index.vue b/src/index.vue
@@ -365,9 +365,9 @@ export default {
         this.updateDate()
       }
     },
-    selectTime (time) {
+    selectTime (time, close) {
       this.currentValue = time
-      this.updateDate()
+      this.updateDate() && close && this.closePopup()
     },
     selectStartTime (time) {
       this.selectStartDate(time)

diff --git a/src/panel/time.js b/src/panel/time.js
@@ -44,6 +44,12 @@ export default {
       }
       this.$emit('select', new Date(time))
     },
+    pickTime (time) {
+      if (typeof this.disabledTime === 'function' && this.disabledTime(time)) {
+        return
+      }
+      this.$emit('pick', new Date(time))
+    },
     getTimeSelectOptions () {
       const result = []
       const options = this.timePickerOptions
@@ -96,7 +102,7 @@ export default {
               'actived': pickHours === this.currentHours && pickMinutes === this.currentMinutes,
               'disabled': disabledTime && disabledTime(time)
             }}
-            onClick={this.selectTime.bind(this, time)}>{picker.label}</li>
+            onClick={this.pickTime.bind(this, time)}>{picker.label}</li>
         )
       })
       return (

diff --git a/test/index.spec.js b/test/index.spec.js
@@ -609,7 +609,7 @@ describe('time-panel', () => {
     cells.at(0).trigger('click')
     const emitted = wrapper.emitted()
     expect(emitted).toEqual({
-      select: [[new Date(2018, 5, 5, 1)]]
+      pick: [[new Date(2018, 5, 5, 1)]]
     })
   })
 })