|
|
@@ -1236,9 +1236,13 @@ class BootstrapTable {
|
|
|
}
|
|
|
|
|
|
if (this.paginationParts.includes('pageInfo') || this.paginationParts.includes('pageInfoShort')) {
|
|
|
+ const totalRows = this.options.totalRows +
|
|
|
+ (this.options.sidePagination === 'client' &&
|
|
|
+ this.options.paginationLoadMore &&
|
|
|
+ !this._paginationLoaded ? ' +' : '')
|
|
|
const paginationInfo = this.paginationParts.includes('pageInfoShort') ?
|
|
|
- opts.formatDetailPagination(opts.totalRows) :
|
|
|
- opts.formatShowingRows(this.pageFrom, this.pageTo, opts.totalRows, opts.totalNotFiltered)
|
|
|
+ opts.formatDetailPagination(totalRows) :
|
|
|
+ opts.formatShowingRows(this.pageFrom, this.pageTo, totalRows, opts.totalNotFiltered)
|
|
|
|
|
|
html.push(`<span class="pagination-info">
|
|
|
${paginationInfo}
|
|
|
@@ -1428,7 +1432,13 @@ class BootstrapTable {
|
|
|
|
|
|
this.trigger('page-change', this.options.pageNumber, this.options.pageSize)
|
|
|
|
|
|
- if (this.options.sidePagination === 'server') {
|
|
|
+ if (
|
|
|
+ this.options.sidePagination === 'server' ||
|
|
|
+ this.options.sidePagination === 'client' &&
|
|
|
+ this.options.paginationLoadMore &&
|
|
|
+ !this._paginationLoaded &&
|
|
|
+ this.options.pageNumber === this.totalPages
|
|
|
+ ) {
|
|
|
this.initServer()
|
|
|
} else {
|
|
|
this.initBody()
|
|
|
@@ -2047,6 +2057,13 @@ class BootstrapTable {
|
|
|
const res = Utils.calculateObjectValue(this.options,
|
|
|
this.options.responseHandler, [_res, jqXHR], _res)
|
|
|
|
|
|
+ if (
|
|
|
+ this.options.sidePagination === 'client' &&
|
|
|
+ this.options.paginationLoadMore
|
|
|
+ ) {
|
|
|
+ this._paginationLoaded = this.data.length === res.length
|
|
|
+ }
|
|
|
+
|
|
|
this.load(res)
|
|
|
this.trigger('load-success', res, jqXHR && jqXHR.status, jqXHR)
|
|
|
if (!silent) {
|