fix(taro-weapp): setData 前移出掉数据中的函数

NervJS · Jul 31, 2018 · cca3ed6 · cca3ed6
1 parent 66de1ca
commit cca3ed6
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 1 deletion.
diff --git a/packages/taro-weapp/src/lifecycle.js b/packages/taro-weapp/src/lifecycle.js
@@ -3,6 +3,8 @@ import {
   internal_safe_set as safeSet
 } from '@tarojs/taro'
 import { componentTrigger } from './create-component'
+import { shakeFnFromObject, isEmptyObject } from './util'
+
 const privatePropKeyName = '_triggerObserer'
 export function updateComponent (component) {
   const { props } = component
@@ -59,7 +61,17 @@ function doUpdate (component) {
     const _data = {}
     component.$usedState.forEach(key => {
       const val = safeGet(data, key)
-      typeof val !== 'undefined' && safeSet(_data, key, val)
+      if (typeof val === 'undefined') {
+        return
+      }
+      if (typeof val === 'object') {
+        val = shakeFnFromObject(val)
+        if (!isEmptyObject(val)) {
+          safeSet(_data, key, val)
+        }
+      } else {
+        safeSet(_data, key, val)
+      }
     })
     data = _data
   }

diff --git a/packages/taro-weapp/src/util.js b/packages/taro-weapp/src/util.js
@@ -55,3 +55,23 @@ export function getPrototypeChain (obj) {
 }
 
 export function noop () {}
+
+export function shakeFnFromObject (obj) {
+  let newObj = {}
+  if (typeof obj === 'object') {
+    for (const key in obj) {
+      if (typeof obj[key] === 'function') {
+        continue
+      }
+      if (typeof obj[key] === 'object') {
+        const ret = shakeFnFromObject(obj[key])
+        if (!isEmptyObject(ret)) {
+          newObj[key] = ret
+        }
+      } else {
+        newObj[key] = obj[key]
+      }
+    }
+  }
+  return newObj
+}