From c038e875e571626108158580fd64c5cee9fd847b Mon Sep 17 00:00:00 2001 From: "Jonguk. Lim" Date: Mon, 27 Mar 2023 17:47:26 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20tui-grid=20pagination=20type=20'scroll'?= =?UTF-8?q?=20=EC=8B=9C=20=ED=8E=98=EC=9D=B4=EC=A7=95=20fix=20=20=20=20=20?= =?UTF-8?q?=20=EB=AF=B8=EC=82=AC=EC=9A=A9=20jsp=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/rt/rtCrackdownExtrImposeMgtForm.jsp | 502 ----------------- .../rtCrackdownExtrInterfaceMgtForm_back.jsp | 509 ------------------ .../fims/biz/rt/rtCrackdownMgtMainForm.jsp | 3 +- .../biz/common/js/popupPageNavigation.js | 7 +- 4 files changed, 7 insertions(+), 1014 deletions(-) delete mode 100644 src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtCrackdownExtrImposeMgtForm.jsp delete mode 100644 src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtCrackdownExtrInterfaceMgtForm_back.jsp diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtCrackdownExtrImposeMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtCrackdownExtrImposeMgtForm.jsp deleted file mode 100644 index f3660881..00000000 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtCrackdownExtrImposeMgtForm.jsp +++ /dev/null @@ -1,502 +0,0 @@ -<%-- -================================================================================ -File : /fims/biz/rt/rtCrackdownExtrInterfaceMgtForm.jsp -Name : 외부자료연계 - 단속관리>단속현황관리 -Auth : lim.jong.uk -Date : 2022-01-26 -Desc : 단속현황관리 외부자료 연계탭 -================================================================================ -Date Author Description -================================================================================ -================================================================================ ---%> -<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> -<%@ include file="/WEB-INF/jsp/framework/taglibs.jsp" %> - - - -
- -
- - -
- -
전체 ㅣ
-
- -
- - - -
- - -<%----%> - diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtCrackdownExtrInterfaceMgtForm_back.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtCrackdownExtrInterfaceMgtForm_back.jsp deleted file mode 100644 index 472e035e..00000000 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtCrackdownExtrInterfaceMgtForm_back.jsp +++ /dev/null @@ -1,509 +0,0 @@ -<%-- -================================================================================ -File : /fims/biz/rt/rtCrackdownExtrInterfaceMgtForm.jsp -Name : 외부자료연계 - 단속관리>단속현황관리 -Auth : lim.jong.uk -Date : 2022-01-26 -Desc : 단속현황관리 외부자료 연계탭 -================================================================================ -Date Author Description -================================================================================ -================================================================================ ---%> -<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> -<%@ include file="/WEB-INF/jsp/framework/taglibs.jsp" %> - - - -
- -
- - -
- -
전체 ㅣ
-
- -
- - - -
- - -<%----%> - diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtCrackdownMgtMainForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtCrackdownMgtMainForm.jsp index 153e7d16..797457e3 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtCrackdownMgtMainForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtCrackdownMgtMainForm.jsp @@ -616,8 +616,9 @@ Date Author Description frozenCount: 6 } ,pageOptions: { - perPage: 1000, type: 'scroll' + ,perPage: 100, + } }; diff --git a/src/main/webapp/resources/biz/common/js/popupPageNavigation.js b/src/main/webapp/resources/biz/common/js/popupPageNavigation.js index ae120feb..8aeff8af 100644 --- a/src/main/webapp/resources/biz/common/js/popupPageNavigation.js +++ b/src/main/webapp/resources/biz/common/js/popupPageNavigation.js @@ -105,13 +105,15 @@ class PageNavigation { * @param {function} callback 페이지 이동시 호출할 callback */ onClickNavBtn(evDiv, callback) { + const isTypeScroll = this.grid.store?.data.pageOptions.type === 'scroll'; if (evDiv === 'next') { if(this.gridInfo.gridDataPos + 1 === this.gridInfo.perPage){ this.gridInfo.pageMove = true; this.gridInfo.next = true; this.gridInfo.page++; - this.grid.getPagination().movePageTo(this.gridInfo.page); + //isTypeScroll ? GRID.store.data.pageOptions.pageMove(this.gridInfo.page) : + if(!isTypeScroll) this.grid.getPagination()?.movePageTo(this.gridInfo.page); }else{ this.gridInfo.curRowPos++; @@ -125,7 +127,8 @@ class PageNavigation { this.gridInfo.pageMove = true; this.gridInfo.next = false; this.gridInfo.page--; - this.grid.getPagination().movePageTo(this.gridInfo.page); + //isTypeScroll ? GRID.store.data.pageOptions.pageMove?(this.gridInfo.page) : + if(!isTypeScroll) this.grid.getPagination()?.movePageTo(this.gridInfo.page); }else { this.gridInfo.curRowPos--;