From 9ccd8f640e84ee513ad20e2db43b14810534486a Mon Sep 17 00:00:00 2001
From: qiang <guoshengqiang@live.com>
Date: Fri, 20 Mar 2020 11:30:36 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DH5=E7=AB=AFpicker?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6value=E9=94=99=E8=AF=AF=E6=97=B6=E5=86=85?=
 =?UTF-8?q?=E9=83=A8=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../h5/view/components/picker/index.vue       | 63 ++++++++++++-------
 1 file changed, 41 insertions(+), 22 deletions(-)

diff --git a/src/platforms/h5/view/components/picker/index.vue b/src/platforms/h5/view/components/picker/index.vue
index 1434a83d3..ed3a10c0d 100644
--- a/src/platforms/h5/view/components/picker/index.vue
+++ b/src/platforms/h5/view/components/picker/index.vue
@@ -156,7 +156,7 @@ export default {
   },
   data () {
     return {
-      valueSync: this.value || 0,
+      valueSync: null,
       visible: false,
       valueChangeSource: '',
       timeArray: [],
@@ -207,20 +207,17 @@ export default {
     }
   },
   watch: {
-    value (val) {
-      if (Array.isArray(val)) {
-        if (!Array.isArray(this.valueSync)) {
-          this.valueSync = []
-        }
-        this.valueSync.length = val.length
-        val.forEach((val, index) => {
-          if (val !== this.valueSync[index]) {
-            this.$set(this.valueSync, index, val)
-          }
-        })
-      } else if (typeof val !== 'object') {
-        this.valueSync = val
-      }
+    value () {
+      this._setValueSync()
+    },
+    mode () {
+      this._setValueSync()
+    },
+    range () {
+      this._setValueSync()
+    },
+    valueSync () {
+      this._setValueArray()
     },
     valueArray (val) {
       if (this.mode === mode.TIME || this.mode === mode.DATE) {
@@ -269,8 +266,7 @@ export default {
     })
     this._createTime()
     this._createDate()
-    this.$watch('valueSync', this._setValue)
-    this.$watch('mode', this._setValue)
+    this._setValueSync()
   },
   beforeDestroy () {
     this.$refs.picker.remove()
@@ -285,7 +281,6 @@ export default {
         return
       }
       this.valueChangeSource = ''
-      this._setValue()
       var $picker = this.$refs.picker
       $picker.remove();
       (document.querySelector('uni-app') || document.body).appendChild($picker)
@@ -346,13 +341,34 @@ export default {
         val1[i] = val2[i]
       }
     },
-    _setValue () {
+    _setValueSync () {
+      let val = this.value
+      switch (this.mode) {
+        case mode.MULTISELECTOR:
+          if (!Array.isArray(val)) {
+            val = []
+          }
+          if (!Array.isArray(this.valueSync)) {
+            this.valueSync = []
+          }
+          const length = this.valueSync.length = Math.max(val.length, this.range.length)
+          for (let index = 0; index < length; index++) {
+            this.valueSync.splice(index, 1, Number(val[index]) || Number(this.valueSync[index]) || 0)
+          }
+          break
+        case mode.TIME:
+        case mode.DATE:
+          this.valueSync = String(val)
+          break
+        default:
+          this.valueSync = Number(val) || 0
+          break
+      }
+    },
+    _setValueArray () {
       var val = this.valueSync
       var valueArray
       switch (this.mode) {
-        case mode.SELECTOR:
-          valueArray = [val]
-          break
         case mode.MULTISELECTOR:
           valueArray = [...val]
           break
@@ -366,6 +382,9 @@ export default {
             mode: mode.DATE
           }))
           break
+        default:
+          valueArray = [val]
+          break
       }
       this.oldValueArray = [...valueArray]
       this.valueArray = [...valueArray]
-- 
GitLab