Merge branch 'refs/heads/main' into main-dsuse-rslt-img

dev
Jonguk. Lim 4 months ago
commit b506eca09d

@ -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;
}
}
/**************************************************************************

@ -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) => {

@ -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

@ -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) => {

@ -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();

@ -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) => {

@ -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;
}
}

@ -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) => {

@ -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)

@ -10,12 +10,12 @@
<h5 class="mt-3">기능 그룹</h5>
<div class="d-flex flex-row justify-content-between p-3">
<div>
<div class="input-group" id="DataTables_Table_0_length">
<select id="by" onchange="document.getElementById('term').focus();" aria-controls="DataTables_Table_0" class="form-select">
<div class="input-group" id="${infoPrefix}-query">
<select id="${infoPrefix}by" name="by" onchange="document.getElementById('${infoPrefix}term').focus();" aria-controls="DataTables_Table_0" class="form-select">
<option value="${infoPrefix}Name">이름</option>
<option value="${infoPrefix}ID">아이디</option>
</select>
<input id="term" autofocus type="text" placeholder="조회 조건을 입력하십시오." class="form-control">
<input id="${infoPrefix}term" name="term" autofocus type="text" placeholder="조회 조건을 입력하십시오." class="form-control">
</div>
</div>
<div>
@ -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}

@ -10,12 +10,12 @@
<h5 class="mt-3">권한</h5>
<div class="d-flex flex-row justify-content-between p-3">
<div>
<div class="input-group" id="DataTables_Table_0_length">
<select id="by" onchange="document.getElementById('term').focus();" aria-controls="DataTables_Table_0" class="form-select">
<div class="input-group" id="${infoPrefix}-query">
<select id="${infoPrefix}by" name="by" onchange="document.getElementById('${infoPrefix}term').focus();" aria-controls="DataTables_Table_0" class="form-select">
<option value="authName">이름</option>
<option value="authID">아이디</option>
</select>
<input id="term" autofocus type="text" placeholder="조회 조건을 입력하십시오." class="form-control">
<input id="${infoPrefix}term" name="term" autofocus type="text" placeholder="조회 조건을 입력하십시오." class="form-control">
</div>
</div>
<div>
@ -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}

@ -10,12 +10,12 @@
<h5 class="mt-3">${prefixName}</h5>
<div class="d-flex flex-row justify-content-between p-3">
<%--div>
<div class="input-group" id="DataTables_Table_0_length">
<select id="by" onchange="document.getElementById('term').focus();" aria-controls="DataTables_Table_0" class="form-select">
<div class="input-group" id="${infoPrefix}-query">
<select id="${infoPrefix}by" name="by" onchange="document.getElementById('${infoPrefix}term').focus();" aria-controls="DataTables_Table_0" class="form-select">
<option value="groupName">이름</option>
<option value="groupID">아이디</option>
</select>
<input id="term" autofocus type="text" placeholder="조회 조건을 입력하십시오." class="form-control">
<input id="${infoPrefix}term" name="term" autofocus type="text" placeholder="조회 조건을 입력하십시오." class="form-control">
</div>
</div--%>
<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}

@ -8,7 +8,7 @@
<div id="${infoPrefix}-query" class="d-flex flex-row justify-content-between p-3">
<div class="d-flex flex-row">
<div class="input-group">
<select id="logType" class="form-select">
<select id="${infoPrefix}logType" name="logType" class="form-select">
<option value="">로그유형</option>
<option value="log-inout">로그인/아웃</option>
<option value="download">다운로드</option>
@ -16,17 +16,17 @@
</select>
</div>
<div class="input-group" style="margin: 0 1rem 0 1rem">
<select id="by" onchange="document.getElementById('term').focus();" class="form-select">
<select id="${infoPrefix}by" name="by" onchange="document.getElementById('${infoPrefix}term').focus();" class="form-select">
<option value="userName">사용자 이름</option>
<option value="userAccount">사용자 계정</option>
<option value="userID">사용자 아이디</option>
</select>
<input id="term" type="text" placeholder="조회 조건을 입력하십시오." class="form-control">
<input id="${infoPrefix}term" name="term" type="text" placeholder="조회 조건을 입력하십시오." class="form-control">
</div>
<div class="input-group">
<input id="fromDate" type="text" value="${fromDate}" required placeholder="시작일자" class="form-control">
<input id="${infoPrefix}fromDate" name="fromDate" type="text" value="${fromDate}" required placeholder="시작일자" class="form-control">
<span style="margin: 0 .5rem 0 .5rem"> ~ </span>
<input id="toDate" type="text" value="${toDate}" required placeholder="종료일자" class="form-control">
<input id="${infoPrefix}toDate" name="toDate" type="text" value="${toDate}" required placeholder="종료일자" class="form-control">
</div>
</div>
<div>
@ -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
</script>

@ -10,12 +10,12 @@
<h5 class="mt-3">${prefixName}</h5>
<div class="d-flex flex-row justify-content-between p-3">
<%--div>
<div class="input-group" id="DataTables_Table_0_length">
<select id="by" onchange="document.getElementById('term').focus();" aria-controls="DataTables_Table_0" class="form-select">
<div class="input-group" id="${infoPrefix}-query">
<select id="${infoPrefix}by" name="by" onchange="document.getElementById('${infoPrefix}term').focus();" aria-controls="DataTables_Table_0" class="form-select">
<option value="sggName">이름</option>
<option value="sggID">아이디</option>
</select>
<input id="term" autofocus type="text" placeholder="조회 조건을 입력하십시오." class="form-control">
<input id="${infoPrefix}term" name="term" autofocus type="text" placeholder="조회 조건을 입력하십시오." class="form-control">
</div>
</div--%>
<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
</script>

@ -7,12 +7,12 @@
<div class="d-flex flex-row justify-content-between p-3">
<div>
<div class="input-group" id="DataTables_Table_0_length">
<select id="by" onchange="document.getElementById('term').focus();" aria-controls="DataTables_Table_0" class="form-select">
<div class="input-group" id="${infoPrefix}-query">
<select id="${infoPrefix}by" onchange="document.getElementById('${infoPrefix}term').focus();" aria-controls="DataTables_Table_0" class="form-select">
<option value="${infoPrefix}Name">이름</option>
<option value="${infoPrefix}Account">계정</option>
</select>
<input id="term" autofocus type="text" placeholder="조회 조건을 입력하십시오." class="form-control">
<input id="${infoPrefix}term" autofocus type="text" placeholder="조회 조건을 입력하십시오." class="form-control">
</div>
</div>
<div>
@ -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}

Loading…
Cancel
Save