fix : 페이징 관련 변수명 변경

main
이범준 2 years ago
parent c1b7263bed
commit 8abbd51ee4

@ -84,8 +84,8 @@ public class SendRqstMngController extends AbstractController {
/** paging */ /** paging */
PaginationInfo paginationInfo = new PaginationInfo(); PaginationInfo paginationInfo = new PaginationInfo();
paginationInfo.setCurrentPageNo(searchVO.getPage()>-1?searchVO.getPage():searchVO.getPageIndex()); paginationInfo.setCurrentPageNo(searchVO.getPageNum()>-1?searchVO.getPageNum():searchVO.getPageIndex());
paginationInfo.setRecordCountPerPage(searchVO.getPerPage()>-1?searchVO.getPerPage():searchVO.getPageUnit()); paginationInfo.setRecordCountPerPage(searchVO.getFetchSize()>-1?searchVO.getFetchSize():searchVO.getPageUnit());
paginationInfo.setPageSize(searchVO.getPageSize()); paginationInfo.setPageSize(searchVO.getPageSize());
searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
searchVO.setLastIndex(paginationInfo.getLastRecordIndex()); searchVO.setLastIndex(paginationInfo.getLastRecordIndex());
@ -110,7 +110,7 @@ public class SendRqstMngController extends AbstractController {
Map<String, Object> data = new HashMap<String, Object>(); Map<String, Object> data = new HashMap<String, Object>();
data.put("contents", list); //[tui Grid] data-contents data.put("contents", list); //[tui Grid] data-contents
Map<String, Integer> pagination = new HashMap<String, Integer>(); Map<String, Integer> pagination = new HashMap<String, Integer>();
pagination.put("page", searchVO.getPage()); pagination.put("pageNum", searchVO.getPageNum());
pagination.put("totalCount", totCnt); pagination.put("totalCount", totCnt);
data.put("pagination", pagination); //[tui Grid] data-paging data.put("pagination", pagination); //[tui Grid] data-paging
model.addAttribute("data", data); //[tui Grid] data model.addAttribute("data", data); //[tui Grid] data
@ -180,8 +180,8 @@ public class SendRqstMngController extends AbstractController {
/** paging */ /** paging */
PaginationInfo paginationInfo = new PaginationInfo(); PaginationInfo paginationInfo = new PaginationInfo();
paginationInfo.setCurrentPageNo(searchVO.getPage()>-1?searchVO.getPage():searchVO.getPageIndex()); paginationInfo.setCurrentPageNo(searchVO.getPageNum()>-1?searchVO.getPageNum():searchVO.getPageIndex());
paginationInfo.setRecordCountPerPage(searchVO.getPerPage()>-1?searchVO.getPerPage():searchVO.getPageUnit()); paginationInfo.setRecordCountPerPage(searchVO.getFetchSize()>-1?searchVO.getFetchSize():searchVO.getPageUnit());
paginationInfo.setPageSize(searchVO.getPageSize()); paginationInfo.setPageSize(searchVO.getPageSize());
searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
searchVO.setLastIndex(paginationInfo.getLastRecordIndex()); searchVO.setLastIndex(paginationInfo.getLastRecordIndex());
@ -210,7 +210,7 @@ public class SendRqstMngController extends AbstractController {
Map<String, Object> data = new HashMap<String, Object>(); Map<String, Object> data = new HashMap<String, Object>();
data.put("contents", list); //[tui Grid] data-contents data.put("contents", list); //[tui Grid] data-contents
Map<String, Integer> pagination = new HashMap<String, Integer>(); Map<String, Integer> pagination = new HashMap<String, Integer>();
pagination.put("page", searchVO.getPage()); pagination.put("pageNum", searchVO.getPageNum());
pagination.put("totalCount", totCnt); pagination.put("totalCount", totCnt);
data.put("pagination", pagination); //[tui Grid] data-paging data.put("pagination", pagination); //[tui Grid] data-paging
model.addAttribute("data", data); //[tui Grid] data model.addAttribute("data", data); //[tui Grid] data

@ -80,8 +80,8 @@ public class StatsBySignTalkByYearController extends AbstractController {
/** paging */ /** paging */
PaginationInfo paginationInfo = new PaginationInfo(); PaginationInfo paginationInfo = new PaginationInfo();
paginationInfo.setCurrentPageNo(searchVO.getPage()>-1?searchVO.getPage():searchVO.getPageIndex()); paginationInfo.setCurrentPageNo(searchVO.getPageNum()>-1?searchVO.getPageNum():searchVO.getPageIndex());
paginationInfo.setRecordCountPerPage(searchVO.getPerPage()>-1?searchVO.getPerPage():searchVO.getPageUnit()); paginationInfo.setRecordCountPerPage(searchVO.getFetchSize()>-1?searchVO.getFetchSize():searchVO.getPageUnit());
paginationInfo.setPageSize(searchVO.getPageSize()); paginationInfo.setPageSize(searchVO.getPageSize());
searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
searchVO.setLastIndex(paginationInfo.getLastRecordIndex()); searchVO.setLastIndex(paginationInfo.getLastRecordIndex());
@ -105,7 +105,7 @@ public class StatsBySignTalkByYearController extends AbstractController {
Map<String, Object> data = new HashMap<String, Object>(); Map<String, Object> data = new HashMap<String, Object>();
data.put("contents", list); //[tui Grid] data-contents data.put("contents", list); //[tui Grid] data-contents
Map<String, Integer> pagination = new HashMap<String, Integer>(); Map<String, Integer> pagination = new HashMap<String, Integer>();
pagination.put("page", searchVO.getPage()); pagination.put("pageNum", searchVO.getPageNum());
pagination.put("totalCount", totCnt); pagination.put("totalCount", totCnt);
data.put("pagination", pagination); //[tui Grid] data-paging data.put("pagination", pagination); //[tui Grid] data-paging
model.addAttribute("data", data); //[tui Grid] data model.addAttribute("data", data); //[tui Grid] data

@ -92,8 +92,8 @@ public class XitAdminDbMngController extends AbstractController {
/** paging */ /** paging */
PaginationInfo paginationInfo = new PaginationInfo(); PaginationInfo paginationInfo = new PaginationInfo();
paginationInfo.setCurrentPageNo(searchVO.getPage()>-1?searchVO.getPage():searchVO.getPageIndex()); paginationInfo.setCurrentPageNo(searchVO.getPageNum()>-1?searchVO.getPageNum():searchVO.getPageIndex());
paginationInfo.setRecordCountPerPage(searchVO.getPerPage()>-1?searchVO.getPerPage():searchVO.getPageUnit()); paginationInfo.setRecordCountPerPage(searchVO.getFetchSize()>-1?searchVO.getFetchSize():searchVO.getPageUnit());
paginationInfo.setPageSize(searchVO.getPageSize()); paginationInfo.setPageSize(searchVO.getPageSize());
searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
searchVO.setLastIndex(paginationInfo.getLastRecordIndex()); searchVO.setLastIndex(paginationInfo.getLastRecordIndex());
@ -125,7 +125,7 @@ public class XitAdminDbMngController extends AbstractController {
Map<String, Object> data = new HashMap<String, Object>(); Map<String, Object> data = new HashMap<String, Object>();
data.put("contents", list); //[tui Grid] data-contents data.put("contents", list); //[tui Grid] data-contents
Map<String, Integer> pagination = new HashMap<String, Integer>(); Map<String, Integer> pagination = new HashMap<String, Integer>();
pagination.put("page", searchVO.getPage()); pagination.put("pageNum", searchVO.getPageNum());
pagination.put("totalCount", totCnt); pagination.put("totalCount", totCnt);
data.put("pagination", pagination); //[tui Grid] data-paging data.put("pagination", pagination); //[tui Grid] data-paging
resultMap.put("data", data); //[tui Grid] data resultMap.put("data", data); //[tui Grid] data

@ -146,7 +146,7 @@ public class XitAdminServerFileMngController extends AbstractController {
Map<String, Object> data = new HashMap<String, Object>(); Map<String, Object> data = new HashMap<String, Object>();
data.put("contents", list); //[tui Grid] data-contents data.put("contents", list); //[tui Grid] data-contents
Map<String, Integer> pagination = new HashMap<String, Integer>(); Map<String, Integer> pagination = new HashMap<String, Integer>();
pagination.put("page", searchVO.getPage()); pagination.put("pageNum", searchVO.getPageNum());
pagination.put("totalCount", totCnt); pagination.put("totalCount", totCnt);
data.put("pagination", pagination); //[tui Grid] data-paging data.put("pagination", pagination); //[tui Grid] data-paging
resultMap.put("data", data); //[tui Grid] data resultMap.put("data", data); //[tui Grid] data

@ -350,7 +350,7 @@ public class XitAdminServerLogMngController extends AbstractController {
Map<String, Object> data = new HashMap<String, Object>(); Map<String, Object> data = new HashMap<String, Object>();
data.put("contents", list); //[tui Grid] data-contents data.put("contents", list); //[tui Grid] data-contents
Map<String, Integer> pagination = new HashMap<String, Integer>(); Map<String, Integer> pagination = new HashMap<String, Integer>();
pagination.put("page", searchVO.getPage()); pagination.put("pageNum", searchVO.getPageNum());
pagination.put("totalCount", totCnt); pagination.put("totalCount", totCnt);
data.put("pagination", pagination); //[tui Grid] data-paging data.put("pagination", pagination); //[tui Grid] data-paging
resultMap.put("data", data); //[tui Grid] data resultMap.put("data", data); //[tui Grid] data

@ -72,8 +72,8 @@ public class XitConectionLogMngController extends AbstractController {
/** paging */ /** paging */
PaginationInfo paginationInfo = new PaginationInfo(); PaginationInfo paginationInfo = new PaginationInfo();
paginationInfo.setCurrentPageNo(searchVO.getPage()>-1?searchVO.getPage():searchVO.getPageIndex()); paginationInfo.setCurrentPageNo(searchVO.getPageNum()>-1?searchVO.getPageNum():searchVO.getPageIndex());
paginationInfo.setRecordCountPerPage(searchVO.getPerPage()>-1?searchVO.getPerPage():searchVO.getPageUnit()); paginationInfo.setRecordCountPerPage(searchVO.getFetchSize()>-1?searchVO.getFetchSize():searchVO.getPageUnit());
paginationInfo.setPageSize(searchVO.getPageSize()); paginationInfo.setPageSize(searchVO.getPageSize());
searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
searchVO.setLastIndex(paginationInfo.getLastRecordIndex()); searchVO.setLastIndex(paginationInfo.getLastRecordIndex());
@ -97,7 +97,7 @@ public class XitConectionLogMngController extends AbstractController {
Map<String, Object> data = new HashMap<String, Object>(); Map<String, Object> data = new HashMap<String, Object>();
data.put("contents", xitConectionLogMngService.findList(searchVO)); //[tui Grid] data-contents data.put("contents", xitConectionLogMngService.findList(searchVO)); //[tui Grid] data-contents
Map<String, Integer> pagination = new HashMap<String, Integer>(); Map<String, Integer> pagination = new HashMap<String, Integer>();
pagination.put("page", searchVO.getPage()); pagination.put("pageNum", searchVO.getPageNum());
pagination.put("totalCount", totCnt); pagination.put("totalCount", totCnt);
data.put("pagination", pagination); //[tui Grid] data-paging data.put("pagination", pagination); //[tui Grid] data-paging
resultMap.put("data", data); //[tui Grid] data resultMap.put("data", data); //[tui Grid] data

@ -96,8 +96,8 @@ public class XitConectionStatsMngController extends AbstractController {
/** paging */ /** paging */
PaginationInfo paginationInfo = new PaginationInfo(); PaginationInfo paginationInfo = new PaginationInfo();
paginationInfo.setCurrentPageNo(searchVO.getPage()>-1?searchVO.getPage():searchVO.getPageIndex()); paginationInfo.setCurrentPageNo(searchVO.getPageNum()>-1?searchVO.getPageNum():searchVO.getPageIndex());
paginationInfo.setRecordCountPerPage(searchVO.getPerPage()>-1?searchVO.getPerPage():searchVO.getPageUnit()); paginationInfo.setRecordCountPerPage(searchVO.getFetchSize()>-1?searchVO.getFetchSize():searchVO.getPageUnit());
paginationInfo.setPageSize(searchVO.getPageSize()); paginationInfo.setPageSize(searchVO.getPageSize());
searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
searchVO.setLastIndex(paginationInfo.getLastRecordIndex()); searchVO.setLastIndex(paginationInfo.getLastRecordIndex());
@ -121,7 +121,7 @@ public class XitConectionStatsMngController extends AbstractController {
Map<String, Object> data = new HashMap<String, Object>(); Map<String, Object> data = new HashMap<String, Object>();
data.put("contents", xitConectionStatsMngService.findList(searchVO)); //[tui Grid] data-contents data.put("contents", xitConectionStatsMngService.findList(searchVO)); //[tui Grid] data-contents
Map<String, Integer> pagination = new HashMap<String, Integer>(); Map<String, Integer> pagination = new HashMap<String, Integer>();
pagination.put("page", searchVO.getPage()); pagination.put("pageNum", searchVO.getPageNum());
// pagination.put("totalCount", totCnt); // pagination.put("totalCount", totCnt);
data.put("pagination", pagination); //[tui Grid] data-paging data.put("pagination", pagination); //[tui Grid] data-paging
resultMap.put("data", data); //[tui Grid] data resultMap.put("data", data); //[tui Grid] data

@ -70,8 +70,8 @@ public class XitLoginPolicyMngController extends AbstractController {
/** paging */ /** paging */
PaginationInfo paginationInfo = new PaginationInfo(); PaginationInfo paginationInfo = new PaginationInfo();
paginationInfo.setCurrentPageNo(searchVO.getPage()>-1?searchVO.getPage():searchVO.getPageIndex()); paginationInfo.setCurrentPageNo(searchVO.getPageNum()>-1?searchVO.getPageNum():searchVO.getPageIndex());
paginationInfo.setRecordCountPerPage(searchVO.getPerPage()>-1?searchVO.getPerPage():searchVO.getPageUnit()); paginationInfo.setRecordCountPerPage(searchVO.getFetchSize()>-1?searchVO.getFetchSize():searchVO.getPageUnit());
paginationInfo.setPageSize(searchVO.getPageSize()); paginationInfo.setPageSize(searchVO.getPageSize());
searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
searchVO.setLastIndex(paginationInfo.getLastRecordIndex()); searchVO.setLastIndex(paginationInfo.getLastRecordIndex());
@ -95,7 +95,7 @@ public class XitLoginPolicyMngController extends AbstractController {
Map<String, Object> data = new HashMap<String, Object>(); Map<String, Object> data = new HashMap<String, Object>();
data.put("contents", xitLoginPolicyMngService.findList(searchVO)); //[tui Grid] data-contents data.put("contents", xitLoginPolicyMngService.findList(searchVO)); //[tui Grid] data-contents
Map<String, Integer> pagination = new HashMap<String, Integer>(); Map<String, Integer> pagination = new HashMap<String, Integer>();
pagination.put("page", searchVO.getPage()); pagination.put("pageNum", searchVO.getPageNum());
// pagination.put("totalCount", totCnt); // pagination.put("totalCount", totCnt);
data.put("pagination", pagination); //[tui Grid] data-paging data.put("pagination", pagination); //[tui Grid] data-paging
resultMap.put("data", data); //[tui Grid] data resultMap.put("data", data); //[tui Grid] data

@ -105,8 +105,8 @@ public class XitBatchRegMngController extends AbstractController {
/** paging */ /** paging */
PaginationInfo paginationInfo = new PaginationInfo(); PaginationInfo paginationInfo = new PaginationInfo();
paginationInfo.setCurrentPageNo(searchVO.getPage()>-1?searchVO.getPage():searchVO.getPageIndex()); paginationInfo.setCurrentPageNo(searchVO.getPageNum()>-1?searchVO.getPageNum():searchVO.getPageIndex());
paginationInfo.setRecordCountPerPage(searchVO.getPerPage()>-1?searchVO.getPerPage():searchVO.getPageUnit()); paginationInfo.setRecordCountPerPage(searchVO.getFetchSize()>-1?searchVO.getFetchSize():searchVO.getPageUnit());
paginationInfo.setPageSize(searchVO.getPageSize()); paginationInfo.setPageSize(searchVO.getPageSize());
searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
searchVO.setLastIndex(paginationInfo.getLastRecordIndex()); searchVO.setLastIndex(paginationInfo.getLastRecordIndex());
@ -130,7 +130,7 @@ public class XitBatchRegMngController extends AbstractController {
Map<String, Object> data = new HashMap<String, Object>(); Map<String, Object> data = new HashMap<String, Object>();
data.put("contents", resultList); //[tui Grid] data-contents data.put("contents", resultList); //[tui Grid] data-contents
Map<String, Integer> pagination = new HashMap<String, Integer>(); Map<String, Integer> pagination = new HashMap<String, Integer>();
pagination.put("page", searchVO.getPage()); pagination.put("pageNum", searchVO.getPageNum());
pagination.put("totalCount", totCnt); pagination.put("totalCount", totCnt);
data.put("pagination", pagination); //[tui Grid] data-paging data.put("pagination", pagination); //[tui Grid] data-paging
resultMap.put("data", data); //[tui Grid] data resultMap.put("data", data); //[tui Grid] data

@ -79,8 +79,8 @@ public class XitBatchResultMngController extends AbstractController {
/** paging */ /** paging */
PaginationInfo paginationInfo = new PaginationInfo(); PaginationInfo paginationInfo = new PaginationInfo();
paginationInfo.setCurrentPageNo(searchVO.getPage()>-1?searchVO.getPage():searchVO.getPageIndex()); paginationInfo.setCurrentPageNo(searchVO.getPageNum()>-1?searchVO.getPageNum():searchVO.getPageIndex());
paginationInfo.setRecordCountPerPage(searchVO.getPerPage()>-1?searchVO.getPerPage():searchVO.getPageUnit()); paginationInfo.setRecordCountPerPage(searchVO.getFetchSize()>-1?searchVO.getFetchSize():searchVO.getPageUnit());
paginationInfo.setPageSize(searchVO.getPageSize()); paginationInfo.setPageSize(searchVO.getPageSize());
searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
searchVO.setLastIndex(paginationInfo.getLastRecordIndex()); searchVO.setLastIndex(paginationInfo.getLastRecordIndex());
@ -104,7 +104,7 @@ public class XitBatchResultMngController extends AbstractController {
Map<String, Object> data = new HashMap<String, Object>(); Map<String, Object> data = new HashMap<String, Object>();
data.put("contents", xitBatchResultMngService.findList(searchVO)); //[tui Grid] data-contents data.put("contents", xitBatchResultMngService.findList(searchVO)); //[tui Grid] data-contents
Map<String, Integer> pagination = new HashMap<String, Integer>(); Map<String, Integer> pagination = new HashMap<String, Integer>();
pagination.put("page", searchVO.getPage()); pagination.put("pageNum", searchVO.getPageNum());
pagination.put("totalCount", totCnt); pagination.put("totalCount", totCnt);
data.put("pagination", pagination); //[tui Grid] data-paging data.put("pagination", pagination); //[tui Grid] data-paging
resultMap.put("data", data); //[tui Grid] data resultMap.put("data", data); //[tui Grid] data

@ -105,8 +105,8 @@ public class XitBatchScheduleMngController extends AbstractController {
/** paging */ /** paging */
PaginationInfo paginationInfo = new PaginationInfo(); PaginationInfo paginationInfo = new PaginationInfo();
paginationInfo.setCurrentPageNo(searchVO.getPage()>-1?searchVO.getPage():searchVO.getPageIndex()); paginationInfo.setCurrentPageNo(searchVO.getPageNum()>-1?searchVO.getPageNum():searchVO.getPageIndex());
paginationInfo.setRecordCountPerPage(searchVO.getPerPage()>-1?searchVO.getPerPage():searchVO.getPageUnit()); paginationInfo.setRecordCountPerPage(searchVO.getFetchSize()>-1?searchVO.getFetchSize():searchVO.getPageUnit());
paginationInfo.setPageSize(searchVO.getPageSize()); paginationInfo.setPageSize(searchVO.getPageSize());
searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
searchVO.setLastIndex(paginationInfo.getLastRecordIndex()); searchVO.setLastIndex(paginationInfo.getLastRecordIndex());
@ -130,7 +130,7 @@ public class XitBatchScheduleMngController extends AbstractController {
Map<String, Object> data = new HashMap<String, Object>(); Map<String, Object> data = new HashMap<String, Object>();
data.put("contents", resultList); //[tui Grid] data-contents data.put("contents", resultList); //[tui Grid] data-contents
Map<String, Integer> pagination = new HashMap<String, Integer>(); Map<String, Integer> pagination = new HashMap<String, Integer>();
pagination.put("page", searchVO.getPage()); pagination.put("pageNum", searchVO.getPageNum());
pagination.put("totalCount", totCnt); pagination.put("totalCount", totCnt);
data.put("pagination", pagination); //[tui Grid] data-paging data.put("pagination", pagination); //[tui Grid] data-paging
resultMap.put("data", data); //[tui Grid] data resultMap.put("data", data); //[tui Grid] data

@ -160,8 +160,8 @@ public class XitBasicBbsMngController extends AbstractController {
/** paging */ /** paging */
PaginationInfo paginationInfo = new PaginationInfo(); PaginationInfo paginationInfo = new PaginationInfo();
paginationInfo.setCurrentPageNo(searchVO.getPage()>-1?searchVO.getPage():searchVO.getPageIndex()); paginationInfo.setCurrentPageNo(searchVO.getPageNum()>-1?searchVO.getPageNum():searchVO.getPageIndex());
paginationInfo.setRecordCountPerPage(searchVO.getPerPage()>-1?searchVO.getPerPage():searchVO.getPageUnit()); paginationInfo.setRecordCountPerPage(searchVO.getFetchSize()>-1?searchVO.getFetchSize():searchVO.getPageUnit());
paginationInfo.setPageSize(searchVO.getPageSize()); paginationInfo.setPageSize(searchVO.getPageSize());
searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
searchVO.setLastIndex(paginationInfo.getLastRecordIndex()); searchVO.setLastIndex(paginationInfo.getLastRecordIndex());
@ -185,7 +185,7 @@ public class XitBasicBbsMngController extends AbstractController {
Map<String, Object> data = new HashMap<String, Object>(); Map<String, Object> data = new HashMap<String, Object>();
data.put("contents", xitBasicBbsMngService.findList(searchVO)); //[tui Grid] data-contents data.put("contents", xitBasicBbsMngService.findList(searchVO)); //[tui Grid] data-contents
Map<String, Integer> pagination = new HashMap<String, Integer>(); Map<String, Integer> pagination = new HashMap<String, Integer>();
pagination.put("page", searchVO.getPage()); pagination.put("pageNum", searchVO.getPageNum());
pagination.put("totalCount", totCnt); pagination.put("totalCount", totCnt);
data.put("pagination", pagination); //[tui Grid] data-paging data.put("pagination", pagination); //[tui Grid] data-paging
resultMap.put("data", data); //[tui Grid] data resultMap.put("data", data); //[tui Grid] data

@ -109,8 +109,8 @@ public class XitBbsCreateMngController extends AbstractController {
/** paging */ /** paging */
PaginationInfo paginationInfo = new PaginationInfo(); PaginationInfo paginationInfo = new PaginationInfo();
paginationInfo.setCurrentPageNo(searchVO.getPage()>-1?searchVO.getPage():searchVO.getPageIndex()); paginationInfo.setCurrentPageNo(searchVO.getPageNum()>-1?searchVO.getPageNum():searchVO.getPageIndex());
paginationInfo.setRecordCountPerPage(searchVO.getPerPage()>-1?searchVO.getPerPage():searchVO.getPageUnit()); paginationInfo.setRecordCountPerPage(searchVO.getFetchSize()>-1?searchVO.getFetchSize():searchVO.getPageUnit());
paginationInfo.setPageSize(searchVO.getPageSize()); paginationInfo.setPageSize(searchVO.getPageSize());
searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
searchVO.setLastIndex(paginationInfo.getLastRecordIndex()); searchVO.setLastIndex(paginationInfo.getLastRecordIndex());
@ -134,7 +134,7 @@ public class XitBbsCreateMngController extends AbstractController {
Map<String, Object> data = new HashMap<String, Object>(); Map<String, Object> data = new HashMap<String, Object>();
data.put("contents", xitBbsCreateMngService.findList(searchVO)); //[tui Grid] data-contents data.put("contents", xitBbsCreateMngService.findList(searchVO)); //[tui Grid] data-contents
Map<String, Integer> pagination = new HashMap<String, Integer>(); Map<String, Integer> pagination = new HashMap<String, Integer>();
pagination.put("page", searchVO.getPage()); pagination.put("pageNum", searchVO.getPageNum());
pagination.put("totalCount", totCnt); pagination.put("totalCount", totCnt);
data.put("pagination", pagination); //[tui Grid] data-paging data.put("pagination", pagination); //[tui Grid] data-paging
resultMap.put("data", data); //[tui Grid] data resultMap.put("data", data); //[tui Grid] data

@ -77,8 +77,8 @@ public class XitBbsTmplateMngController extends AbstractController {
/** paging */ /** paging */
PaginationInfo paginationInfo = new PaginationInfo(); PaginationInfo paginationInfo = new PaginationInfo();
paginationInfo.setCurrentPageNo(searchVO.getPage()>-1?searchVO.getPage():searchVO.getPageIndex()); paginationInfo.setCurrentPageNo(searchVO.getPageNum()>-1?searchVO.getPageNum():searchVO.getPageIndex());
paginationInfo.setRecordCountPerPage(searchVO.getPerPage()>-1?searchVO.getPerPage():searchVO.getPageUnit()); paginationInfo.setRecordCountPerPage(searchVO.getFetchSize()>-1?searchVO.getFetchSize():searchVO.getPageUnit());
paginationInfo.setPageSize(searchVO.getPageSize()); paginationInfo.setPageSize(searchVO.getPageSize());
searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
searchVO.setLastIndex(paginationInfo.getLastRecordIndex()); searchVO.setLastIndex(paginationInfo.getLastRecordIndex());
@ -102,7 +102,7 @@ public class XitBbsTmplateMngController extends AbstractController {
Map<String, Object> data = new HashMap<String, Object>(); Map<String, Object> data = new HashMap<String, Object>();
data.put("contents", xitBbsTmplateMngService.findList(searchVO)); //[tui Grid] data-contents data.put("contents", xitBbsTmplateMngService.findList(searchVO)); //[tui Grid] data-contents
Map<String, Integer> pagination = new HashMap<String, Integer>(); Map<String, Integer> pagination = new HashMap<String, Integer>();
pagination.put("page", searchVO.getPage()); pagination.put("pageNum", searchVO.getPageNum());
pagination.put("totalCount", totCnt); pagination.put("totalCount", totCnt);
data.put("pagination", pagination); //[tui Grid] data-paging data.put("pagination", pagination); //[tui Grid] data-paging
resultMap.put("data", data); //[tui Grid] data resultMap.put("data", data); //[tui Grid] data

@ -78,8 +78,8 @@ public class XitBbsUseMngController extends AbstractController {
/** paging */ /** paging */
PaginationInfo paginationInfo = new PaginationInfo(); PaginationInfo paginationInfo = new PaginationInfo();
paginationInfo.setCurrentPageNo(searchVO.getPage()>-1?searchVO.getPage():searchVO.getPageIndex()); paginationInfo.setCurrentPageNo(searchVO.getPageNum()>-1?searchVO.getPageNum():searchVO.getPageIndex());
paginationInfo.setRecordCountPerPage(searchVO.getPerPage()>-1?searchVO.getPerPage():searchVO.getPageUnit()); paginationInfo.setRecordCountPerPage(searchVO.getFetchSize()>-1?searchVO.getFetchSize():searchVO.getPageUnit());
paginationInfo.setPageSize(searchVO.getPageSize()); paginationInfo.setPageSize(searchVO.getPageSize());
searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
searchVO.setLastIndex(paginationInfo.getLastRecordIndex()); searchVO.setLastIndex(paginationInfo.getLastRecordIndex());
@ -103,7 +103,7 @@ public class XitBbsUseMngController extends AbstractController {
Map<String, Object> data = new HashMap<String, Object>(); Map<String, Object> data = new HashMap<String, Object>();
data.put("contents", xitBbsUseMngService.findList(searchVO)); //[tui Grid] data-contents data.put("contents", xitBbsUseMngService.findList(searchVO)); //[tui Grid] data-contents
Map<String, Integer> pagination = new HashMap<String, Integer>(); Map<String, Integer> pagination = new HashMap<String, Integer>();
pagination.put("page", searchVO.getPage()); pagination.put("pageNum", searchVO.getPageNum());
pagination.put("totalCount", totCnt); pagination.put("totalCount", totCnt);
data.put("pagination", pagination); //[tui Grid] data-paging data.put("pagination", pagination); //[tui Grid] data-paging
resultMap.put("data", data); //[tui Grid] data resultMap.put("data", data); //[tui Grid] data

@ -108,8 +108,8 @@ public class XitEntUserRegMngController extends AbstractController {
/** paging */ /** paging */
PaginationInfo paginationInfo = new PaginationInfo(); PaginationInfo paginationInfo = new PaginationInfo();
paginationInfo.setCurrentPageNo(searchVO.getPage()>-1?searchVO.getPage():searchVO.getPageIndex()); paginationInfo.setCurrentPageNo(searchVO.getPageNum()>-1?searchVO.getPageNum():searchVO.getPageIndex());
paginationInfo.setRecordCountPerPage(searchVO.getPerPage()>-1?searchVO.getPerPage():searchVO.getPageUnit()); paginationInfo.setRecordCountPerPage(searchVO.getFetchSize()>-1?searchVO.getFetchSize():searchVO.getPageUnit());
paginationInfo.setPageSize(searchVO.getPageSize()); paginationInfo.setPageSize(searchVO.getPageSize());
searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
searchVO.setLastIndex(paginationInfo.getLastRecordIndex()); searchVO.setLastIndex(paginationInfo.getLastRecordIndex());
@ -133,7 +133,7 @@ public class XitEntUserRegMngController extends AbstractController {
Map<String, Object> data = new HashMap<String, Object>(); Map<String, Object> data = new HashMap<String, Object>();
data.put("contents", xitEntUserRegMngService.findList(searchVO)); //[tui Grid] data-contents data.put("contents", xitEntUserRegMngService.findList(searchVO)); //[tui Grid] data-contents
Map<String, Integer> pagination = new HashMap<String, Integer>(); Map<String, Integer> pagination = new HashMap<String, Integer>();
pagination.put("page", searchVO.getPage()); pagination.put("pageNum", searchVO.getPageNum());
pagination.put("totalCount", totCnt); pagination.put("totalCount", totCnt);
data.put("pagination", pagination); //[tui Grid] data-paging data.put("pagination", pagination); //[tui Grid] data-paging
resultMap.put("data", data); //[tui Grid] data resultMap.put("data", data); //[tui Grid] data

@ -107,8 +107,8 @@ public class XitGnrUserRegMngController extends AbstractController {
/** paging */ /** paging */
PaginationInfo paginationInfo = new PaginationInfo(); PaginationInfo paginationInfo = new PaginationInfo();
paginationInfo.setCurrentPageNo(searchVO.getPage()>-1?searchVO.getPage():searchVO.getPageIndex()); paginationInfo.setCurrentPageNo(searchVO.getPageNum()>-1?searchVO.getPageNum():searchVO.getPageIndex());
paginationInfo.setRecordCountPerPage(searchVO.getPerPage()>-1?searchVO.getPerPage():searchVO.getPageUnit()); paginationInfo.setRecordCountPerPage(searchVO.getFetchSize()>-1?searchVO.getFetchSize():searchVO.getPageUnit());
paginationInfo.setPageSize(searchVO.getPageSize()); paginationInfo.setPageSize(searchVO.getPageSize());
searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
searchVO.setLastIndex(paginationInfo.getLastRecordIndex()); searchVO.setLastIndex(paginationInfo.getLastRecordIndex());
@ -132,7 +132,7 @@ public class XitGnrUserRegMngController extends AbstractController {
Map<String, Object> data = new HashMap<String, Object>(); Map<String, Object> data = new HashMap<String, Object>();
data.put("contents", xitGnrUserRegMngService.findList(searchVO)); //[tui Grid] data-contents data.put("contents", xitGnrUserRegMngService.findList(searchVO)); //[tui Grid] data-contents
Map<String, Integer> pagination = new HashMap<String, Integer>(); Map<String, Integer> pagination = new HashMap<String, Integer>();
pagination.put("page", searchVO.getPage()); pagination.put("pageNum", searchVO.getPageNum());
pagination.put("totalCount", totCnt); pagination.put("totalCount", totCnt);
data.put("pagination", pagination); //[tui Grid] data-paging data.put("pagination", pagination); //[tui Grid] data-paging
resultMap.put("data", data); //[tui Grid] data resultMap.put("data", data); //[tui Grid] data

@ -101,8 +101,8 @@ public class XitUserAbsntMngController extends AbstractController {
/** paging */ /** paging */
PaginationInfo paginationInfo = new PaginationInfo(); PaginationInfo paginationInfo = new PaginationInfo();
paginationInfo.setCurrentPageNo(searchVO.getPage()>-1?searchVO.getPage():searchVO.getPageIndex()); paginationInfo.setCurrentPageNo(searchVO.getPageNum()>-1?searchVO.getPageNum():searchVO.getPageIndex());
paginationInfo.setRecordCountPerPage(searchVO.getPerPage()>-1?searchVO.getPerPage():searchVO.getPageUnit()); paginationInfo.setRecordCountPerPage(searchVO.getFetchSize()>-1?searchVO.getFetchSize():searchVO.getPageUnit());
paginationInfo.setPageSize(searchVO.getPageSize()); paginationInfo.setPageSize(searchVO.getPageSize());
searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
searchVO.setLastIndex(paginationInfo.getLastRecordIndex()); searchVO.setLastIndex(paginationInfo.getLastRecordIndex());
@ -126,7 +126,7 @@ public class XitUserAbsntMngController extends AbstractController {
Map<String, Object> data = new HashMap<String, Object>(); Map<String, Object> data = new HashMap<String, Object>();
data.put("contents", xitUserAbsntMngService.findList(searchVO)); //[tui Grid] data-contents data.put("contents", xitUserAbsntMngService.findList(searchVO)); //[tui Grid] data-contents
Map<String, Integer> pagination = new HashMap<String, Integer>(); Map<String, Integer> pagination = new HashMap<String, Integer>();
pagination.put("page", searchVO.getPage()); pagination.put("pageNum", searchVO.getPageNum());
pagination.put("totalCount", totCnt); pagination.put("totalCount", totCnt);
data.put("pagination", pagination); //[tui Grid] data-paging data.put("pagination", pagination); //[tui Grid] data-paging
resultMap.put("data", data); //[tui Grid] data resultMap.put("data", data); //[tui Grid] data

@ -97,8 +97,8 @@ public class XitUserEtcOptMngController extends AbstractController {
/** paging */ /** paging */
PaginationInfo paginationInfo = new PaginationInfo(); PaginationInfo paginationInfo = new PaginationInfo();
paginationInfo.setCurrentPageNo(searchVO.getPage()>-1?searchVO.getPage():searchVO.getPageIndex()); paginationInfo.setCurrentPageNo(searchVO.getPageNum()>-1?searchVO.getPageNum():searchVO.getPageIndex());
paginationInfo.setRecordCountPerPage(searchVO.getPerPage()>-1?searchVO.getPerPage():searchVO.getPageUnit()); paginationInfo.setRecordCountPerPage(searchVO.getFetchSize()>-1?searchVO.getFetchSize():searchVO.getPageUnit());
paginationInfo.setPageSize(searchVO.getPageSize()); paginationInfo.setPageSize(searchVO.getPageSize());
searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
searchVO.setLastIndex(paginationInfo.getLastRecordIndex()); searchVO.setLastIndex(paginationInfo.getLastRecordIndex());
@ -122,7 +122,7 @@ public class XitUserEtcOptMngController extends AbstractController {
Map<String, Object> data = new HashMap<String, Object>(); Map<String, Object> data = new HashMap<String, Object>();
data.put("contents", xitUserEtcOptMngService.findList(searchVO)); //[tui Grid] data-contents data.put("contents", xitUserEtcOptMngService.findList(searchVO)); //[tui Grid] data-contents
Map<String, Integer> pagination = new HashMap<String, Integer>(); Map<String, Integer> pagination = new HashMap<String, Integer>();
pagination.put("page", searchVO.getPage()); pagination.put("pageNum", searchVO.getPageNum());
pagination.put("totalCount", totCnt); pagination.put("totalCount", totCnt);
data.put("pagination", pagination); //[tui Grid] data-paging data.put("pagination", pagination); //[tui Grid] data-paging
resultMap.put("data", data); //[tui Grid] data resultMap.put("data", data); //[tui Grid] data

@ -57,19 +57,16 @@ public class XitBaseSearchVO implements Serializable {
private String searchKeywordFrom = ""; private String searchKeywordFrom = "";
/** 검색KeywordTo */ /** 검색KeywordTo */
private String searchKeywordTo = ""; private String searchKeywordTo = "";
/** 현재 페이지 */
private int pageNum = 1;
/** 한 페이지에 표현되는 로우(row)의 개수 */
private int fetchSize = -1;
/* ************************* /* *************************
* tui Grid Paging * tui Grid Paging
************************* */ ************************* */
/** 현재 페이지 */
private int page = -1;
/** 한 페이지에 표현되는 로우(row)의 개수 */
private int perPage = -1;
/** 로우들의 순서를 결정하는 컬럼의 이름 */ /** 로우들의 순서를 결정하는 컬럼의 이름 */
private String sortColumn; private String sortColumn;
/** 로우 정렬 방법(true: ASC/오름차순, false: DESC/내림차순) */ /** 로우 정렬 방법(true: ASC/오름차순, false: DESC/내림차순) */
@ -205,20 +202,20 @@ public class XitBaseSearchVO implements Serializable {
this.searchKeywordTo = searchKeywordTo; this.searchKeywordTo = searchKeywordTo;
} }
public int getPage() { public int getPageNum() {
return page; return pageNum;
} }
public void setPage(int page) { public void setPageNum(int pageNum) {
this.page = page; this.pageNum = pageNum;
} }
public int getPerPage() { public int getFetchSize(){
return perPage; return fetchSize;
} }
public void setPerPage(int perPage) { public void setFetchSize(int fetchSize){
this.perPage = perPage; this.fetchSize = fetchSize;
} }
public String getSortColumn() { public String getSortColumn() {

@ -178,7 +178,7 @@ public class LogAopAdvice {
//map.put("recods", paginator.getTotalCount()); //map.put("recods", paginator.getTotalCount());
map.put("totalPage", paginator.getTotalPages()); map.put("totalPage", paginator.getTotalPages());
map.put("totalCount", paginator.getTotalCount()); map.put("totalCount", paginator.getTotalCount());
map.put("page", paginator.getPage()); map.put("pageNum", paginator.getPageNum());
//map.put("rowNum", paginator.getLimit()); //map.put("rowNum", paginator.getLimit());
// //
// // Query Data : Paging 정보만 set 하면 되므로 필요 없다 // // Query Data : Paging 정보만 set 하면 되므로 필요 없다

@ -18,7 +18,7 @@ public class XitPaginationInfo extends PaginationInfo{
* tui Grid Paging * tui Grid Paging
************************* */ ************************* */
/** 현재 페이지 */ /** 현재 페이지 */
private int page = -1; private int pageNum = -1;
/** 모든 로우들의 개수(=조회 총 건수) */ /** 모든 로우들의 개수(=조회 총 건수) */
private int totalCount = -1; private int totalCount = -1;
/* ************************* /* *************************
@ -27,13 +27,13 @@ public class XitPaginationInfo extends PaginationInfo{
/** [tui Grid] 현재 페이지를 반환 한다. */ /** [tui Grid] 현재 페이지를 반환 한다. */
public int getPage() { public int getPageNum() {
return page; return pageNum;
} }
/** [tui Grid] 현재 페이지를 설정 한다. */ /** [tui Grid] 현재 페이지를 설정 한다. */
public void setPage(int page) { public void setPageNum(int pageNum) {
this.page = page; this.pageNum = pageNum;
super.setCurrentPageNo(page); super.setCurrentPageNo(pageNum);
} }
/** [tui Grid] 조회 총 건수를 설정 한다. */ /** [tui Grid] 조회 총 건수를 설정 한다. */
public int getTotalCount() { public int getTotalCount() {

@ -10,26 +10,26 @@ public class Paginator implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private final int limit; private final int limit;
private int page = 1; private int pageNum = 1;
private final int totalCount; private final int totalCount;
public Paginator(int page, int limit, int totalCount) { public Paginator(int pageNum, int limit, int totalCount) {
super(); super();
this.limit = limit; this.limit = limit;
this.totalCount = totalCount; this.totalCount = totalCount;
this.page = computePageNo(page); this.pageNum = computePageNo(pageNum);
} }
public void setSessionPagination(Paginator paginator){ public void setSessionPagination(Paginator paginator){
RequestContextHolder.currentRequestAttributes().setAttribute(PagingConstants.Session.PAGE_INFO.getCode(), paginator, RequestAttributes.SCOPE_REQUEST); RequestContextHolder.currentRequestAttributes().setAttribute(PagingConstants.Session.PAGE_INFO.getCode(), paginator, RequestAttributes.SCOPE_REQUEST);
} }
public int getPage() { public int getPageNum() {
return page; return pageNum;
} }
public void setPage(int page) { public void setPage(int pageNum) {
this.page = page; this.pageNum = pageNum;
} }
public int getLimit() { public int getLimit() {
@ -41,53 +41,53 @@ public class Paginator implements Serializable {
} }
public boolean isFirstPage() { public boolean isFirstPage() {
return page <= 1; return pageNum <= 1;
} }
public boolean isLastPage() { public boolean isLastPage() {
return page >= getTotalPages(); return pageNum >= getTotalPages();
} }
public int getPrePage() { public int getPrePage() {
if (isHasPrePage()) { if (isHasPrePage()) {
return page - 1; return pageNum - 1;
} else { } else {
return page; return pageNum;
} }
} }
public int getNextPage() { public int getNextPage() {
if (isHasNextPage()) { if (isHasNextPage()) {
return page + 1; return pageNum + 1;
} else { } else {
return page; return pageNum;
} }
} }
public boolean isDisabledPage(int page) { public boolean isDisabledPage(int page) {
return ((page < 1) || (page > getTotalPages()) || (page == this.page)); return ((page < 1) || (page > getTotalPages()) || (page == this.pageNum));
} }
public boolean isHasPrePage() { public boolean isHasPrePage() {
return (page - 1 >= 1); return (pageNum - 1 >= 1);
} }
public boolean isHasNextPage() { public boolean isHasNextPage() {
return (page + 1 <= getTotalPages()); return (pageNum + 1 <= getTotalPages());
} }
public int getStartRow() { public int getStartRow() {
if (getLimit() <= 0 || totalCount <= 0) if (getLimit() <= 0 || totalCount <= 0)
return 0; return 0;
return page > 0 ? (page - 1) * getLimit() + 1 : 0; return pageNum > 0 ? (pageNum - 1) * getLimit() + 1 : 0;
} }
public int getEndRow() { public int getEndRow() {
return page > 0 ? Math.min(limit * page, getTotalCount()) : 0; return pageNum > 0 ? Math.min(limit * pageNum, getTotalCount()) : 0;
} }
public int getOffset() { public int getOffset() {
return page > 0 ? (page - 1) * getLimit() : 0; return pageNum > 0 ? (pageNum - 1) * getLimit() : 0;
} }
public int getTotalPages() { public int getTotalPages() {
@ -105,8 +105,8 @@ public class Paginator implements Serializable {
return count; return count;
} }
protected int computePageNo(int page) { protected int computePageNo(int pageNum) {
return computePageNumber(page, limit, totalCount); return computePageNumber(pageNum, limit, totalCount);
} }
private static int computeLastPageNumber(int totalItems, int pageSize) { private static int computeLastPageNumber(int totalItems, int pageSize) {
@ -119,23 +119,23 @@ public class Paginator implements Serializable {
return result; return result;
} }
private static int computePageNumber(int page, int pageSize, int totalItems) { private static int computePageNumber(int pageNum, int pageSize, int totalItems) {
if (page <= 1) { if (pageNum <= 1) {
return 1; return 1;
} }
if (Integer.MAX_VALUE == page if (Integer.MAX_VALUE == pageNum
|| page > computeLastPageNumber(totalItems, pageSize)) { // last || pageNum > computeLastPageNumber(totalItems, pageSize)) { // last
// page // page
return computeLastPageNumber(totalItems, pageSize); return computeLastPageNumber(totalItems, pageSize);
} }
return page; return pageNum;
} }
@Override @Override
public String toString() { public String toString() {
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
sb.append("Paginator"); sb.append("Paginator");
sb.append("{page=").append(page); sb.append("{pageNum=").append(pageNum);
sb.append(", limit=").append(limit); sb.append(", limit=").append(limit);
sb.append(", totalCount=").append(totalCount); sb.append(", totalCount=").append(totalCount);
sb.append('}'); sb.append('}');

@ -22,17 +22,17 @@ public class MybatisUtils{
} }
public static <T> RowBounds getPagingInfo(Object cls){ public static <T> RowBounds getPagingInfo(Object cls){
int page = 0; int pageNum = 0;
int limit = 0; int limit = 0;
int pageSize = 0; int pageSize = 0;
if(Checks.isNull(cls)){ if(Checks.isNull(cls)){
return new PageBounds(1, 10); return new PageBounds(1, 10);
} }
try { try {
Method pageMethod = cls.getClass().getMethod("getPage"); Method pageMethod = cls.getClass().getMethod("getPageNum");
if(!Checks.isEmpty(pageMethod)) page = (Integer)pageMethod.invoke(cls, null); if(!Checks.isEmpty(pageMethod)) pageNum = (Integer)pageMethod.invoke(cls, null);
Method limitMethod = cls.getClass().getMethod("getPerPage"); Method limitMethod = cls.getClass().getMethod("getFetchSize");
if(!Checks.isEmpty(limitMethod)) limit = (Integer)limitMethod.invoke(cls, null); if(!Checks.isEmpty(limitMethod)) limit = (Integer)limitMethod.invoke(cls, null);
} catch (IllegalAccessException ex) { } catch (IllegalAccessException ex) {
throw new RuntimeException(ex); throw new RuntimeException(ex);
@ -41,16 +41,16 @@ public class MybatisUtils{
} catch (InvocationTargetException e) { } catch (InvocationTargetException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
page = page == 0? 1: page; pageNum = pageNum == 0? 1: pageNum;
limit = limit == 0? 20: limit; limit = limit == 0? 20: limit;
// 정렬필드명.direction,정렬필드명.direction,... 형태(정렬필드,정렬필드.desc) // 정렬필드명.direction,정렬필드명.direction,... 형태(정렬필드,정렬필드.desc)
//String sort = Checks.isEmpty(map.get("sidx"))? "": String.valueOf(map.get("sidx")); //String sort = Checks.isEmpty(map.get("sidx"))? "": String.valueOf(map.get("sidx"));
//return new RowBounds(page == 1? 1: (page-1)*limit, limit); //return new RowBounds(page == 1? 1: (page-1)*limit, limit);
return new PageBounds(page, limit); return new PageBounds(pageNum, limit);
} }
public static RowBounds getPagingInfo(final int page, final int limit){ public static RowBounds getPagingInfo(final int pageNum, final int limit){
return new PageBounds(page, limit); return new PageBounds(pageNum, limit);
} }
@ -64,9 +64,9 @@ public class MybatisUtils{
// return new PageBounds(page, limit , Order.formString(sort)); // return new PageBounds(page, limit , Order.formString(sort));
// } // }
public static RowBounds getPagingInfo(int page, int row, String sort){ public static RowBounds getPagingInfo(int pageNum, int row, String sort){
return new PageBounds(page, row, Order.formString(sort)); return new PageBounds(pageNum, row, Order.formString(sort));
} }
// public static interface PagableVo { // public static interface PagableVo {

@ -93,7 +93,7 @@ public class OffsetLimitInterceptor implements Interceptor {
} else { } else {
count = SQLHelp.getCount(ms, parameter, boundSql, dialect); count = SQLHelp.getCount(ms, parameter, boundSql, dialect);
} }
paginator = new Paginator(pageBounds.getPage(), pageBounds.getLimit(), count); paginator = new Paginator(pageBounds.getPageNum(), pageBounds.getLimit(), count);
return paginator; return paginator;
}; };
Future<Paginator> countFutrue = call(countTask, async); Future<Paginator> countFutrue = call(countTask, async);

@ -24,7 +24,7 @@ public class PageBounds extends RowBounds implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
public final static int NO_PAGE = 1; public final static int NO_PAGE = 1;
protected int page = NO_PAGE; protected int pageNum = NO_PAGE;
protected int limit = NO_ROW_LIMIT; protected int limit = NO_ROW_LIMIT;
protected List<Order> orders = new ArrayList<Order>(); protected List<Order> orders = new ArrayList<Order>();
protected boolean containsTotalCount; protected boolean containsTotalCount;
@ -37,13 +37,13 @@ public class PageBounds extends RowBounds implements Serializable {
public PageBounds(RowBounds rowBounds) { public PageBounds(RowBounds rowBounds) {
if (rowBounds instanceof PageBounds) { if (rowBounds instanceof PageBounds) {
PageBounds pageBounds = (PageBounds) rowBounds; PageBounds pageBounds = (PageBounds) rowBounds;
this.page = pageBounds.page; this.pageNum = pageBounds.pageNum;
this.limit = pageBounds.limit; this.limit = pageBounds.limit;
this.orders = pageBounds.orders; this.orders = pageBounds.orders;
this.containsTotalCount = pageBounds.containsTotalCount; this.containsTotalCount = pageBounds.containsTotalCount;
this.asyncTotalCount = pageBounds.asyncTotalCount; this.asyncTotalCount = pageBounds.asyncTotalCount;
} else { } else {
this.page = (rowBounds.getOffset() / rowBounds.getLimit()) + 1; this.pageNum = (rowBounds.getOffset() / rowBounds.getLimit()) + 1;
this.limit = rowBounds.getLimit(); this.limit = rowBounds.getLimit();
} }
@ -87,24 +87,24 @@ public class PageBounds extends RowBounds implements Serializable {
this(page, limit, Arrays.asList(order), true); this(page, limit, Arrays.asList(order), true);
} }
public PageBounds(int page, int limit, List<Order> orders) { public PageBounds(int pageNum, int limit, List<Order> orders) {
this(page, limit, orders, true); this(pageNum, limit, orders, true);
} }
public PageBounds(int page, int limit, List<Order> orders, public PageBounds(int pageNum, int limit, List<Order> orders,
boolean containsTotalCount) { boolean containsTotalCount) {
this.page = page; this.pageNum = pageNum;
this.limit = limit; this.limit = limit;
this.orders = orders; this.orders = orders;
this.containsTotalCount = containsTotalCount; this.containsTotalCount = containsTotalCount;
} }
public int getPage() { public int getPageNum() {
return page; return pageNum;
} }
public void setPage(int page) { public void setPageNum(int pageNum) {
this.page = page; this.pageNum = pageNum;
} }
public int getLimit() { public int getLimit() {
@ -141,15 +141,15 @@ public class PageBounds extends RowBounds implements Serializable {
@Override @Override
public int getOffset() { public int getOffset() {
if (page >= 1) { if (pageNum >= 1) {
return (page - 1) * limit; return (pageNum - 1) * limit;
} }
return 0; return 0;
} }
@Override @Override
public String toString() { public String toString() {
return "PageBounds{" + "page=" + page + return "PageBounds{" + "pageNum=" + pageNum +
", limit=" + limit + ", limit=" + limit +
", orders=" + orders + ", orders=" + orders +
", containsTotalCount=" + containsTotalCount + ", containsTotalCount=" + containsTotalCount +

@ -10,26 +10,26 @@ public class Paginator implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private final int limit; private final int limit;
private int page = 1; private int pageNum = 1;
private final int totalCount; private final int totalCount;
public Paginator(int page, int limit, int totalCount) { public Paginator(int pageNum, int limit, int totalCount) {
super(); super();
this.limit = limit; this.limit = limit;
this.totalCount = totalCount; this.totalCount = totalCount;
this.page = computePageNo(page); this.pageNum = computePageNo(pageNum);
} }
public void setSessionPagination(Paginator paginator){ public void setSessionPagination(Paginator paginator){
RequestContextHolder.currentRequestAttributes().setAttribute(PagingConstants.Session.PAGE_INFO.getCode(), paginator, RequestAttributes.SCOPE_REQUEST); RequestContextHolder.currentRequestAttributes().setAttribute(PagingConstants.Session.PAGE_INFO.getCode(), paginator, RequestAttributes.SCOPE_REQUEST);
} }
public int getPage() { public int getPageNum() {
return page; return pageNum;
} }
public void setPage(int page) { public void setPageNum(int pageNum) {
this.page = page; this.pageNum = pageNum;
} }
public int getLimit() { public int getLimit() {
@ -41,53 +41,53 @@ public class Paginator implements Serializable {
} }
public boolean isFirstPage() { public boolean isFirstPage() {
return page <= 1; return pageNum <= 1;
} }
public boolean isLastPage() { public boolean isLastPage() {
return page >= getTotalPages(); return pageNum >= getTotalPages();
} }
public int getPrePage() { public int getPrePage() {
if (isHasPrePage()) { if (isHasPrePage()) {
return page - 1; return pageNum - 1;
} else { } else {
return page; return pageNum;
} }
} }
public int getNextPage() { public int getNextPage() {
if (isHasNextPage()) { if (isHasNextPage()) {
return page + 1; return pageNum + 1;
} else { } else {
return page; return pageNum;
} }
} }
public boolean isDisabledPage(int page) { public boolean isDisabledPage(int pageNum) {
return ((page < 1) || (page > getTotalPages()) || (page == this.page)); return ((pageNum < 1) || (pageNum > getTotalPages()) || (pageNum == this.pageNum));
} }
public boolean isHasPrePage() { public boolean isHasPrePage() {
return (page - 1 >= 1); return (pageNum - 1 >= 1);
} }
public boolean isHasNextPage() { public boolean isHasNextPage() {
return (page + 1 <= getTotalPages()); return (pageNum + 1 <= getTotalPages());
} }
public int getStartRow() { public int getStartRow() {
if (getLimit() <= 0 || totalCount <= 0) if (getLimit() <= 0 || totalCount <= 0)
return 0; return 0;
return page > 0 ? (page - 1) * getLimit() + 1 : 0; return pageNum > 0 ? (pageNum - 1) * getLimit() + 1 : 0;
} }
public int getEndRow() { public int getEndRow() {
return page > 0 ? Math.min(limit * page, getTotalCount()) : 0; return pageNum > 0 ? Math.min(limit * pageNum, getTotalCount()) : 0;
} }
public int getOffset() { public int getOffset() {
return page > 0 ? (page - 1) * getLimit() : 0; return pageNum > 0 ? (pageNum - 1) * getLimit() : 0;
} }
public int getTotalPages() { public int getTotalPages() {
@ -105,8 +105,8 @@ public class Paginator implements Serializable {
return count; return count;
} }
protected int computePageNo(int page) { protected int computePageNo(int pageNum) {
return computePageNumber(page, limit, totalCount); return computePageNumber(pageNum, limit, totalCount);
} }
private static int computeLastPageNumber(int totalItems, int pageSize) { private static int computeLastPageNumber(int totalItems, int pageSize) {
@ -119,22 +119,22 @@ public class Paginator implements Serializable {
return result; return result;
} }
private static int computePageNumber(int page, int pageSize, int totalItems) { private static int computePageNumber(int pageNum, int pageSize, int totalItems) {
if (page <= 1) { if (pageNum <= 1) {
return 1; return 1;
} }
if (Integer.MAX_VALUE == page if (Integer.MAX_VALUE == pageNum
|| page > computeLastPageNumber(totalItems, pageSize)) { // last || pageNum > computeLastPageNumber(totalItems, pageSize)) { // last
// page // page
return computeLastPageNumber(totalItems, pageSize); return computeLastPageNumber(totalItems, pageSize);
} }
return page; return pageNum;
} }
@Override @Override
public String toString() { public String toString() {
return "Paginator" + return "Paginator" +
"{page=" + page + "{pageNum=" + pageNum +
", limit=" + limit + ", limit=" + limit +
", totalCount=" + totalCount + ", totalCount=" + totalCount +
'}'; '}';

@ -27,7 +27,7 @@ public class PageListJsonSerializer extends JsonSerializer<PageList>{
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put("totalCount", paginator.getTotalCount()); map.put("totalCount", paginator.getTotalCount());
map.put("totalPages", paginator.getTotalPages()); map.put("totalPages", paginator.getTotalPages());
map.put("page", paginator.getPage()); map.put("pageNum", paginator.getPageNum());
map.put("limit", paginator.getLimit()); map.put("limit", paginator.getLimit());
// Query Data // Query Data
map.put(PagingConstants.RSLT_ATTR_NAME, new ArrayList(value)); map.put(PagingConstants.RSLT_ATTR_NAME, new ArrayList(value));

@ -59,7 +59,7 @@ public class PageListAttrHandlerInterceptor extends HandlerInterceptorAdapter {
map.put("totalCount", paginator.getTotalCount()); map.put("totalCount", paginator.getTotalCount());
map.put("totalPages", paginator.getTotalPages()); map.put("totalPages", paginator.getTotalPages());
map.put("page", paginator.getPage()); map.put("pageNum", paginator.getPageNum());
map.put("limit", paginator.getLimit()); map.put("limit", paginator.getLimit());
// Query Data : Paging 정보만 set 하면 되므로 필요 없다 // Query Data : Paging 정보만 set 하면 되므로 필요 없다
//map.put(FwConstants.DEFAULT_RESPONSE_BODY_DATA_NAME, new ArrayList<PageList>(pageList)); //map.put(FwConstants.DEFAULT_RESPONSE_BODY_DATA_NAME, new ArrayList<PageList>(pageList));

@ -72,6 +72,7 @@
</typeHandlers> </typeHandlers>
<plugins> <plugins>
<!--<plugin interceptor="cokr.xit.foundation.data.paging.PagingSupport" />-->
<plugin interceptor="kr.xit.fims.framework.support.mybatis.paging.OffsetLimitInterceptor"> <plugin interceptor="kr.xit.fims.framework.support.mybatis.paging.OffsetLimitInterceptor">
<property name="dialectClass" value="kr.xit.fims.framework.support.mybatis.paging.dialect.MySQLDialect"/> <property name="dialectClass" value="kr.xit.fims.framework.support.mybatis.paging.dialect.MySQLDialect"/>
</plugin> </plugin>

@ -58,7 +58,7 @@ Date Author Description
$$Control.onDatasetChange = obj => { $$Control.onDatasetChange = obj => {
let pagination = obj.data.pagination; let pagination = obj.data.pagination;
$$Control._paginationInfo.pageNum = pagination.page; $$Control._paginationInfo.pageNum = pagination.pageNum;
$$Control.totalCountSetting(obj); $$Control.totalCountSetting(obj);
@ -66,8 +66,8 @@ Date Author Description
if($$Control._paginationInfo.pagingType != "scroll"){ if($$Control._paginationInfo.pagingType != "scroll"){
let start = 0; let start = 0;
if(pagination.page > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){
start = $$Control._paginationInfo.fetchSize * (pagination.page - 1); start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1);
} }
$("#grid1Paging").setPaging({ $("#grid1Paging").setPaging({
list: $$Control.dataset, list: $$Control.dataset,

@ -88,7 +88,7 @@ Date Author Description
$$Control.onDatasetChange = obj => { $$Control.onDatasetChange = obj => {
let pagination = obj.data.pagination; let pagination = obj.data.pagination;
$$Control._paginationInfo.pageNum = pagination.page; $$Control._paginationInfo.pageNum = pagination.pageNum;
$$Control.totalCountSetting(obj); $$Control.totalCountSetting(obj);
@ -96,8 +96,8 @@ Date Author Description
if($$Control._paginationInfo.pagingType != "scroll"){ if($$Control._paginationInfo.pagingType != "scroll"){
let start = 0; let start = 0;
if(pagination.page > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){
start = $$Control._paginationInfo.fetchSize * (pagination.page - 1); start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1);
} }
$("#grid1Paging").setPaging({ $("#grid1Paging").setPaging({
list: $$Control.dataset, list: $$Control.dataset,

@ -81,7 +81,7 @@ Date Author Description
$$Control.onDatasetChange = obj => { $$Control.onDatasetChange = obj => {
let pagination = obj.data.pagination; let pagination = obj.data.pagination;
$$Control._paginationInfo.pageNum = pagination.page; $$Control._paginationInfo.pageNum = pagination.pageNum;
$$Control.totalCountSetting(obj); $$Control.totalCountSetting(obj);
@ -89,8 +89,8 @@ Date Author Description
if($$Control._paginationInfo.pagingType != "scroll"){ if($$Control._paginationInfo.pagingType != "scroll"){
let start = 0; let start = 0;
if(pagination.page > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){
start = $$Control._paginationInfo.fetchSize * (pagination.page - 1); start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1);
} }
$("#grid1Paging").setPaging({ $("#grid1Paging").setPaging({
list: $$Control.dataset, list: $$Control.dataset,
@ -136,7 +136,7 @@ Date Author Description
$2$Control.onDatasetChange = obj => { $2$Control.onDatasetChange = obj => {
let pagination = obj.data.pagination; let pagination = obj.data.pagination;
$2$Control._paginationInfo.pageNum = pagination.page; $2$Control._paginationInfo.pageNum = pagination.pageNum;
$2$Control.totalCountSetting(obj); $2$Control.totalCountSetting(obj);
@ -144,8 +144,8 @@ Date Author Description
if($2$Control._paginationInfo.pagingType != "scroll"){ if($2$Control._paginationInfo.pagingType != "scroll"){
let start = 0; let start = 0;
if(pagination.page > 1 && pagination.totalPage > 1 && pagination.totalCount > $2$Control._paginationInfo.fetchSize){ if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $2$Control._paginationInfo.fetchSize){
start = $2$Control._paginationInfo.fetchSize * (pagination.page - 1); start = $2$Control._paginationInfo.fetchSize * (pagination.pageNum - 1);
} }
$("#grid2Paging").setPaging({ $("#grid2Paging").setPaging({
list: $2$Control.dataset, list: $2$Control.dataset,

@ -711,7 +711,7 @@ Date Author Description
$1$Control.onDatasetChange = obj => { $1$Control.onDatasetChange = obj => {
if(obj.data.pagination != null){ if(obj.data.pagination != null){
let pagination = obj.data.pagination; let pagination = obj.data.pagination;
$1$Control._paginationInfo.pageNum = pagination.page; $1$Control._paginationInfo.pageNum = pagination.pageNum;
} }
$1$Control.totalCountSetting(obj); $1$Control.totalCountSetting(obj);
@ -734,7 +734,7 @@ Date Author Description
$2$Control.onDatasetChange = obj => { $2$Control.onDatasetChange = obj => {
if(obj.data.pagination != null) { if(obj.data.pagination != null) {
let pagination = obj.data.pagination; let pagination = obj.data.pagination;
$2$Control._paginationInfo.pageNum = pagination.page; $2$Control._paginationInfo.pageNum = pagination.pageNum;
} }
$2$Control.totalCountSetting(obj); $2$Control.totalCountSetting(obj);
@ -756,7 +756,7 @@ Date Author Description
$3$Control.onDatasetChange = obj => { $3$Control.onDatasetChange = obj => {
if(obj.data.pagination != null) { if(obj.data.pagination != null) {
let pagination = obj.data.pagination; let pagination = obj.data.pagination;
$3$Control._paginationInfo.pageNum = pagination.page; $3$Control._paginationInfo.pageNum = pagination.pageNum;
} }
$3$Control.totalCountSetting(obj); $3$Control.totalCountSetting(obj);
@ -778,7 +778,7 @@ Date Author Description
$4$Control.onDatasetChange = obj => { $4$Control.onDatasetChange = obj => {
if(obj.data.pagination != null) { if(obj.data.pagination != null) {
let pagination = obj.data.pagination; let pagination = obj.data.pagination;
$4$Control._paginationInfo.pageNum = pagination.page; $4$Control._paginationInfo.pageNum = pagination.pageNum;
} }
$4$Control.totalCountSetting(obj); $4$Control.totalCountSetting(obj);
@ -800,7 +800,7 @@ Date Author Description
$5$Control.onDatasetChange = obj => { $5$Control.onDatasetChange = obj => {
if(obj.data.pagination != null) { if(obj.data.pagination != null) {
let pagination = obj.data.pagination; let pagination = obj.data.pagination;
$5$Control._paginationInfo.pageNum = pagination.page; $5$Control._paginationInfo.pageNum = pagination.pageNum;
} }
$5$Control.totalCountSetting(obj); $5$Control.totalCountSetting(obj);

@ -287,7 +287,7 @@ Date Author Description
$$Control.onDatasetChange = obj => { $$Control.onDatasetChange = obj => {
let pagination = obj.data.pagination; let pagination = obj.data.pagination;
$$Control._paginationInfo.pageNum = pagination.page; $$Control._paginationInfo.pageNum = pagination.pageNum;
$$Control.totalCountSetting(obj); $$Control.totalCountSetting(obj);
@ -295,8 +295,8 @@ Date Author Description
if($$Control._paginationInfo.pagingType != "scroll"){ if($$Control._paginationInfo.pagingType != "scroll"){
let start = 0; let start = 0;
if(pagination.page > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){
start = $$Control._paginationInfo.fetchSize * (pagination.page - 1); start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1);
} }
$("#grid1Paging").setPaging({ $("#grid1Paging").setPaging({
list: $$Control.dataset, list: $$Control.dataset,

@ -76,7 +76,7 @@
$$Control.onDatasetChange = obj => { $$Control.onDatasetChange = obj => {
let pagination = obj.data.pagination; let pagination = obj.data.pagination;
$$Control._paginationInfo.pageNum = pagination.page; $$Control._paginationInfo.pageNum = pagination.pageNum;
$$Control.totalCountSetting(obj); $$Control.totalCountSetting(obj);
@ -84,8 +84,8 @@
if($$Control._paginationInfo.pagingType != "scroll"){ if($$Control._paginationInfo.pagingType != "scroll"){
let start = 0; let start = 0;
if(pagination.page > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){
start = $$Control._paginationInfo.fetchSize * (pagination.page - 1); start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1);
} }
$("#grid1Paging").setPaging({ $("#grid1Paging").setPaging({
list: $$Control.dataset, list: $$Control.dataset,

@ -72,8 +72,10 @@
$$Control.onDatasetChange = obj => { $$Control.onDatasetChange = obj => {
let pagination = obj.data.pagination; let pagination = obj.data.pagination;
console.log("리턴");
console.log(obj.data.pagination);
$$Control._paginationInfo.pageNum = pagination.page; $$Control._paginationInfo.pageNum = pagination.pageNum;
$$Control.totalCountSetting(obj); $$Control.totalCountSetting(obj);
@ -81,8 +83,8 @@
if($$Control._paginationInfo.pagingType != "scroll"){ if($$Control._paginationInfo.pagingType != "scroll"){
let start = 0; let start = 0;
if(pagination.page > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){
start = $$Control._paginationInfo.fetchSize * (pagination.page - 1); start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1);
} }
$("#grid1Paging").setPaging({ $("#grid1Paging").setPaging({
list: $$Control.dataset, list: $$Control.dataset,

@ -87,7 +87,7 @@
$$Control.onDatasetChange = obj => { $$Control.onDatasetChange = obj => {
let pagination = obj.data.pagination; let pagination = obj.data.pagination;
$$Control._paginationInfo.pageNum = pagination.page; $$Control._paginationInfo.pageNum = pagination.pageNum;
$$Control.totalCountSetting(obj); $$Control.totalCountSetting(obj);
@ -95,8 +95,8 @@
if($$Control._paginationInfo.pagingType != "scroll"){ if($$Control._paginationInfo.pagingType != "scroll"){
let start = 0; let start = 0;
if(pagination.page > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){
start = $$Control._paginationInfo.fetchSize * (pagination.page - 1); start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1);
} }
$("#grid1Paging").setPaging({ $("#grid1Paging").setPaging({
list: $$Control.dataset, list: $$Control.dataset,

@ -74,7 +74,7 @@
$$Control.onDatasetChange = obj => { $$Control.onDatasetChange = obj => {
let pagination = obj.data.pagination; let pagination = obj.data.pagination;
$$Control._paginationInfo.pageNum = pagination.page; $$Control._paginationInfo.pageNum = pagination.pageNum;
$$Control.totalCountSetting(obj); $$Control.totalCountSetting(obj);
@ -82,8 +82,8 @@
if($$Control._paginationInfo.pagingType != "scroll"){ if($$Control._paginationInfo.pagingType != "scroll"){
let start = 0; let start = 0;
if(pagination.page > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){
start = $$Control._paginationInfo.fetchSize * (pagination.page - 1); start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1);
} }
$("#grid1Paging").setPaging({ $("#grid1Paging").setPaging({
list: $$Control.dataset, list: $$Control.dataset,

@ -71,7 +71,7 @@
$$Control.onDatasetChange = obj => { $$Control.onDatasetChange = obj => {
let pagination = obj.data.pagination; let pagination = obj.data.pagination;
$$Control._paginationInfo.pageNum = pagination.page; $$Control._paginationInfo.pageNum = pagination.pageNum;
$$Control.totalCountSetting(obj); $$Control.totalCountSetting(obj);
@ -79,8 +79,8 @@
if($$Control._paginationInfo.pagingType != "scroll"){ if($$Control._paginationInfo.pagingType != "scroll"){
let start = 0; let start = 0;
if(pagination.page > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){
start = $$Control._paginationInfo.fetchSize * (pagination.page - 1); start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1);
} }
$("#grid1Paging").setPaging({ $("#grid1Paging").setPaging({
list: $$Control.dataset, list: $$Control.dataset,

@ -220,7 +220,7 @@ Date Author Description
$1$Control.onDatasetChange = obj => { $1$Control.onDatasetChange = obj => {
let pagination = obj.data.pagination; let pagination = obj.data.pagination;
$1$Control._paginationInfo.pageNum = pagination.page; $1$Control._paginationInfo.pageNum = pagination.pageNum;
$1$Control.totalCountSetting(obj); $1$Control.totalCountSetting(obj);
@ -244,7 +244,7 @@ Date Author Description
$2$Control.onDatasetChange = obj => { $2$Control.onDatasetChange = obj => {
let pagination = obj.data.pagination; let pagination = obj.data.pagination;
$2$Control._paginationInfo.pageNum = pagination.page; $2$Control._paginationInfo.pageNum = pagination.pageNum;
$2$Control.totalCountSetting(obj); $2$Control.totalCountSetting(obj);
@ -268,7 +268,7 @@ Date Author Description
$3$Control.onDatasetChange = obj => { $3$Control.onDatasetChange = obj => {
let pagination = obj.data.pagination; let pagination = obj.data.pagination;
$3$Control._paginationInfo.pageNum = pagination.page; $3$Control._paginationInfo.pageNum = pagination.pageNum;
$3$Control.totalCountSetting(obj); $3$Control.totalCountSetting(obj);

@ -213,7 +213,7 @@ Date Author Description
$$Control.onDatasetChange = obj => { $$Control.onDatasetChange = obj => {
let pagination = obj.data.pagination; let pagination = obj.data.pagination;
$$Control._paginationInfo.pageNum = pagination.page; $$Control._paginationInfo.pageNum = pagination.pageNum;
$$Control.totalCountSetting(obj); $$Control.totalCountSetting(obj);
@ -221,8 +221,8 @@ Date Author Description
if($$Control._paginationInfo.pagingType != "scroll"){ if($$Control._paginationInfo.pagingType != "scroll"){
let start = 0; let start = 0;
if(pagination.page > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){
start = $$Control._paginationInfo.fetchSize * (pagination.page - 1); start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1);
} }
$("#grid1Paging").setPaging({ $("#grid1Paging").setPaging({
list: $$Control.dataset, list: $$Control.dataset,

@ -74,7 +74,7 @@
$$Control.onDatasetChange = obj => { $$Control.onDatasetChange = obj => {
let pagination = obj.data.pagination; let pagination = obj.data.pagination;
$$Control._paginationInfo.pageNum = pagination.page; $$Control._paginationInfo.pageNum = pagination.pageNum;
$$Control.totalCountSetting(obj); $$Control.totalCountSetting(obj);
@ -82,8 +82,8 @@
if($$Control._paginationInfo.pagingType != "scroll"){ if($$Control._paginationInfo.pagingType != "scroll"){
let start = 0; let start = 0;
if(pagination.page > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){
start = $$Control._paginationInfo.fetchSize * (pagination.page - 1); start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1);
} }
$("#grid1Paging").setPaging({ $("#grid1Paging").setPaging({
list: $$Control.dataset, list: $$Control.dataset,

@ -93,7 +93,7 @@
$$Control.onDatasetChange = obj => { $$Control.onDatasetChange = obj => {
let pagination = obj.data.pagination; let pagination = obj.data.pagination;
$$Control._paginationInfo.pageNum = pagination.page; $$Control._paginationInfo.pageNum = pagination.pageNum;
$$Control.totalCountSetting(obj); $$Control.totalCountSetting(obj);
@ -101,8 +101,8 @@
if($$Control._paginationInfo.pagingType != "scroll"){ if($$Control._paginationInfo.pagingType != "scroll"){
let start = 0; let start = 0;
if(pagination.page > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){
start = $$Control._paginationInfo.fetchSize * (pagination.page - 1); start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1);
} }
$("#grid1Paging").setPaging({ $("#grid1Paging").setPaging({
list: $$Control.dataset, list: $$Control.dataset,

@ -68,7 +68,7 @@
$$Control.onDatasetChange = obj => { $$Control.onDatasetChange = obj => {
let pagination = obj.data.pagination; let pagination = obj.data.pagination;
$$Control._paginationInfo.pageNum = pagination.page; $$Control._paginationInfo.pageNum = pagination.pageNum;
$$Control.totalCountSetting(obj); $$Control.totalCountSetting(obj);
@ -76,8 +76,8 @@
if($$Control._paginationInfo.pagingType != "scroll"){ if($$Control._paginationInfo.pagingType != "scroll"){
let start = 0; let start = 0;
if(pagination.page > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){
start = $$Control._paginationInfo.fetchSize * (pagination.page - 1); start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1);
} }
$("#grid1Paging").setPaging({ $("#grid1Paging").setPaging({
list: $$Control.dataset, list: $$Control.dataset,

@ -70,7 +70,7 @@
$$Control.onDatasetChange = obj => { $$Control.onDatasetChange = obj => {
let pagination = obj.data.pagination; let pagination = obj.data.pagination;
$$Control._paginationInfo.pageNum = pagination.page; $$Control._paginationInfo.pageNum = pagination.pageNum;
$$Control.totalCountSetting(obj); $$Control.totalCountSetting(obj);
@ -78,8 +78,8 @@
if($$Control._paginationInfo.pagingType != "scroll"){ if($$Control._paginationInfo.pagingType != "scroll"){
let start = 0; let start = 0;
if(pagination.page > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){
start = $$Control._paginationInfo.fetchSize * (pagination.page - 1); start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1);
} }
$("#grid1Paging").setPaging({ $("#grid1Paging").setPaging({
list: $$Control.dataset, list: $$Control.dataset,

@ -72,7 +72,7 @@
$$Control.onDatasetChange = obj => { $$Control.onDatasetChange = obj => {
let pagination = obj.data.pagination; let pagination = obj.data.pagination;
$$Control._paginationInfo.pageNum = pagination.page; $$Control._paginationInfo.pageNum = pagination.pageNum;
$$Control.totalCountSetting(obj); $$Control.totalCountSetting(obj);
@ -80,8 +80,8 @@
if($$Control._paginationInfo.pagingType != "scroll"){ if($$Control._paginationInfo.pagingType != "scroll"){
let start = 0; let start = 0;
if(pagination.page > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){
start = $$Control._paginationInfo.fetchSize * (pagination.page - 1); start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1);
} }
$("#grid1Paging").setPaging({ $("#grid1Paging").setPaging({
list: $$Control.dataset, list: $$Control.dataset,

@ -69,7 +69,7 @@
$$Control.onDatasetChange = obj => { $$Control.onDatasetChange = obj => {
let pagination = obj.data.pagination; let pagination = obj.data.pagination;
$$Control._paginationInfo.pageNum = pagination.page; $$Control._paginationInfo.pageNum = pagination.pageNum;
$$Control.totalCountSetting(obj); $$Control.totalCountSetting(obj);
@ -77,8 +77,8 @@
if($$Control._paginationInfo.pagingType != "scroll"){ if($$Control._paginationInfo.pagingType != "scroll"){
let start = 0; let start = 0;
if(pagination.page > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){
start = $$Control._paginationInfo.fetchSize * (pagination.page - 1); start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1);
} }
$("#grid1Paging").setPaging({ $("#grid1Paging").setPaging({
list: $$Control.dataset, list: $$Control.dataset,

@ -71,7 +71,7 @@
$$Control.onDatasetChange = obj => { $$Control.onDatasetChange = obj => {
let pagination = obj.data.pagination; let pagination = obj.data.pagination;
$$Control._paginationInfo.pageNum = pagination.page; $$Control._paginationInfo.pageNum = pagination.pageNum;
$$Control.totalCountSetting(obj); $$Control.totalCountSetting(obj);
@ -79,8 +79,8 @@
if($$Control._paginationInfo.pagingType != "scroll"){ if($$Control._paginationInfo.pagingType != "scroll"){
let start = 0; let start = 0;
if(pagination.page > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){
start = $$Control._paginationInfo.fetchSize * (pagination.page - 1); start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1);
} }
$("#grid1Paging").setPaging({ $("#grid1Paging").setPaging({
list: $$Control.dataset, list: $$Control.dataset,

@ -76,7 +76,7 @@
$$Control.onDatasetChange = obj => { $$Control.onDatasetChange = obj => {
let pagination = obj.data.pagination; let pagination = obj.data.pagination;
$$Control._paginationInfo.pageNum = pagination.page; $$Control._paginationInfo.pageNum = pagination.pageNum;
$$Control.totalCountSetting(obj); $$Control.totalCountSetting(obj);
@ -84,8 +84,8 @@
if($$Control._paginationInfo.pagingType != "scroll"){ if($$Control._paginationInfo.pagingType != "scroll"){
let start = 0; let start = 0;
if(pagination.page > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){
start = $$Control._paginationInfo.fetchSize * (pagination.page - 1); start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1);
} }
$("#grid1Paging").setPaging({ $("#grid1Paging").setPaging({
list: $$Control.dataset, list: $$Control.dataset,

@ -70,7 +70,7 @@
$$Control.onDatasetChange = obj => { $$Control.onDatasetChange = obj => {
let pagination = obj.data.pagination; let pagination = obj.data.pagination;
$$Control._paginationInfo.pageNum = pagination.page; $$Control._paginationInfo.pageNum = pagination.pageNum;
$$Control.totalCountSetting(obj); $$Control.totalCountSetting(obj);
@ -78,8 +78,8 @@
if($$Control._paginationInfo.pagingType != "scroll"){ if($$Control._paginationInfo.pagingType != "scroll"){
let start = 0; let start = 0;
if(pagination.page > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){
start = $$Control._paginationInfo.fetchSize * (pagination.page - 1); start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1);
} }
$("#grid1Paging").setPaging({ $("#grid1Paging").setPaging({
list: $$Control.dataset, list: $$Control.dataset,

@ -80,7 +80,7 @@
$$Control.onDatasetChange = obj => { $$Control.onDatasetChange = obj => {
let pagination = obj.data.pagination; let pagination = obj.data.pagination;
$$Control._paginationInfo.pageNum = pagination.page; $$Control._paginationInfo.pageNum = pagination.pageNum;
$$Control.totalCountSetting(obj); $$Control.totalCountSetting(obj);
@ -88,8 +88,8 @@
if($$Control._paginationInfo.pagingType != "scroll"){ if($$Control._paginationInfo.pagingType != "scroll"){
let start = 0; let start = 0;
if(pagination.page > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){
start = $$Control._paginationInfo.fetchSize * (pagination.page - 1); start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1);
} }
$("#grid1Paging").setPaging({ $("#grid1Paging").setPaging({
list: $$Control.dataset, list: $$Control.dataset,

@ -72,7 +72,7 @@
$$Control.onDatasetChange = obj => { $$Control.onDatasetChange = obj => {
let pagination = obj.data.pagination; let pagination = obj.data.pagination;
$$Control._paginationInfo.pageNum = pagination.page; $$Control._paginationInfo.pageNum = pagination.pageNum;
$$Control.totalCountSetting(obj); $$Control.totalCountSetting(obj);
@ -80,8 +80,8 @@
if($$Control._paginationInfo.pagingType != "scroll"){ if($$Control._paginationInfo.pagingType != "scroll"){
let start = 0; let start = 0;
if(pagination.page > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){
start = $$Control._paginationInfo.fetchSize * (pagination.page - 1); start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1);
} }
$("#grid1Paging").setPaging({ $("#grid1Paging").setPaging({
list: $$Control.dataset, list: $$Control.dataset,

@ -75,7 +75,7 @@
$$Control.onDatasetChange = obj => { $$Control.onDatasetChange = obj => {
let pagination = obj.data.pagination; let pagination = obj.data.pagination;
$$Control._paginationInfo.pageNum = pagination.page; $$Control._paginationInfo.pageNum = pagination.pageNum;
$$Control.totalCountSetting(obj); $$Control.totalCountSetting(obj);
@ -83,8 +83,8 @@
if($$Control._paginationInfo.pagingType != "scroll"){ if($$Control._paginationInfo.pagingType != "scroll"){
let start = 0; let start = 0;
if(pagination.page > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){
start = $$Control._paginationInfo.fetchSize * (pagination.page - 1); start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1);
} }
$("#grid1Paging").setPaging({ $("#grid1Paging").setPaging({
list: $$Control.dataset, list: $$Control.dataset,

@ -74,7 +74,7 @@
$$Control.onDatasetChange = obj => { $$Control.onDatasetChange = obj => {
let pagination = obj.data.pagination; let pagination = obj.data.pagination;
$$Control._paginationInfo.pageNum = pagination.page; $$Control._paginationInfo.pageNum = pagination.pageNum;
$$Control.totalCountSetting(obj); $$Control.totalCountSetting(obj);
@ -82,8 +82,8 @@
if($$Control._paginationInfo.pagingType != "scroll"){ if($$Control._paginationInfo.pagingType != "scroll"){
let start = 0; let start = 0;
if(pagination.page > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){
start = $$Control._paginationInfo.fetchSize * (pagination.page - 1); start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1);
} }
$("#grid1Paging").setPaging({ $("#grid1Paging").setPaging({
list: $$Control.dataset, list: $$Control.dataset,

@ -71,7 +71,7 @@
$$Control.onDatasetChange = obj => { $$Control.onDatasetChange = obj => {
let pagination = obj.data.pagination; let pagination = obj.data.pagination;
$$Control._paginationInfo.pageNum = pagination.page; $$Control._paginationInfo.pageNum = pagination.pageNum;
$$Control.totalCountSetting(obj); $$Control.totalCountSetting(obj);
@ -79,8 +79,8 @@
if($$Control._paginationInfo.pagingType != "scroll"){ if($$Control._paginationInfo.pagingType != "scroll"){
let start = 0; let start = 0;
if(pagination.page > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){
start = $$Control._paginationInfo.fetchSize * (pagination.page - 1); start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1);
} }
$("#grid1Paging").setPaging({ $("#grid1Paging").setPaging({
list: $$Control.dataset, list: $$Control.dataset,

@ -71,7 +71,7 @@
$$Control.onDatasetChange = obj => { $$Control.onDatasetChange = obj => {
let pagination = obj.data.pagination; let pagination = obj.data.pagination;
$$Control._paginationInfo.pageNum = pagination.page; $$Control._paginationInfo.pageNum = pagination.pageNum;
$$Control.totalCountSetting(obj); $$Control.totalCountSetting(obj);
@ -79,8 +79,8 @@
if($$Control._paginationInfo.pagingType != "scroll"){ if($$Control._paginationInfo.pagingType != "scroll"){
let start = 0; let start = 0;
if(pagination.page > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){
start = $$Control._paginationInfo.fetchSize * (pagination.page - 1); start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1);
} }
$("#grid1Paging").setPaging({ $("#grid1Paging").setPaging({
list: $$Control.dataset, list: $$Control.dataset,

@ -85,7 +85,7 @@
$$Control.onDatasetChange = obj => { $$Control.onDatasetChange = obj => {
let pagination = obj.data.pagination; let pagination = obj.data.pagination;
$$Control._paginationInfo.pageNum = pagination.page; $$Control._paginationInfo.pageNum = pagination.pageNum;
$$Control.totalCountSetting(obj); $$Control.totalCountSetting(obj);
@ -93,8 +93,8 @@
if($$Control._paginationInfo.pagingType != "scroll"){ if($$Control._paginationInfo.pagingType != "scroll"){
let start = 0; let start = 0;
if(pagination.page > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){
start = $$Control._paginationInfo.fetchSize * (pagination.page - 1); start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1);
} }
$("#grid1Paging").setPaging({ $("#grid1Paging").setPaging({
list: $$Control.dataset, list: $$Control.dataset,

@ -79,7 +79,7 @@
$$Control.onDatasetChange = obj => { $$Control.onDatasetChange = obj => {
let pagination = obj.data.pagination; let pagination = obj.data.pagination;
$$Control._paginationInfo.pageNum = pagination.page; $$Control._paginationInfo.pageNum = pagination.pageNum;
$$Control.totalCountSetting(obj); $$Control.totalCountSetting(obj);
@ -87,8 +87,8 @@
if($$Control._paginationInfo.pagingType != "scroll"){ if($$Control._paginationInfo.pagingType != "scroll"){
let start = 0; let start = 0;
if(pagination.page > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){
start = $$Control._paginationInfo.fetchSize * (pagination.page - 1); start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1);
} }
$("#grid1Paging").setPaging({ $("#grid1Paging").setPaging({
list: $$Control.dataset, list: $$Control.dataset,

@ -78,7 +78,7 @@
$$Control.onDatasetChange = obj => { $$Control.onDatasetChange = obj => {
let pagination = obj.data.pagination; let pagination = obj.data.pagination;
$$Control._paginationInfo.pageNum = pagination.page; $$Control._paginationInfo.pageNum = pagination.pageNum;
$$Control.totalCountSetting(obj); $$Control.totalCountSetting(obj);
@ -86,8 +86,8 @@
if($$Control._paginationInfo.pagingType != "scroll"){ if($$Control._paginationInfo.pagingType != "scroll"){
let start = 0; let start = 0;
if(pagination.page > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){
start = $$Control._paginationInfo.fetchSize * (pagination.page - 1); start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1);
} }
$("#grid1Paging").setPaging({ $("#grid1Paging").setPaging({
list: $$Control.dataset, list: $$Control.dataset,

@ -62,7 +62,7 @@
$$Control.onDatasetChange = obj => { $$Control.onDatasetChange = obj => {
let pagination = obj.data.pagination; let pagination = obj.data.pagination;
$$Control._paginationInfo.pageNum = pagination.page; $$Control._paginationInfo.pageNum = pagination.pageNum;
$$Control.totalCountSetting(obj); $$Control.totalCountSetting(obj);
@ -70,8 +70,8 @@
if($$Control._paginationInfo.pagingType != "scroll"){ if($$Control._paginationInfo.pagingType != "scroll"){
let start = 0; let start = 0;
if(pagination.page > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){
start = $$Control._paginationInfo.fetchSize * (pagination.page - 1); start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1);
} }
$("#grid1Paging").setPaging({ $("#grid1Paging").setPaging({
list: $$Control.dataset, list: $$Control.dataset,

@ -76,7 +76,7 @@
$$Control.onDatasetChange = obj => { $$Control.onDatasetChange = obj => {
let pagination = obj.data.pagination; let pagination = obj.data.pagination;
$$Control._paginationInfo.pageNum = pagination.page; $$Control._paginationInfo.pageNum = pagination.pageNum;
$$Control.totalCountSetting(obj); $$Control.totalCountSetting(obj);
@ -84,8 +84,8 @@
if($$Control._paginationInfo.pagingType != "scroll"){ if($$Control._paginationInfo.pagingType != "scroll"){
let start = 0; let start = 0;
if(pagination.page > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){
start = $$Control._paginationInfo.fetchSize * (pagination.page - 1); start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1);
} }
$("#grid1Paging").setPaging({ $("#grid1Paging").setPaging({
list: $$Control.dataset, list: $$Control.dataset,

@ -72,7 +72,7 @@
$$Control.onDatasetChange = obj => { $$Control.onDatasetChange = obj => {
let pagination = obj.data.pagination; let pagination = obj.data.pagination;
$$Control._paginationInfo.pageNum = pagination.page; $$Control._paginationInfo.pageNum = pagination.pageNum;
$$Control.totalCountSetting(obj); $$Control.totalCountSetting(obj);
@ -80,8 +80,8 @@
if($$Control._paginationInfo.pagingType != "scroll"){ if($$Control._paginationInfo.pagingType != "scroll"){
let start = 0; let start = 0;
if(pagination.page > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){
start = $$Control._paginationInfo.fetchSize * (pagination.page - 1); start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1);
} }
$("#grid1Paging").setPaging({ $("#grid1Paging").setPaging({
list: $$Control.dataset, list: $$Control.dataset,

@ -75,7 +75,7 @@
$$Control.onDatasetChange = obj => { $$Control.onDatasetChange = obj => {
let pagination = obj.data.pagination; let pagination = obj.data.pagination;
$$Control._paginationInfo.pageNum = pagination.page; $$Control._paginationInfo.pageNum = pagination.pageNum;
$$Control.totalCountSetting(obj); $$Control.totalCountSetting(obj);
@ -83,8 +83,8 @@
if($$Control._paginationInfo.pagingType != "scroll"){ if($$Control._paginationInfo.pagingType != "scroll"){
let start = 0; let start = 0;
if(pagination.page > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){
start = $$Control._paginationInfo.fetchSize * (pagination.page - 1); start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1);
} }
$("#grid1Paging").setPaging({ $("#grid1Paging").setPaging({
list: $$Control.dataset, list: $$Control.dataset,

@ -80,7 +80,7 @@
$$Control.onDatasetChange = obj => { $$Control.onDatasetChange = obj => {
let pagination = obj.data.pagination; let pagination = obj.data.pagination;
$$Control._paginationInfo.pageNum = pagination.page; $$Control._paginationInfo.pageNum = pagination.pageNum;
$$Control.totalCountSetting(obj); $$Control.totalCountSetting(obj);
@ -88,8 +88,8 @@
if($$Control._paginationInfo.pagingType != "scroll"){ if($$Control._paginationInfo.pagingType != "scroll"){
let start = 0; let start = 0;
if(pagination.page > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){
start = $$Control._paginationInfo.fetchSize * (pagination.page - 1); start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1);
} }
$("#grid1Paging").setPaging({ $("#grid1Paging").setPaging({
list: $$Control.dataset, list: $$Control.dataset,

@ -100,7 +100,7 @@ Date Author Description
$$Control.onDatasetChange = obj => { $$Control.onDatasetChange = obj => {
let pagination = obj.data.pagination; let pagination = obj.data.pagination;
$$Control._paginationInfo.pageNum = pagination.page; $$Control._paginationInfo.pageNum = pagination.pageNum;
$$Control.totalCountSetting(obj); $$Control.totalCountSetting(obj);
@ -108,8 +108,8 @@ Date Author Description
if($$Control._paginationInfo.pagingType != "scroll"){ if($$Control._paginationInfo.pagingType != "scroll"){
let start = 0; let start = 0;
if(pagination.page > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){ if(pagination.pageNum > 1 && pagination.totalPage > 1 && pagination.totalCount > $$Control._paginationInfo.fetchSize){
start = $$Control._paginationInfo.fetchSize * (pagination.page - 1); start = $$Control._paginationInfo.fetchSize * (pagination.pageNum - 1);
} }
$("#grid1Paging").setPaging({ $("#grid1Paging").setPaging({
list: $$Control.dataset, list: $$Control.dataset,

@ -595,10 +595,10 @@ class FimsDatasetControl extends DatasetControl {
} }
load(pageNum,flag) { load(pageNum,flag) {
this.query.pageNum = pageNum;
this.query.page = pageNum; this.query.page = pageNum;
this.query.perPage = this._paginationInfo.fetchSize; this.query.perPage = this._paginationInfo.fetchSize;
this.query.pageNum = pageNum;
this.query.fetchSize = this._paginationInfo.fetchSize; this.query.fetchSize = this._paginationInfo.fetchSize;
this._load(flag); this._load(flag);

@ -82,7 +82,7 @@ class CustomRowNumberRenderer {
if(props.grid.paginationInfoRef.pagingType == null){ if(props.grid.paginationInfoRef.pagingType == null){
return Number(props.formattedValue); return Number(props.formattedValue);
} }
if(props.grid.paginationInfoRef.pagingType != "scroll"){ if(props.grid.paginationInfoRef.pagingType == "scroll"){
return Number(props.formattedValue); return Number(props.formattedValue);
} }

Loading…
Cancel
Save