Merge pull request #172 from The-only/master

预防Model和View中原型上有引用类型属性因共享修改导致的问题
ecomfe · May 17, 2016 · 6f0a0bd · 6f0a0bd
2 parents 917790d + a3f3bbb
commit 6f0a0bd
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/src/Model.js b/src/Model.js
@@ -10,6 +10,7 @@ define(
     function (require) {
         var util = require('./util');
         var Deferred = require('./Deferred');
+        var _ = require('underscore');
 
         var SILENT = {silent: true};
 
@@ -196,6 +197,12 @@ define(
             this.store = {};
             this.pendingWorkers = [];
 
+            // 如果prototype上的属性是引用类型，则复制一份，
+            // 防止因共享修改导致的问题
+            if (!this.hasOwnProperty('datasource') && this.datasource) {
+                this.datasource = _.clone(this.datasource);
+            }
+
             if (context) {
                 this.fill(context, SILENT);
             }

diff --git a/src/View.js b/src/View.js
@@ -9,6 +9,7 @@
 define(
     function (require) {
         var util = require('./util');
+        var _ = require('underscore');
 
         /**
          * @class View
@@ -26,6 +27,17 @@ define(
         var exports = {};
 
         exports.constructor = function () {
+
+            // 如果prototype上的属性是引用类型，则复制一份，
+            // 防止因共享修改导致的问题
+            if (!this.hasOwnProperty('uiProperties') && this.uiProperties) {
+                this.uiProperties = _.clone(this.uiProperties);
+            }
+
+            if (!this.hasOwnProperty('uiEvents') && this.uiEvents) {
+                this.uiEvents = _.clone(this.uiEvents);
+            }
+
             this.initialize();
         };
 

diff --git a/test/spec/util.spec.js b/test/spec/util.spec.js
@@ -1,6 +1,6 @@
 define(function() {
     var util = require('er/util');
-    
+
     describe('util', function() {
         it('should export `guid` method', function() {
             expect(util.guid).toBeOfType('function');
@@ -33,7 +33,7 @@ define(function() {
         });
         describe('`mix` method', function() {
             it('should return the same object C', function() {
-                var a = { 
+                var a = {
                     "a": 1
                 },
                 b = {
@@ -47,13 +47,13 @@ define(function() {
                 expect(util.mix(a, b)).not.toBe(c);
             });
         });
-        
+
         describe('`bind` method', function() {
             it('should accept  a function', function() {
                 expect(function() { util.bind(function(){}) }).not.toThrow();
             });
         });
-        
+
         describe('`inherits` method', function() {
             it('classA should be inherit superClassA', function() {
                 function SuperClassA() {}