Merge pull request #6679 from wenzhixin/fix/6635

Fixed getData bug with hidden rows

CHANGELOG.md

@@ -6,6 +6,7 @@ ChangeLog
 #### Core
 
 - **Update:** Fixed Maximum call stack size exceeded error.
+- **Update:** Fixed getData bug with hidden rows.
 
 ### 1.21.3
 

src/bootstrap-table.js

@@ -2457,16 +2457,16 @@ class BootstrapTable {
       data = this.data
     }
 
-    if (params && params.useCurrentPage) {
-      data = data.slice(this.pageFrom - 1, this.pageTo)
-    }
-
     if (params && !params.includeHiddenRows) {
       const hiddenRows = this.getHiddenRows()
 
       data = data.filter(row => Utils.findIndex(hiddenRows, row) === -1)
     }
 
+    if (params && params.useCurrentPage) {
+      data = data.slice(this.pageFrom - 1, this.pageTo)
+    }
+
     if (params && params.formatted) {
       data.forEach(row => {
         for (const [key, value] of Object.entries(row)) {