修复动态增加函数属性的问题

Tencent · Oct 4, 2018 · 611dee6 · 611dee6
1 parent 95643e2
commit 611dee6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 44 deletions.
diff --git a/packages/westore-cloud/utils/create.js b/packages/westore-cloud/utils/create.js
@@ -77,22 +77,13 @@ function _push(diffResult, resolve) {
 }
 
 function update(patch) {
-    let needDiff = false
-    let diffResult = patch
+    defineFnProp(globalStore.data)
     if (patch) {
         for (let key in patch) {
             updateByPath(globalStore.data, key, patch[key])
-            if (typeof patch[key] === 'object') {
-                needDiff = true
-            }
         }
-    } else {
-        needDiff = true
-    }
-    if (needDiff) {
-        diffResult = diff(globalStore.data, originData)
     } 
-    defineFnProp(globalStore.data)
+    let diffResult = diff(globalStore.data, originData)
     for (let key in globalStore.instances) {
         globalStore.instances[key].forEach(ins => {
             ins.setData.call(ins, diffResult)

diff --git a/packages/westore-plugin/miniprogram/utils/create.js b/packages/westore-plugin/miniprogram/utils/create.js
@@ -77,22 +77,13 @@ function _push(diffResult, resolve) {
 }
 
 function update(patch) {
-    let needDiff = false
-    let diffResult = patch
+    defineFnProp(globalStore.data)
     if (patch) {
         for (let key in patch) {
             updateByPath(globalStore.data, key, patch[key])
-            if (typeof patch[key] === 'object') {
-                needDiff = true
-            }
         }
-    } else {
-        needDiff = true
-    }
-    if (needDiff) {
-        diffResult = diff(globalStore.data, originData)
     } 
-    defineFnProp(globalStore.data)
+    let diffResult = diff(globalStore.data, originData)
     for (let key in globalStore.instances) {
         globalStore.instances[key].forEach(ins => {
             ins.setData.call(ins, diffResult)

diff --git a/packages/westore/utils/create.js b/packages/westore/utils/create.js
@@ -77,22 +77,13 @@ function _push(diffResult, resolve) {
 }
 
 function update(patch) {
-    let needDiff = false
-    let diffResult = patch
+    defineFnProp(globalStore.data)
     if (patch) {
         for (let key in patch) {
             updateByPath(globalStore.data, key, patch[key])
-            if (typeof patch[key] === 'object') {
-                needDiff = true
-            }
         }
-    } else {
-        needDiff = true
-    }
-    if (needDiff) {
-        diffResult = diff(globalStore.data, originData)
     } 
-    defineFnProp(globalStore.data)
+    let diffResult = diff(globalStore.data, originData)
     for (let key in globalStore.instances) {
         globalStore.instances[key].forEach(ins => {
             ins.setData.call(ins, diffResult)

diff --git a/utils/create.js b/utils/create.js
@@ -77,22 +77,13 @@ function _push(diffResult, resolve) {
 }
 
 function update(patch) {
-    let needDiff = false
-    let diffResult = patch
+    defineFnProp(globalStore.data)
     if (patch) {
         for (let key in patch) {
             updateByPath(globalStore.data, key, patch[key])
-            if (typeof patch[key] === 'object') {
-                needDiff = true
-            }
         }
-    } else {
-        needDiff = true
-    }
-    if (needDiff) {
-        diffResult = diff(globalStore.data, originData)
     } 
-    defineFnProp(globalStore.data)
+    let diffResult = diff(globalStore.data, originData)
     for (let key in globalStore.instances) {
         globalStore.instances[key].forEach(ins => {
             ins.setData.call(ins, diffResult)