Browse Source

Merge pull request #4226 from Falseee/du/feature/issue-3075

Show count of not filtered rows
文翼 6 years ago
parent
commit
a99b667c72
49 changed files with 284 additions and 50 deletions
  1. 27 0
      site/docs/api/table-options.md
  2. 21 2
      src/bootstrap-table.js
  3. 5 1
      src/locale/bootstrap-table-af-ZA.js
  4. 5 1
      src/locale/bootstrap-table-ar-SA.js
  5. 5 1
      src/locale/bootstrap-table-ca-ES.js
  6. 6 2
      src/locale/bootstrap-table-cs-CZ.js
  7. 5 1
      src/locale/bootstrap-table-da-DK.js
  8. 5 1
      src/locale/bootstrap-table-de-DE.js
  9. 5 1
      src/locale/bootstrap-table-el-GR.js
  10. 5 1
      src/locale/bootstrap-table-en-US.js
  11. 5 1
      src/locale/bootstrap-table-es-AR.js
  12. 5 1
      src/locale/bootstrap-table-es-CL.js
  13. 5 1
      src/locale/bootstrap-table-es-CR.js
  14. 5 1
      src/locale/bootstrap-table-es-ES.js
  15. 5 1
      src/locale/bootstrap-table-es-MX.js
  16. 5 1
      src/locale/bootstrap-table-es-NI.js
  17. 5 1
      src/locale/bootstrap-table-es-SP.js
  18. 5 1
      src/locale/bootstrap-table-et-EE.js
  19. 5 1
      src/locale/bootstrap-table-eu-EU.js
  20. 5 1
      src/locale/bootstrap-table-fa-IR.js
  21. 5 1
      src/locale/bootstrap-table-fi-FI.js
  22. 5 1
      src/locale/bootstrap-table-fr-BE.js
  23. 5 1
      src/locale/bootstrap-table-fr-FR.js
  24. 5 1
      src/locale/bootstrap-table-he-IL.js
  25. 5 1
      src/locale/bootstrap-table-hr-HR.js
  26. 5 1
      src/locale/bootstrap-table-hu-HU.js
  27. 5 1
      src/locale/bootstrap-table-id-ID.js
  28. 5 1
      src/locale/bootstrap-table-it-IT.js
  29. 5 1
      src/locale/bootstrap-table-ja-JP.js
  30. 5 1
      src/locale/bootstrap-table-ka-GE.js
  31. 5 1
      src/locale/bootstrap-table-ko-KR.js
  32. 5 1
      src/locale/bootstrap-table-ms-MY.js
  33. 5 1
      src/locale/bootstrap-table-nb-NO.js
  34. 5 1
      src/locale/bootstrap-table-nl-NL.js
  35. 5 1
      src/locale/bootstrap-table-pl-PL.js
  36. 5 1
      src/locale/bootstrap-table-pt-BR.js
  37. 5 1
      src/locale/bootstrap-table-pt-PT.js
  38. 5 1
      src/locale/bootstrap-table-ro-RO.js
  39. 5 1
      src/locale/bootstrap-table-ru-RU.js
  40. 5 1
      src/locale/bootstrap-table-sk-SK.js
  41. 5 1
      src/locale/bootstrap-table-sv-SE.js
  42. 5 1
      src/locale/bootstrap-table-th-TH.js
  43. 5 1
      src/locale/bootstrap-table-tr-TR.js
  44. 5 1
      src/locale/bootstrap-table-uk-UA.js
  45. 5 1
      src/locale/bootstrap-table-ur-PK.js
  46. 5 1
      src/locale/bootstrap-table-uz-Latn-UZ.js
  47. 5 1
      src/locale/bootstrap-table-vi-VN.js
  48. 5 1
      src/locale/bootstrap-table-zh-CN.js
  49. 5 1
      src/locale/bootstrap-table-zh-TW.js

+ 27 - 0
site/docs/api/table-options.md

