fix(taro-weapp): 修复setData 前移出掉数据中的函数时将null转换成空对象问题

NervJS · Aug 1, 2018 · 3a914ca · 3a914ca
1 parent 6e61d48
commit 3a914ca
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/packages/taro-weapp/package.json b/packages/taro-weapp/package.json
@@ -23,6 +23,7 @@
   "license": "MIT",
   "dependencies": {
     "@tarojs/taro": "1.0.0-beta.4",
+    "lodash": "^4.17.10",
     "prop-types": "^15.6.1"
   }
 }
diff --git a/packages/taro-weapp/src/util.js b/packages/taro-weapp/src/util.js
@@ -1,3 +1,4 @@
+import isPlainObject from 'lodash/isPlainObject'
 export function isEmptyObject (obj) {
   if (!obj) {
     return false
@@ -56,18 +57,26 @@ export function getPrototypeChain (obj) {
 
 export function noop () {}
 
+export function isFunction (arg) {
+  return typeof arg === 'function'
+}
+
+export function isArray (arg) {
+  return Array.isArray(arg)
+}
+
 export function shakeFnFromObject (obj) {
   let newObj
-  if (Array.isArray(obj)) {
+  if (isArray(obj)) {
     newObj = []
     const len = obj.length
     for (let i = 0; i < len; i++) {
       newObj.push(shakeFnFromObject(obj[i]))
     }
-  } else if (typeof obj === 'object') {
+  } else if (isPlainObject(obj)) {
     newObj = {}
     for (const key in obj) {
-      if (typeof obj[key] === 'function') {
+      if (isFunction(obj[key])) {
         continue
       }
       const ret = shakeFnFromObject(obj[key])