Skip to content

Commit

Permalink
Fixed display error of total rows using load more pagination
Browse files Browse the repository at this point in the history
  • Loading branch information
wenzhixin committed Dec 21, 2024
1 parent 036e793 commit 78332ea
Show file tree
Hide file tree
Showing 6 changed files with 181 additions and 57 deletions.
11 changes: 0 additions & 11 deletions .stylelintrc

This file was deleted.

6 changes: 3 additions & 3 deletions cypress.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ export default defineConfig({
e2e: {
// We've imported your old cypress plugins here.
// You may want to clean this up later by importing these.
setupNodeEvents(on, config) {
setupNodeEvents (on, config) {
return plugins(on, config)
},
},
}
}
})
22 changes: 11 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,35 +13,35 @@
"@babel/core": "^7.26.0",
"@babel/eslint-parser": "^7.25.9",
"@babel/preset-env": "^7.26.0",
"@eslint/js": "^9.16.0",
"@eslint/js": "^9.17.0",
"@rollup/plugin-babel": "^6.0.4",
"@rollup/plugin-commonjs": "^28.0.1",
"@rollup/plugin-commonjs": "^28.0.2",
"@rollup/plugin-inject": "^5.0.5",
"@rollup/plugin-multi-entry": "^6.0.1",
"@rollup/plugin-node-resolve": "^16.0.0",
"@rollup/plugin-terser": "^0.4.4",
"@vitejs/plugin-vue": "^5.2.1",
"chalk": "^5.3.0",
"chalk": "^5.4.0",
"clean-css-cli": "^5.6.3",
"core-js": "^3.39.0",
"cross-env": "^7.0.3",
"cspell": "^8.16.1",
"cypress": "^13.16.1",
"cspell": "^8.17.1",
"cypress": "^13.17.0",
"editorconfig-checker": "^6.0.0",
"eslint": "^9.16.0",
"eslint": "^9.17.0",
"eslint-plugin-import": "^2.31.0",
"foreach-cli": "^1.8.1",
"glob": "^11.0.0",
"globals": "^15.13.0",
"globals": "^15.14.0",
"headr": "^0.0.4",
"npm-run-all": "^4.1.5",
"rimraf": "^6.0.1",
"rollup": "^4.28.1",
"rollup": "^4.29.1",
"rollup-plugin-copy": "^3.5.0",
"sass": "^1.82.0",
"stylelint": "^16.11.0",
"sass": "^1.83.0",
"stylelint": "^16.12.0",
"stylelint-config-standard-scss": "^14.0.0",
"vite": "^6.0.3",
"vite": "^6.0.5",
"vue": "^3.5.13"
},
"scripts": {
Expand Down
3 changes: 2 additions & 1 deletion src/bootstrap-table.js
Original file line number Diff line number Diff line change
Expand Up @@ -1257,7 +1257,8 @@ class BootstrapTable {
const totalRows = this.options.totalRows +
(this.options.sidePagination === 'client' &&
this.options.paginationLoadMore &&
!this._paginationLoaded ? ' +' : '')
!this._paginationLoaded &&
this.totalPages > 1 ? ' +' : '')
const paginationInfo = this.paginationParts.includes('pageInfoShort') ?
opts.formatDetailPagination(totalRows) :
opts.formatShowingRows(this.pageFrom, this.pageTo, totalRows, opts.totalNotFiltered)
Expand Down
11 changes: 11 additions & 0 deletions stylelint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
export default {
extends: 'stylelint-config-standard-scss',
rules: {
'alpha-value-notation': null,
'color-function-notation': null,
'hue-degree-notation': null,
'no-descending-specificity': null,
'scss/no-global-function-names': null,
'selector-not-notation': null
}
}
Loading

0 comments on commit 78332ea

Please sign in to comment.