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..da69541 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.query = { pageNum : 1, fetchSize : $P.control.defaultFetchSize }; $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..c05bafb 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.query = { pageNum : 1, fetchSize : $P.control.defaultFetchSize }; $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..fec8c2a 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.query = { pageNum : 1, fetchSize : $P.control.defaultFetchSize }; $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) diff --git a/src/main/webapp/WEB-INF/jsp/base/actionGroup/actionGroup-main.jsp b/src/main/webapp/WEB-INF/jsp/base/actionGroup/actionGroup-main.jsp index db2c6df..b98f434 100644 --- a/src/main/webapp/WEB-INF/jsp/base/actionGroup/actionGroup-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/base/actionGroup/actionGroup-main.jsp @@ -10,12 +10,12 @@
기능 그룹
-
- - +
@@ -99,8 +99,8 @@ var action${infoPrefix}Control = new ActionGroupControl(); function searchaction${infoPrefix}s() { action${infoPrefix}Control.groups.query = { - by:$("#by").val(), - term:$("#term").val() + by:$("#${infoPrefix}-query [name='by']").val(), + term:$("#${infoPrefix}-query [name='term']").val() }; action${infoPrefix}Control.groups.load(1); } @@ -207,7 +207,7 @@ action${infoPrefix}Control.onActionSelect = selected => { $("#btnRemoveActions").prop("disabled", keys.length < 1); }; -$("#term").onEnterPress(searchaction${infoPrefix}s); +$("#${infoPrefix}term").onEnterPress(searchaction${infoPrefix}s); $(function(){ ${onload} diff --git a/src/main/webapp/WEB-INF/jsp/base/authority/authority-main.jsp b/src/main/webapp/WEB-INF/jsp/base/authority/authority-main.jsp index 7db42da..d7892e2 100644 --- a/src/main/webapp/WEB-INF/jsp/base/authority/authority-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/base/authority/authority-main.jsp @@ -10,12 +10,12 @@
권한
-
- - +
@@ -83,8 +83,8 @@ var ${infoPrefix}Control = new AuthorityControl(); function search${infoPrefix}s() { ${infoPrefix}Control.authorities.query = { - by:$("#by").val(), - term:$("#term").val() + by:$("#${infoPrefix}-query [name='by']").val(), + term:$("#${infoPrefix}-query [name='term']").val() }; ${infoPrefix}Control.authorities.load(1); } @@ -148,7 +148,7 @@ ${infoPrefix}Control.onAuthoritySelect = selected => { ${userFunc} ${actionGroupFunc} -$("#term").onEnterPress(search${infoPrefix}s); +$("#${infoPrefix}term").onEnterPress(search${infoPrefix}s); $(function(){ ${onload} diff --git a/src/main/webapp/WEB-INF/jsp/base/code/code-main.jsp b/src/main/webapp/WEB-INF/jsp/base/code/code-main.jsp index 2c634c1..3ce0e5c 100644 --- a/src/main/webapp/WEB-INF/jsp/base/code/code-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/base/code/code-main.jsp @@ -10,12 +10,12 @@
${prefixName}
<%--div> -
- - +
@@ -101,8 +101,8 @@ var codeControl = new CodeControl(); function searchGroups() { codeControl.groups.query = { - by:$("#by").val(), - term:$("#term").val() + by:$("#${infoPrefix}-query [name='by']").val(), + term:$("#${infoPrefix}-query [name='term']").val() }; codeControl.groups.load(1); } @@ -218,7 +218,7 @@ codeControl.onCodeSelect = selected => { $("#btnRemoveCodes").prop("disabled", selected.length < 1); }; -$("#term").onEnterPress(searchGroups); +$("#${infoPrefix}term").onEnterPress(searchGroups); $(function(){ ${onload} diff --git a/src/main/webapp/WEB-INF/jsp/base/syslog/syslog-main.jsp b/src/main/webapp/WEB-INF/jsp/base/syslog/syslog-main.jsp index 3eedfa1..08060e2 100644 --- a/src/main/webapp/WEB-INF/jsp/base/syslog/syslog-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/base/syslog/syslog-main.jsp @@ -8,7 +8,7 @@
- @@ -16,17 +16,17 @@
- - +
- + ~ - +
@@ -88,15 +88,15 @@ var ${infoPrefix}Control = new DatasetControl({ }); function search${infoPrefix}s() { - let logType = $("#logType").val(), + let logType = $("#${infoPrefix}logType").val(), params = { logTypes: logType ? [logType] : [], - fromDate: $("#fromDate").val().replace(/-/gi, ""), - toDate: $("#toDate").val().replace(/-/gi, "") + fromDate: $("#${infoPrefix}fromDate").val().replace(/-/gi, ""), + toDate: $("#${infoPrefix}toDate").val().replace(/-/gi, "") }, - terms = $("#${infoPrefix}-query #term").val(); + terms = $("#${infoPrefix}-query [name='term']").val(); if (terms) { - switch ($("#${infoPrefix}-query #by").val()) { + switch ($("#${infoPrefix}-query [name='by']").val()) { case "userName": params.userName = terms; break; case "userAccount": params.userAccounts = [terms]; break; case "userID": params.userIDs = [terms]; break; @@ -139,7 +139,7 @@ ${infoPrefix}Control.onCurrentChange = item => { $("#${infoPrefix}List").setCurrentRow(key); }; -$("#term").onEnterPress(search${infoPrefix}s); +$("#${infoPrefix}term").onEnterPress(search${infoPrefix}s); $(function(){ ${onload} @@ -149,7 +149,7 @@ $(function(){ ${infoPrefix}Fetch:${syslogFetch}, ${infoPrefix}Total:${syslogTotal} }); - $("#${infoPrefix}-query #fromDate, #${infoPrefix}-query #toDate").datePicker(); + $("#${infoPrefix}-query #${infoPrefix}fromDate, #${infoPrefix}-query #${infoPrefix}toDate").datePicker(); }); //# sourceURL=${infoPrefix}-main.jsp \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/base/user/sgg-dept.jsp b/src/main/webapp/WEB-INF/jsp/base/user/sgg-dept.jsp index ee1f233..5013a94 100644 --- a/src/main/webapp/WEB-INF/jsp/base/user/sgg-dept.jsp +++ b/src/main/webapp/WEB-INF/jsp/base/user/sgg-dept.jsp @@ -10,12 +10,12 @@
${prefixName}
<%--div> -
- - +
@@ -102,8 +102,8 @@ sggDeptControl.sggs.query = {includeAll: true}; <%-- function searchSggs() { sggDeptControl.sggs.query = { - by:$("#by").val(), - term:$("#term").val(), + by:$("#${infoPrefix}-query [name='by']").val(), + term:$("#${infoPrefix}-query [name='term']").val() includeAll: true }; sggDeptControl.sggs.load(1); @@ -240,7 +240,7 @@ $(function(){ deptTotal:${deptTotal} }); -<%-- $("#term").onEnterPress(searchSggs); --%> +<%-- $("#${infoPrefix}term").onEnterPress(searchSggs); --%> }); //# sourceURL=sgg-dept.jsp \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/base/user/user-main.jsp b/src/main/webapp/WEB-INF/jsp/base/user/user-main.jsp index 573866a..f5a0ed2 100644 --- a/src/main/webapp/WEB-INF/jsp/base/user/user-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/base/user/user-main.jsp @@ -7,12 +7,12 @@
-
- - +
@@ -64,8 +64,8 @@ var ${infoPrefix}Control = new UserControl(); function search${infoPrefix}s() { ${infoPrefix}Control.query = { - by:$("#by").val(), - term:$("#term").val() + by:$("#${infoPrefix}-query [name='by']").val(), + term:$("#${infoPrefix}-query [name='term']").val() }; ${infoPrefix}Control.load(1); } @@ -134,7 +134,7 @@ ${infoPrefix}Control.onSelectionChange = selected => { $("#btnRemove${infoPrefix}s").prop("disabled", keys.length < 1); }; -$("#term").onEnterPress(search${infoPrefix}s); +$("#${infoPrefix}term").onEnterPress(search${infoPrefix}s); $(function(){ ${onload}