From 0b11182e98e60bc8138c9225b7658afe31ff63ba Mon Sep 17 00:00:00 2001
From: cloudIC <844033231@qq.com>
Date: Wed, 6 Dec 2017 17:58:05 +0800
Subject: [PATCH] fix(picker): change params

---
 .../datetime-picker/src/datetime-picker.vue   |  6 ++--
 packages/picker/src/picker.vue                | 28 +++++--------------
 2 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/packages/datetime-picker/src/datetime-picker.vue b/packages/datetime-picker/src/datetime-picker.vue
index fde0cca..e56448b 100644
--- a/packages/datetime-picker/src/datetime-picker.vue
+++ b/packages/datetime-picker/src/datetime-picker.vue
@@ -212,8 +212,10 @@
           this.selfTriggered = false;
           return;
         }
-        this.currentValue = this.getValue(values);
-        this.handleValueChange();
+        if (values.length !== 0) {
+          this.currentValue = this.getValue(values);
+          this.handleValueChange();
+        }
       },
 
       fillValues(type, start, end) {
diff --git a/packages/picker/src/picker.vue b/packages/picker/src/picker.vue
index 0ff6e5d..f7f1240 100644
--- a/packages/picker/src/picker.vue
+++ b/packages/picker/src/picker.vue
@@ -94,16 +94,6 @@
 
     created() {
       this.$on('slotValueChange', this.slotValueChange);
-      var slots = this.slots || [];
-      var values = [];
-      var valueIndexCount = 0;
-      slots.forEach(slot => {
-        if (!slot.divider) {
-          slot.valueIndex = valueIndexCount++;
-          values[slot.valueIndex] = (slot.values || [])[slot.defaultIndex || 0];
-        }
-      });
-      this.values = values;
       this.slotValueChange();
     },
 
@@ -132,7 +122,7 @@
       getSlotValue(index) {
         var slot = this.getSlot(index);
         if (slot) {
-          return slot.value;
+          return slot.currentValue;
         }
         return null;
       },
@@ -175,18 +165,14 @@
         get() {
           var slots = this.slots || [];
           var values = [];
-          slots.forEach(function(slot) {
-            if (!slot.divider) values.push(slot.value);
-          });
-
-          return values;
-        },
-        set(values) {
-          var slots = this.slots || [];
           var valueIndexCount = 0;
-          slots.forEach(function(slot) {
-            if (!slot.divider) slot.value = values[valueIndexCount++];
+          slots.forEach(slot => {
+            if (!slot.divider) {
+              slot.valueIndex = valueIndexCount++;
+              values[slot.valueIndex] = (slot.values || [])[slot.defaultIndex || 0];
+            }
           });
+          return values;
         }
       },
       slotCount() {
-- 
GitLab