fix(js): fix wenzhixin#1959, sort column shows hidden rows in `server…

…` side pagination
casdolfo · Jan 1, 2019 · ed0d259 · ed0d259
1 parent 2f311a9
commit ed0d259
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 ChangeLog
 ---------
 
+### 1.13.2
+
+- fix(js): fix #1959, sort column shows hidden rows in `server` side pagination
+
 ### 1.13.1
 
 - feat(js): add `theadClasses` option to supoort bootstrap v4

diff --git a/src/bootstrap-table.js b/src/bootstrap-table.js
@@ -256,6 +256,15 @@
     isIEBrowser () {
       return navigator.userAgent.includes('MSIE ') ||
         /Trident.*rv:11\./.test(navigator.userAgent)
+    },
+
+    findIndex (items, item) {
+      for (const [i, it] of items.entries()) {
+        if (JSON.stringify(it) === JSON.stringify(item)) {
+          return i
+        }
+      }
+      return -1
     }
   }
 
@@ -1639,7 +1648,7 @@
       let attributes = {}
       const htmlAttributes = []
 
-      if (this.hiddenRows.includes(item)) {
+      if (Utils.findIndex(this.hiddenRows, item) > -1) {
         return
       }
 
@@ -2646,7 +2655,7 @@
         return
       }
 
-      const index = this.hiddenRows.indexOf(row)
+      const index = Utils.findIndex(this.hiddenRows, row)
 
       if (!visible && index === -1) {
         this.hiddenRows.push(row)