Fix wenzhixin#3204: sortName cannot work in server side pagination

ly-sniper · Dec 28, 2017 · f1b9a47 · f1b9a47
1 parent 3a42833
commit f1b9a47
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/bootstrap-table.js b/src/bootstrap-table.js
@@ -1087,9 +1087,7 @@
             if (this.options.rememberOrder) {
                 this.options.sortOrder = $this.data('order') === 'asc' ? 'desc' : 'asc';
             } else {
-                this.options.sortOrder = this.options.columns[0].filter(function(option) {
-                    return option.field === $this.data('field');
-                })[0].order;
+                this.options.sortOrder = this.columns[this.fieldsColumnsIndex[$this.data('field')]].order;
             }
         }
         this.trigger('sort', this.options.sortName, this.options.sortOrder);
@@ -2063,13 +2061,18 @@
     BootstrapTable.prototype.initServer = function (silent, query, url) {
         var that = this,
             data = {},
+            index = $.inArray(this.options.sortName, this.header.fields),
             params = {
                 searchText: this.searchText,
                 sortName: this.options.sortName,
                 sortOrder: this.options.sortOrder
             },
             request;
 
+        if (this.header.sortNames[index]) {
+            params.sortName = this.header.sortNames[index];
+        }
+
         if (this.options.pagination) {
             params.pageSize = this.options.pageSize === this.options.formatAllRows() ?
                 this.options.totalRows : this.options.pageSize;