Browse Source

Load method support fixedScroll param.

zhixin 10 years ago
parent
commit
e82170fdfe
1 changed files with 7 additions and 1 deletions
  1. 7 1
      src/bootstrap-table.js

+ 7 - 1
src/bootstrap-table.js

@@ -1422,16 +1422,22 @@
     };
     };
 
 
     BootstrapTable.prototype.load = function (data) {
     BootstrapTable.prototype.load = function (data) {
+        var fixedScroll = false;
+
         // #431: support pagination
         // #431: support pagination
         if (this.options.sidePagination === 'server') {
         if (this.options.sidePagination === 'server') {
             this.options.totalRows = data.total;
             this.options.totalRows = data.total;
+            fixedScroll = data.fixedScroll;
             data = data.rows;
             data = data.rows;
+        } else if (!$.isArray(data)) { // support fixedScroll
+            fixedScroll = data.fixedScroll;
+            data = data.data;
         }
         }
 
 
         this.initData(data);
         this.initData(data);
         this.initSearch();
         this.initSearch();
         this.initPagination();
         this.initPagination();
-        this.initBody();
+        this.initBody(fixedScroll);
     };
     };
 
 
     BootstrapTable.prototype.append = function (data) {
     BootstrapTable.prototype.append = function (data) {