@@ -500,6 +500,33 @@ The table options are defined in `jQuery.fn.bootstrapTable.defaults`.
 
 - **Example:** [Only Info Pagination](https://examples.bootstrap-table.com/#options/only-info-pagination.html)
 
+## showExtendedPagination
+
+- **Attribute:** `data-show-extended-pagination`
+
+- **Type:** `Boolean`
+
+- **Detail:**
+
+  Set `true` to show a extended version of pagination (including the count of all rows with out filters).
+  If you use pagination on the server side pls use totalNotFilteredField to define the count.
+
+- **Default:** `false`
+
+- **Example:** [Only Info Pagination](https://examples.bootstrap-table.com/#options/show-extended-pagination.html)
+
+## totalNotFilteredField
+
+- **Attribute:** `data-total-not-filtered-field`
+
+- **Type:** `string`
+
+- **Detail:**
+
+  The field from the json response which will used for showExtendedPagination.
+
+- **Default:** `totalNotFiltered`
+
 ## paginationLoop
 
 - **Attribute:** `data-pagination-loop`

+ 21 - 2
src/bootstrap-table.js

@@ -394,12 +394,15 @@
       return res
     },
     totalField: 'total',
+    totalNotFilteredField: 'totalNotFiltered',
     dataField: 'rows',
     pagination: false,
     onlyInfoPagination: false,
+    showExtendedPagination: false,
     paginationLoop: true,
     sidePagination: 'client', // client or server
     totalRows: 0,
+    totalNotFiltered: 0,
     pageNumber: 1,
     pageSize: 10,
     pageList: [10, 25, 50, 100],
@@ -554,7 +557,11 @@
     formatRecordsPerPage (pageNumber) {
       return `${pageNumber} rows per page`
     },
-    formatShowingRows (pageFrom, pageTo, totalRows) {
+    formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
+      if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
+        return `Showing ${pageFrom} to ${pageTo} of ${totalRows} rows (filtered from ${totalNotFiltered} total entries)`
+      }
+
       return `Showing ${pageFrom} to ${pageTo} of ${totalRows} rows`
     },
     formatDetailPagination (totalRows) {
@@ -1518,9 +1525,17 @@
         this.pageTo = o.totalRows
       }
 
+      if (this.options.pagination && this.options.sidePagination !== 'server') {
+        this.options.totalNotFiltered = this.options.data.length
+      }
+
+      if (!this.options.showExtendedPagination) {
+        this.options.totalNotFiltered = undefined
+      }
+
       const paginationInfo = o.onlyInfoPagination ?
         o.formatDetailPagination(o.totalRows) :
