From 6e98ae30583cdbebe2e1fad0e5aaad7b14dd777a Mon Sep 17 00:00:00 2001 From: leebj Date: Fri, 12 Jul 2024 09:13:04 +0900 Subject: [PATCH] =?UTF-8?q?=EC=86=8C=EC=8A=A4=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/jsp/adds/nims/bssh-popup.jsp | 9 ++------ .../WEB-INF/jsp/adds/nims/dsuseDoc-main.jsp | 17 +++------------ .../jsp/adds/nims/dsuseMgtMapping-info.jsp | 7 +------ .../jsp/adds/nims/dsuseMgtMapping-main.jsp | 15 ++----------- .../jsp/adds/nims/dsuseMgtReceipt-info.jsp | 7 +------ .../jsp/adds/nims/dsuseMgtReceipt-main.jsp | 21 +++++-------------- .../jsp/adds/nims/dsuseMgtRslt-info.jsp | 8 ++----- .../jsp/adds/nims/dsuseMgtRslt-main.jsp | 18 ++++------------ .../WEB-INF/jsp/adds/nims/product-popup.jsp | 12 ++++------- 9 files changed, 24 insertions(+), 90 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/bssh-popup.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/bssh-popup.jsp index bb93740..facb60c 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/bssh-popup.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/bssh-popup.jsp @@ -122,7 +122,7 @@ // $P.control 설정 $P.control.defaultFetchSize = FETCH_XXS; // 1 페이지당 조회되는 자료 건수 index.jsp에서 확인 FETCH_XS = 30 - $P.control.untilPageNum = 0; // 현재 페이지 번호 + $P.control.beforeCurrent = null; @@ -184,15 +184,10 @@ : ${infoPrefix}List.inStrings(foundTr.outerHTML, replacer); let noMore = (${infoPrefix}List.length >= totalSize); - let initScroll = ($P.control.query.pageNum < 2) && ($P.control.untilPageNum == 0); + let initScroll = ($P.control.query.pageNum < 2); $("#tbody--${pageName}").html(trs.join()); - if ($P.control.untilPageNum != 0) { - $P.control.query.fetchSize = $P.control.defaultFetchSize; - $P.control.query.pageNum = $P.control.untilPageNum; - $P.control.untilPageNum = 0; - } } /************************************************************************** diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseDoc-main.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseDoc-main.jsp index 1973ce8..27f8e2c 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseDoc-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseDoc-main.jsp @@ -197,7 +197,7 @@ }); // $P.control 설정 $P.control.defaultFetchSize = FETCH_XS; // 1 페이지당 조회되는 자료 건수 index.jsp에서 확인 FETCH_XS = 30 - $P.control.untilPageNum = 0; // 현재 페이지 번호 + $P.control.beforeCurrent = null; @@ -277,7 +277,7 @@ , title : dialogTitle , content : resp , size : $P.control.infoSize - , onClose : () => { $P.fnRefreshList(); } + , onClose : () => { } }); } });*/ @@ -311,11 +311,6 @@ $("#tbody--${pageName}").html(trs.join()); - if ($P.control.untilPageNum != 0) { - $P.control.query.fetchSize = $P.control.defaultFetchSize; - $P.control.query.pageNum = $P.control.untilPageNum; - $P.control.untilPageNum = 0; - } } @@ -341,13 +336,7 @@ /************************************************************************** * 사용자 함수(function) **************************************************************************/ - // 검색 자료 재조회 - $P.fnRefreshList = () => { - $P.control.untilPageNum = $P.control.query.pageNum; - $P.control.query.fetchSize = $P.control.defaultFetchSize * $P.control.query.pageNum; - - $P.control.load(1); - } + // 사용자검색 callback $P.callbackFindUser = (userId, userNm) => { diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-info.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-info.jsp index 7ccc0c8..d7d741c 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-info.jsp @@ -499,12 +499,7 @@ /************************************************************************** * 사용자 함수(function) **************************************************************************/ - // 검색 자료 재조회 - $P.fnRefreshList = () => { - $P.control.untilPageNum = $P.control.query.pageNum; - $P.control.query.fetchSize = $P.control.defaultFetchSize * $P.control.query.pageNum; - $P.control.load(1); - } + /************************************************************************** * 버튼 clickEvent diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-main.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-main.jsp index 12c49ab..a5dfd99 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-main.jsp @@ -220,7 +220,7 @@ }); // $P.control 설정 $P.control.defaultFetchSize = FETCH_XXS; // 1 페이지당 조회되는 자료 건수 index.jsp에서 확인 FETCH_XS = 30 - $P.control.untilPageNum = 0; // 현재 페이지 번호 + $P.control.beforeCurrent = null; @@ -424,7 +424,7 @@ : ${infoPrefix}List.inStrings(foundTr.outerHTML, replacer); let noMore = (${infoPrefix}List.length >= totalSize); - let initScroll = ($P.control.query.pageNum < 2) && ($P.control.untilPageNum == 0); + let initScroll = ($P.control.query.pageNum < 2); if(option != null && option.reloaded){ initScroll = false; @@ -432,11 +432,6 @@ $("#table-responsive--${pageName}")[0].changeContent(trs.join(), initScroll, noMore); - if ($P.control.untilPageNum != 0) { - $P.control.query.fetchSize = $P.control.defaultFetchSize; - $P.control.query.pageNum = $P.control.untilPageNum; - $P.control.untilPageNum = 0; - } } @@ -486,13 +481,7 @@ /************************************************************************** * 사용자 함수(function) **************************************************************************/ - // 검색 자료 재조회 - $P.fnRefreshList = () => { - $P.control.untilPageNum = $P.control.query.pageNum; - $P.control.query.fetchSize = $P.control.defaultFetchSize * $P.control.query.pageNum; - $P.control.load(1); - } // 사용자검색 callback $P.callbackFindUser = (userId, userNm) => { diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-info.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-info.jsp index e9755f5..924699a 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-info.jsp @@ -395,12 +395,7 @@ /************************************************************************** * 사용자 함수(function) **************************************************************************/ - // 검색 자료 재조회 - $P.fnRefreshList = () => { - $P.control.untilPageNum = $P.control.query.pageNum; - $P.control.query.fetchSize = $P.control.defaultFetchSize * $P.control.query.pageNum; - $P.control.load(1); - } + $P.fnSearchBssh = (title) => { $P.control.getBsshInfo(); diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-main.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-main.jsp index 676fd3d..6e77363 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-main.jsp @@ -226,7 +226,7 @@ }); // $P.control 설정 $P.control.defaultFetchSize = FETCH_XXS; // 1 페이지당 조회되는 자료 건수 index.jsp에서 확인 FETCH_XS = 30 - $P.control.untilPageNum = 0; // 현재 페이지 번호 + $P.control.beforeCurrent = null; @@ -370,7 +370,9 @@ setDialogZindex(); focusClose(); }, - onClose : () => $P.fnRefreshList() + onClose : () => { + $P.control.reload({all : true}); + } }); } } @@ -403,7 +405,7 @@ : ${infoPrefix}List.inStrings(foundTr.outerHTML, replacer); let noMore = (${infoPrefix}List.length >= totalSize); - let initScroll = ($P.control.query.pageNum < 2) && ($P.control.untilPageNum == 0); + let initScroll = ($P.control.query.pageNum < 2); if(option != null && option.reloaded){ initScroll = false; @@ -411,12 +413,6 @@ $("#table-responsive--${pageName}")[0].changeContent(trs.join(), initScroll, noMore); - if ($P.control.untilPageNum != 0) { - $P.control.query.fetchSize = $P.control.defaultFetchSize; - $P.control.query.pageNum = $P.control.untilPageNum; - $P.control.untilPageNum = 0; - } - } $P.renderDetailList = () => { @@ -463,13 +459,6 @@ /************************************************************************** * 사용자 함수(function) **************************************************************************/ - // 검색 자료 재조회 - $P.fnRefreshList = () => { - $P.control.untilPageNum = $P.control.query.pageNum; - $P.control.query.fetchSize = $P.control.defaultFetchSize * $P.control.query.pageNum; - - $P.control.load(1); - } // 사용자검색 callback $P.callbackFindUser = (userId, userNm) => { diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-info.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-info.jsp index d69ed1f..cb5b076 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-info.jsp @@ -168,7 +168,7 @@ }); // $P.control 설정 $P.control.defaultFetchSize = FETCH_XS; // 1 페이지당 조회되는 자료 건수 index.jsp에서 확인 FETCH_XS = 30 - $P.control.untilPageNum = 0; // 현재 페이지 번호 + $P.control.beforeCurrent = null; @@ -319,11 +319,7 @@ $("#table-responsive--${pageName}")[0].changeContent(trs.join(), true, true); - if ($P.control.untilPageNum != 0) { - $P.control.query.fetchSize = $P.control.defaultFetchSize; - $P.control.query.pageNum = $P.control.untilPageNum; - $P.control.untilPageNum = 0; - } + } diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-main.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-main.jsp index 04c4344..39b68c5 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-main.jsp @@ -219,7 +219,7 @@ }); // $P.control 설정 $P.control.defaultFetchSize = FETCH_XXS; // 1 페이지당 조회되는 자료 건수 index.jsp에서 확인 FETCH_XS = 30 - $P.control.untilPageNum = 0; // 현재 페이지 번호 + $P.control.beforeCurrent = null; @@ -363,7 +363,7 @@ : ${infoPrefix}List.inStrings(foundTr.outerHTML, replacer); let noMore = (${infoPrefix}List.length >= totalSize); - let initScroll = ($P.control.query.pageNum < 2) && ($P.control.untilPageNum == 0); + let initScroll = ($P.control.query.pageNum < 2); if(option != null && option.reloaded){ initScroll = false; @@ -371,11 +371,7 @@ $("#table-responsive--${pageName}")[0].changeContent(trs.join(), initScroll, noMore); - if ($P.control.untilPageNum != 0) { - $P.control.query.fetchSize = $P.control.defaultFetchSize; - $P.control.query.pageNum = $P.control.untilPageNum; - $P.control.untilPageNum = 0; - } + } @@ -424,13 +420,7 @@ /************************************************************************** * 사용자 함수(function) **************************************************************************/ - // 검색 자료 재조회 - $P.fnRefreshList = () => { - $P.control.untilPageNum = $P.control.query.pageNum; - $P.control.query.fetchSize = $P.control.defaultFetchSize * $P.control.query.pageNum; - - $P.control.load(1); - } + // 사용자검색 callback $P.callbackFindUser = (userId, userNm) => { diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/product-popup.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/product-popup.jsp index c77d3f1..ee66ecb 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/product-popup.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/product-popup.jsp @@ -192,7 +192,7 @@ // $P.control 설정 $P.control.defaultFetchSize = FETCH_XXS; // 1 페이지당 조회되는 자료 건수 index.jsp에서 확인 FETCH_XS = 30 - $P.control.untilPageNum = 0; // 현재 페이지 번호 + $P.detailControl = new DatasetControl({ @@ -228,7 +228,7 @@ // $P.control 설정 $P.detailControl.defaultFetchSize = FETCH_MD; // 1 페이지당 조회되는 자료 건수 index.jsp에서 확인 FETCH_XS = 30 - $P.detailControl.untilPageNum = 0; // 현재 페이지 번호 + /************************************************************************** @@ -335,15 +335,11 @@ ); let noMore = (${infoPrefix}DetailList.length >= totalSize); - let initScroll = ($P.detailControl.query.pageNum < 2) && ($P.detailControl.untilPageNum == 0); + let initScroll = ($P.detailControl.query.pageNum < 2); $("#table-responsive-1--${pageName}")[0].changeContent(trs.join(), initScroll, noMore); - if ($P.detailControl.untilPageNum != 0) { - $P.detailControl.query.fetchSize = $P.detailControl.defaultFetchSize; - $P.detailControl.query.pageNum = $P.detailControl.untilPageNum; - $P.detailControl.untilPageNum = 0; - } + } /************************************************************************** * 사용자 함수(function)