fix(ob): fix the error when non-object item inherits dep from array

tuax · Jul 12, 2018 · dd0ce1c · dd0ce1c
1 parent ba65f88
commit dd0ce1c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/__tests__/index.test.js b/__tests__/index.test.js
@@ -526,16 +526,21 @@ describe('TuaPage', () => {
         const vm = TuaPage({
             data () {
                 return {
+                    strArr: ['a', 'b'],
                     nestedArr: [ { num: n++ } ],
                 }
             },
             computed: {
                 fromNestedArr () {
                     return this.nestedArr.filter(x => x.num > 1)
                 },
+                firstStr () {
+                    return this.strArr[0]
+                },
             },
         })
 
+        vm.strArr = ['c']
         vm.nestedArr = [ { num: n++ }, { num: n++ } ]
         vm.nestedArr.push({ num: n++ })
 
@@ -547,6 +552,7 @@ describe('TuaPage', () => {
         expect(vm.data.fromNestedArr.length).toBe(0)
 
         afterSetData(() => {
+            expect(vm.firstStr).toBe('c')
             expect(vm.fromNestedArr.length).toBe(3)
             expect(vm.nestedArr.__dep__.subs.length)
                 .toEqual(vm.nestedArr[0].__dep__.subs.length)

diff --git a/examples/basic/utils/tua-mp.js b/examples/basic/utils/tua-mp.js
@@ -1,4 +1,4 @@
-var version = "0.7.0";
+var version = "0.7.1";
 
 var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) {
   return typeof obj;
@@ -828,8 +828,10 @@ var getObserveDeep = function getObserveDeep(asyncSetData) {
 
         if (Array.isArray(obj)) {
             var arr = obj.map(function (item, idx) {
+                var isNeedInheritDep = (typeof item === 'undefined' ? 'undefined' : _typeof(item)) === 'object' && !item[__dep__] && obj[__dep__];
+
                 // 继承依赖
-                if (!item[__dep__] && obj[__dep__]) {
+                if (isNeedInheritDep) {
                     item[__dep__] = obj[__dep__];
                 }
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "tua-mp",
-    "version": "0.7.0",
+    "version": "0.7.1",
     "description": "A helper for coding miniprogram like Vue",
     "main": "examples/basic/utils/tua-mp.js",
     "files": [

diff --git a/src/observer/index.js b/src/observer/index.js
@@ -99,8 +99,13 @@ export const getObserveDeep = (asyncSetData) => {
     return function observeDeep (obj, prefix = '') {
         if (Array.isArray(obj)) {
             const arr = obj.map((item, idx) => {
+                const isNeedInheritDep =
+                    typeof item === 'object' &&
+                    !item[__dep__] &&
+                    obj[__dep__]
+
                 // 继承依赖
-                if (!item[__dep__] && obj[__dep__]) {
+                if (isNeedInheritDep) {
                     item[__dep__] = obj[__dep__]
                 }