-        o.formatShowingRows(this.pageFrom, this.pageTo, o.totalRows)
+        o.formatShowingRows(this.pageFrom, this.pageTo, o.totalRows, o.totalNotFiltered)
 
       html.push(`<div class="${this.constants.classes.pull}-${o.paginationDetailHAlign} pagination-detail">
         <span class="pagination-info">
@@ -2634,6 +2649,10 @@
         this.options.totalRows = data[this.options.totalField]
       }
 
+      if (this.options.pagination && this.options.sidePagination === 'server') {
+        this.options.totalNotFiltered = data[this.options.totalNotFilteredField]
+      }
+
       fixedScroll = data.fixedScroll
       data = Array.isArray(data) ? data : data[this.options.dataField]
 

+ 5 - 1
src/locale/bootstrap-table-af-ZA.js

@@ -10,7 +10,11 @@
     formatRecordsPerPage (pageNumber) {
       return `${pageNumber} rekords per bladsy`
     },
-    formatShowingRows (pageFrom, pageTo, totalRows) {
+    formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
+      if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
+        return `Resultate ${pageFrom} tot ${pageTo} van ${totalRows} rye (filtered from ${totalNotFiltered} total entries)`
+      }
+
       return `Resultate ${pageFrom} tot ${pageTo} van ${totalRows} rye`
     },
     formatDetailPagination (totalRows) {

+ 5 - 1
src/locale/bootstrap-table-ar-SA.js

@@ -10,7 +10,11 @@
     formatRecordsPerPage (pageNumber) {
       return `${pageNumber} سجل لكل صفحة`
     },
-    formatShowingRows (pageFrom, pageTo, totalRows) {
+    formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
+      if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
+        return `الظاهر ${pageFrom} إلى ${pageTo} من ${totalRows} سجل ${totalNotFiltered} total entries)`
+      }
+
       return `الظاهر ${pageFrom} إلى ${pageTo} من ${totalRows} سجل`
     },
     formatDetailPagination (totalRows) {

+ 5 - 1
src/locale/bootstrap-table-ca-ES.js

@@ -11,7 +11,11 @@
     formatRecordsPerPage (pageNumber) {
       return `${pageNumber} resultats per pàgina`
     },
-    formatShowingRows (pageFrom, pageTo, totalRows) {
+    formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
+      if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
+        return `Mostrant de ${pageFrom} fins ${pageTo} - total ${totalRows} resultats (filtered from ${totalNotFiltered} total entries)`
+      }
+
       return `Mostrant de ${pageFrom} fins ${pageTo} - total ${totalRows} resultats`
     },
     formatDetailPagination (totalRows) {

+ 6 - 2
src/locale/bootstrap-table-cs-CZ.js

@@ -11,8 +11,12 @@
     formatRecordsPerPage (pageNumber) {
       return `${pageNumber} položek na stránku`
     },
-    formatShowingRows (pageFrom, pageTo, totalRows) {
-      return `Zobrazena ${pageFrom}. - ${pageTo}. položka z celkových ${totalRows}`
+    formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
+      if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
+        return `Zobrazena ${pageFrom}. - ${pageTo} . položka z celkových ${totalRows} (filtered from ${totalNotFiltered} total entries)`
+      }
+
+      return `Zobrazena ${pageFrom}. - ${pageTo} . položka z celkových ${totalRows}`
     },
     formatDetailPagination (totalRows) {
       return `Showing ${totalRows} rows`

+ 5 - 1
src/locale/bootstrap-table-da-DK.js

@@ -10,7 +10,11 @@
     formatRecordsPerPage (pageNumber) {
       return `${pageNumber} poster pr side`
     },
-    formatShowingRows (pageFrom, pageTo, totalRows) {
+    formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
+      if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
+        return `Viser ${pageFrom} til ${pageTo} af ${totalRows} række${(totalRows > 1) ? 'r' : ''} (filtered from ${totalNotFiltered} total entries)`
+      }
+
       return `Viser ${pageFrom} til ${pageTo} af ${totalRows} række${(totalRows > 1) ? 'r' : ''}`
     },
     formatDetailPagination (totalRows) {

+ 5 - 1
src/locale/bootstrap-table-de-DE.js

@@ -10,7 +10,11 @@
     formatRecordsPerPage (pageNumber) {
       return `${pageNumber} Zeilen pro Seite.`
     },
-    formatShowingRows (pageFrom, pageTo, totalRows) {
+    formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
+      if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
+        return `Zeige Zeile ${pageFrom} bis ${pageTo} von ${totalRows} Zeile${(totalRows > 1) ? 'n' : ''} (Gefiltert von ${totalNotFiltered} Zeile${(totalNotFiltered > 1) ? 'n' : ''})`
+      }
+
       return `Zeige Zeile ${pageFrom} bis ${pageTo} von ${totalRows} Zeile${(totalRows > 1) ? 'n' : ''}.`
     },
     formatDetailPagination (totalRows) {

+ 5 - 1
src/locale/bootstrap-table-el-GR.js

@@ -10,7 +10,11 @@
     formatRecordsPerPage (pageNumber) {
       return `${pageNumber} αποτελέσματα ανά σελίδα`
     },
-    formatShowingRows (pageFrom, pageTo, totalRows) {
+    formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
+      if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
+        return `Εμφανίζονται από την ${pageFrom} ως την ${pageTo} από σύνολο ${totalRows} σειρών (filtered from ${totalNotFiltered} total entries)`
+      }
+
       return `Εμφανίζονται από την ${pageFrom} ως την ${pageTo} από σύνολο ${totalRows} σειρών`
     },
     formatDetailPagination (totalRows) {

+ 5 - 1
src/locale/bootstrap-table-en-US.js

@@ -10,7 +10,11 @@
     formatRecordsPerPage (pageNumber) {
       return `${pageNumber} rows per page`
     },
-    formatShowingRows (pageFrom, pageTo, totalRows) {
+    formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
+      if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
+        return `Showing ${pageFrom} to ${pageTo} of ${totalRows} rows (filtered from ${totalNotFiltered} total entries)`
+      }
+
       return `Showing ${pageFrom} to ${pageTo} of ${totalRows} rows`
     },
     formatDetailPagination (totalRows) {

+ 5 - 1
src/locale/bootstrap-table-es-AR.js

@@ -10,7 +10,11 @@
     formatRecordsPerPage (pageNumber) {
       return `${pageNumber} registros por página`
     },
-    formatShowingRows (pageFrom, pageTo, totalRows) {
+    formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
+      if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
+        return `Mostrando ${pageFrom} a ${pageTo} de ${totalRows} filas (filtered from ${totalNotFiltered} total entries)`
+      }
+
       return `Mostrando ${pageFrom} a ${pageTo} de ${totalRows} filas`
     },
     formatDetailPagination (totalRows) {

+ 5 - 1
src/locale/bootstrap-table-es-CL.js

@@ -11,7 +11,11 @@
     formatRecordsPerPage (pageNumber) {
       return `${pageNumber} filas por p\u00E1gina`
     },
-    formatShowingRows (pageFrom, pageTo, totalRows) {
+    formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
+      if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
+        return `Mostrando ${pageFrom} a ${pageTo} de ${totalRows} filas (filtered from ${totalNotFiltered} total entries)`
+      }
+
       return `Mostrando ${pageFrom} a ${pageTo} de ${totalRows} filas`
     },
     formatDetailPagination (totalRows) {

+ 5 - 1
src/locale/bootstrap-table-es-CR.js

@@ -10,7 +10,11 @@
     formatRecordsPerPage (pageNumber) {
       return `${pageNumber} registros por página`
     },
-    formatShowingRows (pageFrom, pageTo, totalRows) {
+    formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
+      if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
+        return `Mostrando de ${pageFrom} a ${pageTo} registros de ${totalRows} registros en total (filtered from ${totalNotFiltered} total entries)`
+      }
+
       return `Mostrando de ${pageFrom} a ${pageTo} registros de ${totalRows} registros en total`
     },
     formatDetailPagination (totalRows) {

+ 5 - 1
src/locale/bootstrap-table-es-ES.js

@@ -10,7 +10,11 @@
     formatRecordsPerPage (pageNumber) {
       return `${pageNumber} resultados por página`
     },
-    formatShowingRows (pageFrom, pageTo, totalRows) {
+    formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
+      if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
+        return `Mostrando desde ${pageFrom} hasta ${pageTo} - En total ${totalRows} resultados (filtered from ${totalNotFiltered} total entries)`
+      }
+
       return `Mostrando desde ${pageFrom} hasta ${pageTo} - En total ${totalRows} resultados`
     },
     formatDetailPagination (totalRows) {

+ 5 - 1
src/locale/bootstrap-table-es-MX.js

@@ -12,7 +12,11 @@
     formatRecordsPerPage (pageNumber) {
       return `${pageNumber} registros por página`
     },
-    formatShowingRows (pageFrom, pageTo, totalRows) {
+    formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
+      if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
+        return `Mostrando ${pageFrom} a ${pageTo} de ${totalRows} filas (filtered from ${totalNotFiltered} total entries)`
+      }
+
       return `Mostrando ${pageFrom} a ${pageTo} de ${totalRows} filas`
     },
     formatDetailPagination (totalRows) {

+ 5 - 1
src/locale/bootstrap-table-es-NI.js

@@ -10,7 +10,11 @@
     formatRecordsPerPage (pageNumber) {
       return `${pageNumber} registros por página`
     },
-    formatShowingRows (pageFrom, pageTo, totalRows) {
+    formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
+      if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
+        return `Mostrando de ${pageFrom} a ${pageTo} registros de ${totalRows} registros en total (filtered from ${totalNotFiltered} total entries)`
+      }
+
       return `Mostrando de ${pageFrom} a ${pageTo} registros de ${totalRows} registros en total`
     },
     formatDetailPagination (totalRows) {

+ 5 - 1
src/locale/bootstrap-table-es-SP.js

@@ -10,7 +10,11 @@
     formatRecordsPerPage (pageNumber) {
       return `${pageNumber} registros por p&#225;gina.`
     },
