修复昨天更新带来的BUG

qincheng.zhong · qincheng.zhong · commit e1046a0aec8e · 2015-08-12T14:41:50.000+08:00
diff --git a/avalon.js b/avalon.js
@@ -1346,6 +1346,12 @@ function makeComplexAccessor(name, initValue, valueType, list, parentModel) {
                 a._fire("set")
             } else if (valueType === "object") {
                 var observes = this.$events[name] || []
+                var newObject = avalon.mix(true, {}, value)
+                for(i in son ){
+                    if(son.hasOwnProperty(i) && ohasOwn.call(newObject,i)){
+                        son[i] = newObject[i]
+                    }
+                }
                 son = accessor._vmodel = modelFactory(value)
                 son.$events[subscribers] = observes
                 if (observes.length) {
diff --git a/dist/avalon.js b/dist/avalon.js
@@ -1346,6 +1346,12 @@ function makeComplexAccessor(name, initValue, valueType, list, parentModel) {
                 a._fire("set")
             } else if (valueType === "object") {
                 var observes = this.$events[name] || []
+                var newObject = avalon.mix(true, {}, value)
+                for(i in son ){
+                    if(son.hasOwnProperty(i) && ohasOwn.call(newObject,i)){
+                        son[i] = newObject[i]
+                    }
+                }
                 son = accessor._vmodel = modelFactory(value)
                 son.$events[subscribers] = observes
                 if (observes.length) {
diff --git a/dist/avalon.min.js b/dist/avalon.min.js
diff --git a/dist/avalon.mobile.js b/dist/avalon.mobile.js
@@ -1076,6 +1076,12 @@ function makeComplexAccessor(name, initValue, valueType, list, parentModel) {
                 a._fire("set")
             } else if (valueType === "object") {
                 var observes = this.$events[name] || []
+                var newObject = avalon.mix(true, {}, value)
+                for (i in son) {
+                    if (son.hasOwnProperty(i) && ohasOwn.call(newObject, i)) {
+                        son[i] = newObject[i]
+                    }
+                }
                 son = accessor._vmodel = modelFactory(value)
                 son.$events[subscribers] = observes
                 if (observes.length) {
diff --git a/dist/avalon.mobile.min.js b/dist/avalon.mobile.min.js
diff --git a/dist/avalon.mobile.old.js b/dist/avalon.mobile.old.js
@@ -1346,6 +1346,12 @@ function makeComplexAccessor(name, initValue, valueType, list, parentModel) {
                 a._fire("set")
             } else if (valueType === "object") {
                 var observes = this.$events[name] || []
+                var newObject = avalon.mix(true, {}, value)
+                for(i in son ){
+                    if(son.hasOwnProperty(i) && ohasOwn.call(newObject,i)){
+                        son[i] = newObject[i]
+                    }
+                }
                 son = accessor._vmodel = modelFactory(value)
                 son.$events[subscribers] = observes
                 if (observes.length) {
diff --git a/dist/avalon.mobile.shim.js b/dist/avalon.mobile.shim.js
@@ -1075,6 +1075,12 @@ function makeComplexAccessor(name, initValue, valueType, list, parentModel) {
                 a._fire("set")
             } else if (valueType === "object") {
                 var observes = this.$events[name] || []
+                var newObject = avalon.mix(true, {}, value)
+                for (i in son) {
+                    if (son.hasOwnProperty(i) && ohasOwn.call(newObject, i)) {
+                        son[i] = newObject[i]
+                    }
+                }
                 son = accessor._vmodel = modelFactory(value)
                 son.$events[subscribers] = observes
                 if (observes.length) {
diff --git a/dist/avalon.modern.js b/dist/avalon.modern.js
@@ -1076,6 +1076,12 @@ function makeComplexAccessor(name, initValue, valueType, list, parentModel) {
                 a._fire("set")
             } else if (valueType === "object") {
                 var observes = this.$events[name] || []
+                var newObject = avalon.mix(true, {}, value)
+                for (i in son) {
+                    if (son.hasOwnProperty(i) && ohasOwn.call(newObject, i)) {
+                        son[i] = newObject[i]
+                    }
+                }
                 son = accessor._vmodel = modelFactory(value)
                 son.$events[subscribers] = observes
                 if (observes.length) {
diff --git a/dist/avalon.modern.min.js b/dist/avalon.modern.min.js
diff --git a/dist/avalon.modern.shim.js b/dist/avalon.modern.shim.js
@@ -1076,6 +1076,12 @@ function makeComplexAccessor(name, initValue, valueType, list, parentModel) {
                 a._fire("set")
             } else if (valueType === "object") {
                 var observes = this.$events[name] || []
+                var newObject = avalon.mix(true, {}, value)
+                for (i in son) {
+                    if (son.hasOwnProperty(i) && ohasOwn.call(newObject, i)) {
+                        son[i] = newObject[i]
+                    }
+                }
                 son = accessor._vmodel = modelFactory(value)
                 son.$events[subscribers] = observes
                 if (observes.length) {
diff --git a/dist/avalon.shim.js b/dist/avalon.shim.js
@@ -1346,6 +1346,12 @@ function makeComplexAccessor(name, initValue, valueType, list, parentModel) {
                 a._fire("set")
             } else if (valueType === "object") {
                 var observes = this.$events[name] || []
+                var newObject = avalon.mix(true, {}, value)
+                for(i in son ){
+                    if(son.hasOwnProperty(i) && ohasOwn.call(newObject,i)){
+                        son[i] = newObject[i]
+                    }
+                }
                 son = accessor._vmodel = modelFactory(value)
                 son.$events[subscribers] = observes
                 if (observes.length) {
diff --git a/index.html b/index.html
@@ -3,7 +3,7 @@
         <meta charset="utf-8">
         <title>duplexHooks</title>
         <meta http-equiv="X-UA-Compatible" content="IE=8" />
-        <script src="dist/avalon.modern.js"></script>
+        <script src="avalon.js"></script>
         <link rel="stylesheet" href="animate.css" type="text/css">
 
         <style>
@@ -31,21 +31,27 @@
             function heredoc(fn) {
                 return fn.toString().replace(/^[^\/]+\/\*!?\s?/, '').replace(/\*\/[^\/]+$/, '')
             }
+            var a = 111
             var vm = avalon.define({
-                $id: "testx",
-                object: {A: 1, B: 3, C: 5, D: 6, E: 8}
+                $id: 'testvv',
+                postData: {
+                    venue: '3323',
+                    aa: 333
+                }
+            })
+            vm.postData.$watch('venue', function (val) {
+                a = val
             })
-            var keys = []
-            for (var i in vm.object) {
-                if (vm.object.hasOwnProperty(i)) {
-                    keys.push(i)
+            setTimeout(function () {
+                vm.postData = {
+                    venue: '11',
+                    aa: 444
                 }
-            }
-            console.log(vm.object.$model)
-// var keys = Object.keys(vm.object)
-           console.log(keys)
-         //   expect(keys).to.eql(["A", "B", "C", "D", "E"])
-            delete avalon.vmodels.testx
+            }, 200)
+            setTimeout(function () {
+                expect(a).to.be("11")
+                //  clearTest(vm, 0, done)
+            }, 350)
         </script>
     </body>
 </html>
diff --git a/src/08 modelFactory.js b/src/08 modelFactory.js
@@ -246,6 +246,12 @@ function makeComplexAccessor(name, initValue, valueType, list, parentModel) {
                 a._fire("set")
             } else if (valueType === "object") {
                 var observes = this.$events[name] || []
+                var newObject = avalon.mix(true, {}, value)
+                for(i in son ){
+                    if(son.hasOwnProperty(i) && ohasOwn.call(newObject,i)){
+                        son[i] = newObject[i]
+                    }
+                }
                 son = accessor._vmodel = modelFactory(value)
                 son.$events[subscribers] = observes
                 if (observes.length) {
diff --git a/src/08 modelFactory.modern.js b/src/08 modelFactory.modern.js
@@ -233,6 +233,12 @@ function makeComplexAccessor(name, initValue, valueType, list, parentModel) {
                 a._fire("set")
             } else if (valueType === "object") {
                 var observes = this.$events[name] || []
+                var newObject = avalon.mix(true, {}, value)
+                for (i in son) {
+                    if (son.hasOwnProperty(i) && ohasOwn.call(newObject, i)) {
+                        son[i] = newObject[i]
+                    }
+                }
                 son = accessor._vmodel = modelFactory(value)
                 son.$events[subscribers] = observes
                 if (observes.length) {
