diff --git a/src/main/webapp/resources/js/base/base.js b/src/main/webapp/resources/js/base/base.js index 2fde6b5..3adcff6 100644 --- a/src/main/webapp/resources/js/base/base.js +++ b/src/main/webapp/resources/js/base/base.js @@ -629,12 +629,14 @@ $.fn.setPaging = function(config) { config.current = function(index, label) {return '
  • {label}
  • '.replace(/{label}/, label);}; config.next = function(index, label) {return ''.replace(/{func}/, config.func.replace(/{index}/, label));}; config.last = function(index, label) {return '
  • '.replace(/{func}/, config.func.replace(/{index}/, label));}; - + return this.each(function(){ - let list = config.list, - start = list.empty ? 0 : config.start + 1, - end = list.empty ? 0 : config.start + list.length, - pagingInfo = list.empty ? "" : start + " ~ " + numberFormat.format(end) + " / " + numberFormat.format(config.totalSize); + let length = config.list ? config.list.length : config.dataLength, + empty = length < 1, + start = empty ? 0 : config.start + 1, + end = empty ? 0 : config.start + length, + pagingInfo = empty ? "" : start + " ~ " + numberFormat.format(end) + " / " + numberFormat.format(config.totalSize); + $("#"+ config.prefix + "PagingInfo").html(pagingInfo); let tag = paginate(config), @@ -651,11 +653,13 @@ $.fn.setPaging = function(config) { $.fn.setPagingInfo = function(config) { return this.each(function(){ - let list = config.list; - let pagingInfo = list.empty ? "" : 1 - + " ~ " - + numberFormat.format(list.length) - + " / " + numberFormat.format(config.totalSize); + let length = config.list ? config.list.length : config.dataLength, + empty = length < 1, + pagingInfo = empty ? "" : 1 + + " ~ " + + numberFormat.format(length) + + " / " + numberFormat.format(config.totalSize); + $("#"+ config.prefix + "PagingInfo").html(pagingInfo); }); }