-    formatShowingRows (pageFrom, pageTo, totalRows) {
+    formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
+      if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
+        return `${pageFrom} - ${pageTo} de ${totalRows} registros (filtered from ${totalNotFiltered} total entries)`
+      }
+
       return `${pageFrom} - ${pageTo} de ${totalRows} registros.`
     },
     formatDetailPagination (totalRows) {

+ 5 - 1
src/locale/bootstrap-table-et-EE.js

@@ -10,7 +10,11 @@
     formatRecordsPerPage (pageNumber) {
       return `${pageNumber} rida lehe kohta`
     },
-    formatShowingRows (pageFrom, pageTo, totalRows) {
+    formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
+      if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
+        return `Näitan tulemusi ${pageFrom} kuni ${pageTo} - kokku ${totalRows} tulemust (filtered from ${totalNotFiltered} total entries)`
+      }
+
       return `Näitan tulemusi ${pageFrom} kuni ${pageTo} - kokku ${totalRows} tulemust`
     },
     formatDetailPagination (totalRows) {

+ 5 - 1
src/locale/bootstrap-table-eu-EU.js

@@ -10,7 +10,11 @@
     formatRecordsPerPage (pageNumber) {
       return `${pageNumber} emaitza orriko.`
     },
-    formatShowingRows (pageFrom, pageTo, totalRows) {
+    formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
+      if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
+        return `${totalRows} erregistroetatik ${pageFrom}etik ${pageTo}erakoak erakusten (filtered from ${totalNotFiltered} total entries)`
+      }
+
       return `${totalRows} erregistroetatik ${pageFrom}etik ${pageTo}erakoak erakusten.`
     },
     formatDetailPagination (totalRows) {

+ 5 - 1
src/locale/bootstrap-table-fa-IR.js

@@ -10,7 +10,11 @@
     formatRecordsPerPage (pageNumber) {
       return `${pageNumber} رکورد در صفحه`
     },
-    formatShowingRows (pageFrom, pageTo, totalRows) {
+    formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
+      if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
+        return `نمایش ${pageFrom} تا ${pageTo} از ${totalRows} ردیف (filtered from ${totalNotFiltered} total entries)`
+      }
+
       return `نمایش ${pageFrom} تا ${pageTo} از ${totalRows} ردیف`
     },
     formatDetailPagination (totalRows) {

+ 5 - 1
src/locale/bootstrap-table-fi-FI.js

@@ -10,7 +10,11 @@
     formatRecordsPerPage (pageNumber) {
       return `${pageNumber} riviä sivulla`
     },
-    formatShowingRows (pageFrom, pageTo, totalRows) {
+    formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
+      if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
+        return `Näytetään rivit ${pageFrom} - ${pageTo} / ${totalRows} (filtered from ${totalNotFiltered} total entries)`
+      }
+
       return `Näytetään rivit ${pageFrom} - ${pageTo} / ${totalRows}`
     },
     formatDetailPagination (totalRows) {

+ 5 - 1
src/locale/bootstrap-table-fr-BE.js

@@ -10,7 +10,11 @@
     formatRecordsPerPage (pageNumber) {
       return `${pageNumber} entrées par page`
     },
-    formatShowingRows (pageFrom, pageTo, totalRows) {
+    formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
+      if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
+        return `Affiche de${pageFrom} à ${pageTo} sur ${totalRows} lignes (filtered from ${totalNotFiltered} total entries)`
+      }
+
       return `Affiche de${pageFrom} à ${pageTo} sur ${totalRows} lignes`
     },
     formatDetailPagination (totalRows) {

+ 5 - 1
src/locale/bootstrap-table-fr-FR.js

@@ -11,7 +11,11 @@
     formatRecordsPerPage (pageNumber) {
       return `${pageNumber} lignes par page`
     },
-    formatShowingRows (pageFrom, pageTo, totalRows) {
+    formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
+      if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
+        return `Affichage des lignes ${pageFrom} à ${pageTo} sur ${totalRows} lignes au total (filtered from ${totalNotFiltered} total entries)`
+      }
+
       return `Affichage des lignes ${pageFrom} à ${pageTo} sur ${totalRows} lignes au total`
     },
     formatDetailPagination (totalRows) {

+ 5 - 1
src/locale/bootstrap-table-he-IL.js

@@ -10,7 +10,11 @@
     formatRecordsPerPage (pageNumber) {
       return `${pageNumber} שורות בעמוד`
     },
-    formatShowingRows (pageFrom, pageTo, totalRows) {
+    formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
+      if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
+        return `מציג ${pageFrom} עד ${pageTo} מ-${totalRows}שורות${totalNotFiltered} total entries)`
+      }
+
       return `מציג ${pageFrom} עד ${pageTo} מ-${totalRows} שורות`
     },
     formatDetailPagination (totalRows) {

+ 5 - 1
src/locale/bootstrap-table-hr-HR.js

@@ -11,7 +11,11 @@
     formatRecordsPerPage (pageNumber) {
       return `${pageNumber} broj zapisa po stranici`
     },
-    formatShowingRows (pageFrom, pageTo, totalRows) {
+    formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
+      if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
+        return `Prikazujem ${pageFrom}. - ${pageTo}. od ukupnog broja zapisa ${totalRows} (filtered from ${totalNotFiltered} total entries)`
+      }
+
       return `Prikazujem ${pageFrom}. - ${pageTo}. od ukupnog broja zapisa ${totalRows}`
     },
     formatDetailPagination (totalRows) {

+ 5 - 1
src/locale/bootstrap-table-hu-HU.js

@@ -10,7 +10,11 @@
     formatRecordsPerPage (pageNumber) {
       return `${pageNumber} rekord per oldal`
     },
-    formatShowingRows (pageFrom, pageTo, totalRows) {
+    formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
+      if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
+        return `Megjelenítve ${pageFrom} - ${pageTo} / ${totalRows} összesen (filtered from ${totalNotFiltered} total entries)`
+      }
+
       return `Megjelenítve ${pageFrom} - ${pageTo} / ${totalRows} összesen`
     },
     formatDetailPagination (totalRows) {

+ 5 - 1
src/locale/bootstrap-table-id-ID.js

@@ -10,7 +10,11 @@
     formatRecordsPerPage (pageNumber) {
       return `${pageNumber} baris per halaman`
     },
-    formatShowingRows (pageFrom, pageTo, totalRows) {
+    formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
+      if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
+        return `Menampilkan ${pageFrom} sampai ${pageTo} dari ${totalRows} baris (filtered from ${totalNotFiltered} total entries)`
+      }
+
       return `Menampilkan ${pageFrom} sampai ${pageTo} dari ${totalRows} baris`
     },
     formatDetailPagination (totalRows) {

+ 5 - 1
src/locale/bootstrap-table-it-IT.js

@@ -12,7 +12,11 @@
     formatRecordsPerPage (pageNumber) {
       return `${pageNumber} elementi per pagina`
     },
-    formatShowingRows (pageFrom, pageTo, totalRows) {
+    formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
+      if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
+        return `Visualizzazione da ${pageFrom} a ${pageTo} di ${totalRows} elementi (filtered from ${totalNotFiltered} total entries)`
+      }
+
       return `Visualizzazione da ${pageFrom} a ${pageTo} di ${totalRows} elementi`
     },
     formatDetailPagination (totalRows) {

+ 5 - 1
src/locale/bootstrap-table-ja-JP.js

@@ -10,7 +10,11 @@
     formatRecordsPerPage (pageNumber) {
       return `ページ当たり最大${pageNumber}件`
     },
-    formatShowingRows (pageFrom, pageTo, totalRows) {
+    formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
+      if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
+        return `全${totalRows}件から、${pageFrom}から${pageTo}件目まで表示しています (filtered from ${totalNotFiltered} total entries)`
+      }
+
       return `全${totalRows}件から、${pageFrom}から${pageTo}件目まで表示しています`
     },
     formatDetailPagination (totalRows) {

+ 5 - 1
src/locale/bootstrap-table-ka-GE.js

@@ -10,7 +10,11 @@
     formatRecordsPerPage (pageNumber) {
       return `${pageNumber} ჩანაწერი თითო გვერდზე`
     },
-    formatShowingRows (pageFrom, pageTo, totalRows) {
+    formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
+      if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
+        return `ნაჩვენებია ${pageFrom}-დან ${pageTo}-მდე ჩანაწერი ჯამური ${totalRows}-დან (filtered from ${totalNotFiltered} total entries)`
+      }
+
       return `ნაჩვენებია ${pageFrom}-დან ${pageTo}-მდე ჩანაწერი ჯამური ${totalRows}-დან`
     },
     formatDetailPagination (totalRows) {

+ 5 - 1
src/locale/bootstrap-table-ko-KR.js

@@ -10,7 +10,11 @@
     formatRecordsPerPage (pageNumber) {
       return `페이지 당 ${pageNumber}개 데이터 출력`
     },
-    formatShowingRows (pageFrom, pageTo, totalRows) {
+    formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
+      if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
+        return `전체 ${totalRows}개 중 ${pageFrom}~${pageTo}번째 데이터 출력, (filtered from ${totalNotFiltered} total entries)`
+      }
+
       return `전체 ${totalRows}개 중 ${pageFrom}~${pageTo}번째 데이터 출력,`
     },
     formatDetailPagination (totalRows) {

+ 5 - 1
src/locale/bootstrap-table-ms-MY.js

@@ -10,7 +10,11 @@
     formatRecordsPerPage (pageNumber) {
       return `${pageNumber} rekod setiap muka surat`
     },
-    formatShowingRows (pageFrom, pageTo, totalRows) {
+    formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
+      if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
+        return `Sedang memaparkan rekod ${pageFrom} hingga ${pageTo} daripada jumlah ${totalRows} rekod (filtered from ${totalNotFiltered} total entries)`
+      }
+
       return `Sedang memaparkan rekod ${pageFrom} hingga ${pageTo} daripada jumlah ${totalRows} rekod`
     },
     formatDetailPagination (totalRows) {

+ 5 - 1
src/locale/bootstrap-table-nb-NO.js

@@ -10,7 +10,11 @@
     formatRecordsPerPage (pageNumber) {
       return `${pageNumber} poster pr side`
     },
-    formatShowingRows (pageFrom, pageTo, totalRows) {
+    formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
+      if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
+        return `Viser ${pageFrom} til ${pageTo} av ${totalRows} rekker (filtered from ${totalNotFiltered} total entries)`
+      }
+
       return `Viser ${pageFrom} til ${pageTo} av ${totalRows} rekker`
     },
     formatDetailPagination (totalRows) {

+ 5 - 1
src/locale/bootstrap-table-nl-NL.js

@@ -10,7 +10,11 @@
     formatRecordsPerPage (pageNumber) {
       return `${pageNumber} records per pagina`
     },
-    formatShowingRows (pageFrom, pageTo, totalRows) {
+    formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
+      if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
+        return `Toon ${pageFrom} tot ${pageTo} van ${totalRows} record${(totalRows > 1) ? 's' : ''} (filtered from ${totalNotFiltered} total entries)`
+      }
+
       return `Toon ${pageFrom} tot ${pageTo} van ${totalRows} record${(totalRows > 1) ? 's' : ''}`
     },
     formatDetailPagination (totalRows) {

+ 5 - 1
src/locale/bootstrap-table-pl-PL.js

@@ -10,7 +10,11 @@
     formatRecordsPerPage (pageNumber) {
       return `${pageNumber} rekordów na stronę`
     },
-    formatShowingRows (pageFrom, pageTo, totalRows) {
+    formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
+      if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
+        return `Wyświetlanie rekordów od ${pageFrom} do ${pageTo} z ${totalRows} (filtered from ${totalNotFiltered} total entries)`
+      }
+
       return `Wyświetlanie rekordów od ${pageFrom} do ${pageTo} z ${totalRows}`
     },
     formatDetailPagination (totalRows) {

+ 5 - 1
src/locale/bootstrap-table-pt-BR.js

@@ -11,7 +11,11 @@
     formatRecordsPerPage (pageNumber) {
       return `${pageNumber} registros por página`
     },
-    formatShowingRows (pageFrom, pageTo, totalRows) {
+    formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
+      if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
+        return `Exibindo ${pageFrom} até ${pageTo} de ${totalRows} linhas (filtered from ${totalNotFiltered} total entries)`
+      }
+
       return `Exibindo ${pageFrom} até ${pageTo} de ${totalRows} linhas`
     },
     formatDetailPagination (totalRows) {

+ 5 - 1
src/locale/bootstrap-table-pt-PT.js

@@ -10,7 +10,11 @@
     formatRecordsPerPage (pageNumber) {
       return `${pageNumber} registos por p&aacute;gina`
     },
-    formatShowingRows (pageFrom, pageTo, totalRows) {
+    formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
+      if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
+        return `A mostrar ${pageFrom} at&eacute; ${pageTo} de ${totalRows} linhas (filtered from ${totalNotFiltered} total entries)`
+      }
+
       return `A mostrar ${pageFrom} at&eacute; ${pageTo} de ${totalRows} linhas`
     },
     formatDetailPagination (totalRows) {

+ 5 - 1
src/locale/bootstrap-table-ro-RO.js

@@ -10,7 +10,11 @@
     formatRecordsPerPage (pageNumber) {
       return `${pageNumber} inregistrari pe pagina`
     },
-    formatShowingRows (pageFrom, pageTo, totalRows) {
+    formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
+      if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
+        return `Arata de la ${pageFrom} pana la ${pageTo} din ${totalRows} randuri (filtered from ${totalNotFiltered} total entries)`
+      }
+
       return `Arata de la ${pageFrom} pana la ${pageTo} din ${totalRows} randuri`
     },
     formatDetailPagination (totalRows) {

+ 5 - 1
src/locale/bootstrap-table-ru-RU.js

@@ -10,7 +10,11 @@
     formatRecordsPerPage (pageNumber) {
       return `${pageNumber} записей на страницу`
     },
-    formatShowingRows (pageFrom, pageTo, totalRows) {
+    formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
+      if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
+        return `Записи с ${pageFrom} по ${pageTo} из ${totalRows} (filtered from ${totalNotFiltered} total entries)`
+      }
+
       return `Записи с ${pageFrom} по ${pageTo} из ${totalRows}`
     },
     formatDetailPagination (totalRows) {

+ 5 - 1
src/locale/bootstrap-table-sk-SK.js

@@ -10,7 +10,11 @@
     formatRecordsPerPage (pageNumber) {
       return `${pageNumber} záznamov na stranu`
     },
-    formatShowingRows (pageFrom, pageTo, totalRows) {
+    formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
+      if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
+        return `Zobrazená ${pageFrom}. - ${pageTo}. položka z celkových ${totalRows} (filtered from ${totalNotFiltered} total entries)`
+      }
+
       return `Zobrazená ${pageFrom}. - ${pageTo}. položka z celkových ${totalRows}`
     },
     formatDetailPagination (totalRows) {

+ 5 - 1
src/locale/bootstrap-table-sv-SE.js

@@ -10,7 +10,11 @@
     formatRecordsPerPage (pageNumber) {
       return `${pageNumber} rader per sida`
     },
-    formatShowingRows (pageFrom, pageTo, totalRows) {
+    formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
+      if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
+        return `Visa ${pageFrom} till ${pageTo} av ${totalRows} rader (filtered from ${totalNotFiltered} total entries)`
+      }
+
       return `Visa ${pageFrom} till ${pageTo} av ${totalRows} rader`
     },
     formatDetailPagination (totalRows) {

+ 5 - 1
src/locale/bootstrap-table-th-TH.js

@@ -10,7 +10,11 @@
     formatRecordsPerPage (pageNumber) {
       return `${pageNumber} รายการต่อหน้า`
     },
-    formatShowingRows (pageFrom, pageTo, totalRows) {
+    formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
+      if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
+        return `รายการที่ ${pageFrom} ถึง ${pageTo} จากทั้งหมด ${totalRows} รายการ (filtered from ${totalNotFiltered} total entries)`
+      }
+
       return `รายการที่ ${pageFrom} ถึง ${pageTo} จากทั้งหมด ${totalRows} รายการ`
     },
     formatDetailPagination (totalRows) {

+ 5 - 1
src/locale/bootstrap-table-tr-TR.js

@@ -11,7 +11,11 @@
     formatRecordsPerPage (pageNumber) {
       return `Sayfa başına ${pageNumber} kayıt.`
     },
-    formatShowingRows (pageFrom, pageTo, totalRows) {
+    formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
+      if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
+        return `${totalRows} kayıttan ${pageFrom}-${pageTo} arası gösteriliyor (filtered from ${totalNotFiltered} total entries).`
+      }
+
       return `${totalRows} kayıttan ${pageFrom}-${pageTo} arası gösteriliyor.`
     },
     formatDetailPagination (totalRows) {

+ 5 - 1
src/locale/bootstrap-table-uk-UA.js

@@ -10,7 +10,11 @@
     formatRecordsPerPage (pageNumber) {
       return `${pageNumber} записів на сторінку`
     },
-    formatShowingRows (pageFrom, pageTo, totalRows) {
+    formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
+      if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
+        return `Показано з ${pageFrom} по ${pageTo}. Всього: ${totalRows} (filtered from ${totalNotFiltered} total entries)`
+      }
+
       return `Показано з ${pageFrom} по ${pageTo}. Всього: ${totalRows}`
     },
     formatDetailPagination (totalRows) {

+ 5 - 1
src/locale/bootstrap-table-ur-PK.js

@@ -10,7 +10,11 @@
     formatRecordsPerPage (pageNumber) {
       return `${pageNumber} ریکارڈز فی صفہ `
     },
-    formatShowingRows (pageFrom, pageTo, totalRows) {
+    formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
+      if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
+        return `دیکھیں ${pageFrom} سے ${pageTo} کے ${totalRows}ریکارڈز (filtered from ${totalNotFiltered} total entries)`
+      }
+
       return `دیکھیں ${pageFrom} سے ${pageTo} کے ${totalRows}ریکارڈز`
     },
     formatDetailPagination (totalRows) {

+ 5 - 1
src/locale/bootstrap-table-uz-Latn-UZ.js

@@ -10,7 +10,11 @@
     formatRecordsPerPage (pageNumber) {
       return `${pageNumber} qator har sahifada`
     },
-    formatShowingRows (pageFrom, pageTo, totalRows) {
+    formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
+      if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
+        return `Ko'rsatypati ${pageFrom} dan ${pageTo} gacha ${totalRows} qatorlarni (filtered from ${totalNotFiltered} total entries)`
+      }
+
       return `Ko'rsatypati ${pageFrom} dan ${pageTo} gacha ${totalRows} qatorlarni`
     },
     formatDetailPagination (totalRows) {

+ 5 - 1
src/locale/bootstrap-table-vi-VN.js

@@ -10,7 +10,11 @@
     formatRecordsPerPage (pageNumber) {
       return `${pageNumber} bản ghi mỗi trang`
     },
-    formatShowingRows (pageFrom, pageTo, totalRows) {
+    formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
+      if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
+        return `Hiển thị từ trang ${pageFrom} đến ${pageTo} của ${totalRows} bảng ghi (filtered from ${totalNotFiltered} total entries)`
+      }
+
       return `Hiển thị từ trang ${pageFrom} đến ${pageTo} của ${totalRows} bảng ghi`
     },
     formatDetailPagination (totalRows) {

+ 5 - 1
src/locale/bootstrap-table-zh-CN.js

@@ -10,7 +10,11 @@
     formatRecordsPerPage (pageNumber) {
       return `每页显示 ${pageNumber} 条记录`
     },
-    formatShowingRows (pageFrom, pageTo, totalRows) {
+    formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
+      if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
+        return `显示第 ${pageFrom} 到第 ${pageTo} 条记录,总共 ${totalRows} 条记录 (filtered from ${totalNotFiltered} total entries)`
+      }
+
       return `显示第 ${pageFrom} 到第 ${pageTo} 条记录,总共 ${totalRows} 条记录`
     },
     formatDetailPagination (totalRows) {

+ 5 - 1
src/locale/bootstrap-table-zh-TW.js

@@ -10,7 +10,11 @@
     formatRecordsPerPage (pageNumber) {
       return `每頁顯示 ${pageNumber} 項記錄`
     },
-    formatShowingRows (pageFrom, pageTo, totalRows) {
+    formatShowingRows (pageFrom, pageTo, totalRows, totalNotFiltered) {
+      if (totalNotFiltered !== undefined && totalNotFiltered > 0 && totalNotFiltered < totalRows) {
+        return `顯示第 ${pageFrom} 到第 ${pageTo} 項記錄,總共 ${totalRows} 項記錄 (filtered from ${totalNotFiltered} total entries)`
+      }
+
       return `顯示第 ${pageFrom} 到第 ${pageTo} 項記錄,總共 ${totalRows} 項記錄`
     },
     formatDetailPagination (totalRows) {