Table

bizdevfe · Oct 30, 2015 · ecc844d · ecc844d
1 parent 1ef8ab4
commit ecc844d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/dist/jquery.bizui.js b/dist/jquery.bizui.js
@@ -13210,12 +13210,12 @@ define('ui/Table',['require','ui/util','dep/jquery.resizableColumns','dep/jquery
         this.$main = $(this.main);
 
         var defaultOption = {
+            data: [],
             selectable: false,
             resizable: false,
             topOffset: 0
         };
-        this.options = $.extend(defaultOption, options || {});
-        this.options.data = this.options.data ? this.options.data : [];
+        this.options = $.extend(true, defaultOption, options || {});
         this.init(this.options);
     }
 
@@ -13677,7 +13677,7 @@ define('ui/Table',['require','ui/util','dep/jquery.resizableColumns','dep/jquery
          * @param {Object} data 行数据
          */
         updateRow: function(rowIndex, data) {
-            this.options.data[rowIndex - 1] = $.extend({}, data);
+            this.options.data[rowIndex - 1] = $.extend(true, {}, data);
             this.refresh();
         },
 

diff --git a/dist/jquery.bizui.min.js b/dist/jquery.bizui.min.js
diff --git a/src/ui/Table.js b/src/ui/Table.js
@@ -61,12 +61,12 @@ define(function(require) {
         this.$main = $(this.main);
 
         var defaultOption = {
+            data: [],
             selectable: false,
             resizable: false,
             topOffset: 0
         };
-        this.options = $.extend(defaultOption, options || {});
-        this.options.data = this.options.data ? this.options.data : [];
+        this.options = $.extend(true, defaultOption, options || {});
         this.init(this.options);
     }
 
@@ -528,7 +528,7 @@ define(function(require) {
          * @param {Object} data 行数据
          */
         updateRow: function(rowIndex, data) {
-            this.options.data[rowIndex - 1] = $.extend({}, data);
+            this.options.data[rowIndex - 1] = $.extend(true, {}, data);
             this.refresh();
         },