From e408d001ffb5917ae94f96ed1692473f73cdf4cb Mon Sep 17 00:00:00 2001
From: qiang <guoshengqiang@live.com>
Date: Tue, 14 Apr 2020 21:26:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=B5=8C=E5=A5=97=E5=9C=A8=20uni-popup=20?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=86=85=E6=B8=B2=E6=9F=93=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../view/components/movable-area/index.vue    | 24 ++---
 .../view/components/picker-view/index.vue     |  4 +-
 src/core/view/components/swiper/index.vue     | 19 +---
 src/shared/util.js                            | 98 +++++++++++--------
 4 files changed, 75 insertions(+), 70 deletions(-)

diff --git a/src/core/view/components/movable-area/index.vue b/src/core/view/components/movable-area/index.vue
index 13832b2fd..c20117299 100644
--- a/src/core/view/components/movable-area/index.vue
+++ b/src/core/view/components/movable-area/index.vue
@@ -1,6 +1,7 @@
 <script>
 import {
-  disableScrollBounce
+  disableScrollBounce,
+  deepClone
 } from 'uni-shared'
 
 function calc (e) {
@@ -56,9 +57,9 @@ export default {
       }
       return get(target)
     },
-    _touchstart (t) {
-      disableScrollBounce({
-        disable: true
+    _touchstart (t) {
+      disableScrollBounce({
+        disable: true
       })
       var i = t.touches
       if (i) {
@@ -94,9 +95,9 @@ export default {
         }
       }
     },
-    _touchend (e) {
-      disableScrollBounce({
-        disable: false
+    _touchend (e) {
+      disableScrollBounce({
+        disable: false
       })
       var t = e.touches
       if (!(t && t.length)) {
@@ -142,8 +143,9 @@ export default {
   },
   render (createElement) {
     var items = []
-    if (this.$slots.default) {
-      this.$slots.default.forEach(vnode => {
+    const $slots = this.$slots.default && deepClone(this.$slots.default, createElement)
+    if ($slots) {
+      $slots.forEach(vnode => {
         if (vnode.componentOptions && vnode.componentOptions.tag === 'v-uni-movable-view') {
           items.push(vnode)
         }
@@ -163,7 +165,7 @@ export default {
       on: {
         resize: this._resize
       }
-    }), this.$slots.default])
+    }), $slots])
   }
 }
 </script>
@@ -178,4 +180,4 @@ export default {
   uni-movable-area[hidden] {
     display: none;
   }
-</style>
+</style>
diff --git a/src/core/view/components/picker-view/index.vue b/src/core/view/components/picker-view/index.vue
index ca5581d3a..538aeefc3 100644
--- a/src/core/view/components/picker-view/index.vue
+++ b/src/core/view/components/picker-view/index.vue
@@ -1,4 +1,6 @@
 <script>
+import { deepClone } from 'uni-shared'
+
 export default {
   name: 'PickerView',
   props: {
@@ -93,7 +95,7 @@ export default {
   render (createElement) {
     var items = []
     if (this.$slots.default) {
-      this.$slots.default.forEach(vnode => {
+      deepClone(this.$slots.default, createElement).forEach(vnode => {
         if (vnode.componentOptions && vnode.componentOptions.tag === 'v-uni-picker-view-column') {
           items.push(vnode)
         }
diff --git a/src/core/view/components/swiper/index.vue b/src/core/view/components/swiper/index.vue
index e09ba0283..412d6a579 100644
--- a/src/core/view/components/swiper/index.vue
+++ b/src/core/view/components/swiper/index.vue
@@ -1,24 +1,7 @@
 
 <script>
 import touchtrack from 'uni-mixins/touchtrack'
-
-function deepClone (vnodes, createElement) {
-  function cloneVNode (vnode) {
-    var clonedChildren = vnode.children && vnode.children.map(cloneVNode)
-    var cloned = createElement(vnode.tag, vnode.data, clonedChildren)
-    cloned.text = vnode.text
-    cloned.isComment = vnode.isComment
-    cloned.componentOptions = vnode.componentOptions
-    cloned.elm = vnode.elm
-    cloned.context = vnode.context
-    cloned.ns = vnode.ns
-    cloned.isStatic = vnode.isStatic
-    cloned.key = vnode.key
-    return cloned
-  }
-
-  return vnodes.map(cloneVNode)
-}
+import { deepClone } from 'uni-shared'
 
 export default {
   name: 'Swiper',
diff --git a/src/shared/util.js b/src/shared/util.js
index c8c55f404..96915ee61 100644
--- a/src/shared/util.js
+++ b/src/shared/util.js
@@ -95,43 +95,61 @@ export function debounce (fn, delay) {
 
 export function kebabCase (string) {
   return string.replace(/[A-Z]/g, str => '-' + str.toLowerCase())
-}
-
-/**
- * Check if two values are loosely equal - that is,
- * if they are plain objects, do they have the same shape?
- */
-export function looseEqual (a, b) {
-  if (a === b) return true
-  const isObjectA = isObject(a)
-  const isObjectB = isObject(b)
-  if (isObjectA && isObjectB) {
-    try {
-      const isArrayA = Array.isArray(a)
-      const isArrayB = Array.isArray(b)
-      if (isArrayA && isArrayB) {
-        return a.length === b.length && a.every((e, i) => {
-          return looseEqual(e, b[i])
-        })
-      } else if (a instanceof Date && b instanceof Date) {
-        return a.getTime() === b.getTime()
-      } else if (!isArrayA && !isArrayB) {
-        const keysA = Object.keys(a)
-        const keysB = Object.keys(b)
-        return keysA.length === keysB.length && keysA.every(key => {
-          return looseEqual(a[key], b[key])
-        })
-      } else {
-        /* istanbul ignore next */
-        return false
-      }
-    } catch (e) {
-      /* istanbul ignore next */
-      return false
-    }
-  } else if (!isObjectA && !isObjectB) {
-    return String(a) === String(b)
-  } else {
-    return false
-  }
-}
+}
+
+/**
+ * Check if two values are loosely equal - that is,
+ * if they are plain objects, do they have the same shape?
+ */
+export function looseEqual (a, b) {
+  if (a === b) return true
+  const isObjectA = isObject(a)
+  const isObjectB = isObject(b)
+  if (isObjectA && isObjectB) {
+    try {
+      const isArrayA = Array.isArray(a)
+      const isArrayB = Array.isArray(b)
+      if (isArrayA && isArrayB) {
+        return a.length === b.length && a.every((e, i) => {
+          return looseEqual(e, b[i])
+        })
+      } else if (a instanceof Date && b instanceof Date) {
+        return a.getTime() === b.getTime()
+      } else if (!isArrayA && !isArrayB) {
+        const keysA = Object.keys(a)
+        const keysB = Object.keys(b)
+        return keysA.length === keysB.length && keysA.every(key => {
+          return looseEqual(a[key], b[key])
+        })
+      } else {
+        /* istanbul ignore next */
+        return false
+      }
+    } catch (e) {
+      /* istanbul ignore next */
+      return false
+    }
+  } else if (!isObjectA && !isObjectB) {
+    return String(a) === String(b)
+  } else {
+    return false
+  }
+}
+
+export function deepClone (vnodes, createElement) {
+  function cloneVNode (vnode) {
+    var clonedChildren = vnode.children && vnode.children.map(cloneVNode)
+    var cloned = createElement(vnode.tag, vnode.data, clonedChildren)
+    cloned.text = vnode.text
+    cloned.isComment = vnode.isComment
+    cloned.componentOptions = vnode.componentOptions
+    cloned.elm = vnode.elm
+    cloned.context = vnode.context
+    cloned.ns = vnode.ns
+    cloned.isStatic = vnode.isStatic
+    cloned.key = vnode.key
+    return cloned
+  }
+
+  return vnodes.map(cloneVNode)
+}
-- 
GitLab