diff --git a/src/main/webapp/resources/js/base/base.js b/src/main/webapp/resources/js/base/base.js index e6871582..8c4ee226 100644 --- a/src/main/webapp/resources/js/base/base.js +++ b/src/main/webapp/resources/js/base/base.js @@ -632,6 +632,13 @@ $.fn.setPaging = function(config) { config.last = function(index, label) {return '
  • '.replace(/{func}/, config.func.replace(/{index}/, label));}; return this.each(function(){ + let list = config.list; + let pagingInfo = list.empty ? "" : 1 + + " ~ " + + numberFormat.format(list.length) + + " / " + numberFormat.format(config.totalSize); + $("#"+ config.prefix + "PagingInfo").html(pagingInfo); + let tag = paginate(config), container = $(this); if (tag) @@ -640,12 +647,16 @@ $.fn.setPaging = function(config) { if (config.hideIfEmpty != false) container.hide(); } - + + }); +} + +$.fn.setPagingInfo = function(config) { + return this.each(function(){ let list = config.list; - let pagingInfo = list.empty ? "" : - numberFormat.format(config.start + 1) + let pagingInfo = list.empty ? "" : 1 + " ~ " - + numberFormat.format(config.start + list.length) + + numberFormat.format(list.length) + " / " + numberFormat.format(config.totalSize); $("#"+ config.prefix + "PagingInfo").html(pagingInfo); }); diff --git a/src/main/webapp/resources/js/base/dataset.js b/src/main/webapp/resources/js/base/dataset.js index 76324a3b..1099c883 100644 --- a/src/main/webapp/resources/js/base/dataset.js +++ b/src/main/webapp/resources/js/base/dataset.js @@ -507,6 +507,8 @@ class Dataset { if (this.empty) return this.setData(obj); + + let state = this.state; let data = this._getDataItems(obj); this._items = this._items.concat(data.items); this._byKeys = {