From dad5dc07fe7c068087e80311c07cec2e0c9441b4 Mon Sep 17 00:00:00 2001 From: leebj Date: Tue, 20 Aug 2024 13:29:44 +0900 Subject: [PATCH] =?UTF-8?q?=EC=86=8C=EC=8A=A4=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/jsp/dashboard.jsp | 48 ++--- .../WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp | 4 +- .../WEB-INF/jsp/fims/cvlc/cvlc01050-info.jsp | 4 +- .../WEB-INF/jsp/fims/cvlc/cvlc02060-info.jsp | 4 +- .../WEB-INF/jsp/fims/ogdp/ogdp01010-main.jsp | 2 +- .../WEB-INF/jsp/fims/ogdp/select-sgg.jsp | 2 +- .../WEB-INF/jsp/fims/stat/stat-main.jsp | 6 +- .../WEB-INF/jsp/fims/stng01010-main.jsp | 2 +- .../WEB-INF/jsp/fims/stng01020-main.jsp | 2 +- .../WEB-INF/jsp/fims/stng01030-main.jsp | 2 +- src/main/webapp/WEB-INF/jsp/include/tail.jsp | 17 +- src/main/webapp/WEB-INF/jsp/include/top.jsp | 2 +- src/main/webapp/WEB-INF/jsp/index.jsp | 4 +- src/main/webapp/WEB-INF/jsp/login.jsp | 2 +- .../resources/js/fims/cmmn/fims-cmmnUtil.js | 143 ------------- .../resources/js/fims/cmmn/fims-support.js | 198 +++++++++++++++++- .../resources/js/fims/cmmn/shortcutKey.js | 75 ------- .../resources/js/fims/cmmn/string-support.js | 59 ++++++ 18 files changed, 304 insertions(+), 272 deletions(-) delete mode 100644 src/main/webapp/resources/js/fims/cmmn/shortcutKey.js create mode 100644 src/main/webapp/resources/js/fims/cmmn/string-support.js diff --git a/src/main/webapp/WEB-INF/jsp/dashboard.jsp b/src/main/webapp/WEB-INF/jsp/dashboard.jsp index f29a96ae..db22c807 100644 --- a/src/main/webapp/WEB-INF/jsp/dashboard.jsp +++ b/src/main/webapp/WEB-INF/jsp/dashboard.jsp @@ -240,9 +240,9 @@ function fnMakeStatReq(taskSeCd){ lastDay : lastDay }; - defaultQuery = fnJsonToFormData(defaultQuery, "groupInfoList"); - defaultQuery = fnJsonToFormData(defaultQuery, "numberValueInfoList"); - defaultQuery = fnJsonToFormData(defaultQuery, "codeSubsetInfoList"); + defaultQuery = FimsSupport.fnJsonToFormData(defaultQuery, "groupInfoList"); + defaultQuery = FimsSupport.fnJsonToFormData(defaultQuery, "numberValueInfoList"); + defaultQuery = FimsSupport.fnJsonToFormData(defaultQuery, "codeSubsetInfoList"); statReqArr.push({ query : defaultQuery, @@ -270,9 +270,9 @@ function fnMakeStatReq(taskSeCd){ lastDay : lastDay }; - defaultQuery = fnJsonToFormData(defaultQuery, "groupInfoList"); - defaultQuery = fnJsonToFormData(defaultQuery, "numberValueInfoList"); - defaultQuery = fnJsonToFormData(defaultQuery, "codeSubsetInfoList"); + defaultQuery = FimsSupport.fnJsonToFormData(defaultQuery, "groupInfoList"); + defaultQuery = FimsSupport.fnJsonToFormData(defaultQuery, "numberValueInfoList"); + defaultQuery = FimsSupport.fnJsonToFormData(defaultQuery, "codeSubsetInfoList"); statReqArr.push({ query : defaultQuery, @@ -308,9 +308,9 @@ function fnMakeStatReq(taskSeCd){ lastDay : lastDay }; - defaultQuery = fnJsonToFormData(defaultQuery, "groupInfoList"); - defaultQuery = fnJsonToFormData(defaultQuery, "numberValueInfoList"); - defaultQuery = fnJsonToFormData(defaultQuery, "codeSubsetInfoList"); + defaultQuery = FimsSupport.fnJsonToFormData(defaultQuery, "groupInfoList"); + defaultQuery = FimsSupport.fnJsonToFormData(defaultQuery, "numberValueInfoList"); + defaultQuery = FimsSupport.fnJsonToFormData(defaultQuery, "codeSubsetInfoList"); statReqArr.push({ query : defaultQuery, @@ -346,9 +346,9 @@ function fnMakeStatReq(taskSeCd){ lastDay : lastDay }; - defaultQuery = fnJsonToFormData(defaultQuery, "groupInfoList"); - defaultQuery = fnJsonToFormData(defaultQuery, "numberValueInfoList"); - defaultQuery = fnJsonToFormData(defaultQuery, "codeSubsetInfoList"); + defaultQuery = FimsSupport.fnJsonToFormData(defaultQuery, "groupInfoList"); + defaultQuery = FimsSupport.fnJsonToFormData(defaultQuery, "numberValueInfoList"); + defaultQuery = FimsSupport.fnJsonToFormData(defaultQuery, "codeSubsetInfoList"); statReqArr.push({ query : defaultQuery, @@ -389,9 +389,9 @@ function fnMakeStatReq(taskSeCd){ dayRange : 15 }; - defaultQuery = fnJsonToFormData(defaultQuery, "groupInfoList"); - defaultQuery = fnJsonToFormData(defaultQuery, "numberValueInfoList"); - defaultQuery = fnJsonToFormData(defaultQuery, "codeSubsetInfoList"); + defaultQuery = FimsSupport.fnJsonToFormData(defaultQuery, "groupInfoList"); + defaultQuery = FimsSupport.fnJsonToFormData(defaultQuery, "numberValueInfoList"); + defaultQuery = FimsSupport.fnJsonToFormData(defaultQuery, "codeSubsetInfoList"); statReqArr.push({ query : defaultQuery, @@ -430,9 +430,9 @@ function fnMakeStatReq(taskSeCd){ lastDay : firstDay }; - defaultQuery = fnJsonToFormData(defaultQuery, "groupInfoList"); - defaultQuery = fnJsonToFormData(defaultQuery, "numberValueInfoList"); - defaultQuery = fnJsonToFormData(defaultQuery, "codeSubsetInfoList"); + defaultQuery = FimsSupport.fnJsonToFormData(defaultQuery, "groupInfoList"); + defaultQuery = FimsSupport.fnJsonToFormData(defaultQuery, "numberValueInfoList"); + defaultQuery = FimsSupport.fnJsonToFormData(defaultQuery, "codeSubsetInfoList"); statReqArr.push({ query : defaultQuery, @@ -471,9 +471,9 @@ function fnMakeStatReq(taskSeCd){ lastDay : firstDay }; - defaultQuery = fnJsonToFormData(defaultQuery, "groupInfoList"); - defaultQuery = fnJsonToFormData(defaultQuery, "numberValueInfoList"); - defaultQuery = fnJsonToFormData(defaultQuery, "codeSubsetInfoList"); + defaultQuery = FimsSupport.fnJsonToFormData(defaultQuery, "groupInfoList"); + defaultQuery = FimsSupport.fnJsonToFormData(defaultQuery, "numberValueInfoList"); + defaultQuery = FimsSupport.fnJsonToFormData(defaultQuery, "codeSubsetInfoList"); statReqArr.push({ query : defaultQuery, @@ -504,9 +504,9 @@ function fnMakeStatReq(taskSeCd){ lastDay : firstDay }; - defaultQuery = fnJsonToFormData(defaultQuery, "groupInfoList"); - defaultQuery = fnJsonToFormData(defaultQuery, "numberValueInfoList"); - defaultQuery = fnJsonToFormData(defaultQuery, "codeSubsetInfoList"); + defaultQuery = FimsSupport.fnJsonToFormData(defaultQuery, "groupInfoList"); + defaultQuery = FimsSupport.fnJsonToFormData(defaultQuery, "numberValueInfoList"); + defaultQuery = FimsSupport.fnJsonToFormData(defaultQuery, "codeSubsetInfoList"); statReqArr.push({ query : defaultQuery, diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp index 5bbd5242..d6fd3535 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp @@ -593,7 +593,7 @@ $(document).ready(function(){ }, success : (resp) => { var crdnInfo = resp.crdnInfo; - crdnInfo.CVLCPT_APLY_CN = escapeHTMLEntity(crdnInfo.CVLCPT_APLY_CN); + crdnInfo.CVLCPT_APLY_CN = StringSupport.escapeHTMLEntity(crdnInfo.CVLCPT_APLY_CN); $P.ctrl.dataset.setData([crdnInfo]); $P.$find("btnViewCrdnList").attr("hidden","hidden"); @@ -1210,7 +1210,7 @@ $(document).ready(function(){ $P.$find("btnViewCvlcptDscsnList").attr("hidden","hidden"); var crdnInfo = ${crdnInfo}; - crdnInfo.CVLCPT_APLY_CN = escapeHTMLEntity(crdnInfo.CVLCPT_APLY_CN); + crdnInfo.CVLCPT_APLY_CN = StringSupport.escapeHTMLEntity(crdnInfo.CVLCPT_APLY_CN); $P.ctrl.dataset.setData([crdnInfo]); if($P.$find("taskSeCd").val() == "DPV" && $P.$find("vltnCd").val() == "01"){ diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01050-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01050-info.jsp index 67f14816..7a465517 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01050-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01050-info.jsp @@ -164,7 +164,7 @@ $(document).ready(function() { }, success : (resp) => { var cvlcptInfo = resp.cvlcptInfo; - cvlcptInfo.CVLCPT_APLY_CN = escapeHTMLEntity(cvlcptInfo.CVLCPT_APLY_CN); + cvlcptInfo.CVLCPT_APLY_CN = StringSupport.escapeHTMLEntity(cvlcptInfo.CVLCPT_APLY_CN); $P.ctrl.dataset.setData([cvlcptInfo]); var cs = $P.provided.getCountStatus($P.$find("crdnId").val()); @@ -192,7 +192,7 @@ $(document).ready(function() { * 초기화 **************************************************************************/ var cvlcptInfo = ${cvlcptInfo}; - cvlcptInfo.CVLCPT_APLY_CN = escapeHTMLEntity(cvlcptInfo.CVLCPT_APLY_CN); + cvlcptInfo.CVLCPT_APLY_CN = StringSupport.escapeHTMLEntity(cvlcptInfo.CVLCPT_APLY_CN); $P.ctrl.dataset.setData([cvlcptInfo]); var cs = $P.provided.getCountStatus($P.$find("crdnId").val()); $P.$find("countStauts").val(cs); diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02060-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02060-info.jsp index 66818d8e..48c6d7eb 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02060-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02060-info.jsp @@ -134,7 +134,7 @@ $(document).ready(function() { }, success : (resp) => { var cvlcptInfo = resp.cvlcptInfo; - cvlcptInfo.CVLCPT_APLY_CN = escapeHTMLEntity(cvlcptInfo.CVLCPT_APLY_CN); + cvlcptInfo.CVLCPT_APLY_CN = StringSupport.escapeHTMLEntity(cvlcptInfo.CVLCPT_APLY_CN); $P.ctrl.dataset.setData([cvlcptInfo]); var cs = $P.parentRes.getCountStatus($P.$find("crdnId").val()); @@ -190,7 +190,7 @@ $(document).ready(function() { * 초기화 **************************************************************************/ var cvlcptInfo = ${cvlcptInfo}; - cvlcptInfo.CVLCPT_APLY_CN = escapeHTMLEntity(cvlcptInfo.CVLCPT_APLY_CN); + cvlcptInfo.CVLCPT_APLY_CN = StringSupport.escapeHTMLEntity(cvlcptInfo.CVLCPT_APLY_CN); $P.ctrl.dataset.setData([cvlcptInfo]); var cs = $P.parentRes.getCountStatus($P.$find("crdnId").val()); $P.$find("countStauts").val(cs); diff --git a/src/main/webapp/WEB-INF/jsp/fims/ogdp/ogdp01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/ogdp/ogdp01010-main.jsp index cad89d74..2d713be1 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/ogdp/ogdp01010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/ogdp/ogdp01010-main.jsp @@ -505,7 +505,7 @@ $(document).ready(function(){ var rowArr = $P.getRowData(taskSeCd+"tbody", formData); - var vltnStngList = fnJsonArrayToFormData(rowArr,"vltnStngList"); + var vltnStngList = FimsSupport.fnJsonArrayToFormData(rowArr,"vltnStngList"); var keys = Object.keys(vltnStngList); for(var i=0; i < keys.length; i++){ formData.append(keys[i], vltnStngList[keys[i]]); diff --git a/src/main/webapp/WEB-INF/jsp/fims/ogdp/select-sgg.jsp b/src/main/webapp/WEB-INF/jsp/fims/ogdp/select-sgg.jsp index 46d58f97..7940986d 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/ogdp/select-sgg.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/ogdp/select-sgg.jsp @@ -23,7 +23,7 @@ function fnGoToEditSgg(selected){ let menuUrl = wctx.url("/ogdp/sggStngMain.do"); - let curTabId = getActiveRootTabArea().id; + let curTabId = FimsSupport.getActiveRootTabArea().id; ajax.get({ url: menuUrl, diff --git a/src/main/webapp/WEB-INF/jsp/fims/stat/stat-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/stat/stat-main.jsp index d27e69d9..8978b2a5 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/stat/stat-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/stat/stat-main.jsp @@ -499,9 +499,9 @@ $(document).ready(function(){ $P.statQuery = JSON.parse(JSON.stringify(statQuery)); - statQuery = fnJsonToFormData(statQuery, "groupInfoList"); - statQuery = fnJsonToFormData(statQuery, "numberValueInfoList"); - statQuery = fnJsonToFormData(statQuery, "codeSubsetInfoList"); + statQuery = FimsSupport.fnJsonToFormData(statQuery, "groupInfoList"); + statQuery = FimsSupport.fnJsonToFormData(statQuery, "numberValueInfoList"); + statQuery = FimsSupport.fnJsonToFormData(statQuery, "codeSubsetInfoList"); ajax.get({ url : wctx.url("/stat/stat01/010/info.do"), diff --git a/src/main/webapp/WEB-INF/jsp/fims/stng01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/stng01010-main.jsp index a0775f05..184ea8b5 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/stng01010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/stng01010-main.jsp @@ -710,7 +710,7 @@ $(document).ready(function(){ } } - var otptArtclStngList = fnJsonArrayToFormData(rowArr,"otptArtclStngList"); + var otptArtclStngList = FimsSupport.fnJsonArrayToFormData(rowArr,"otptArtclStngList"); var keys = Object.keys(otptArtclStngList); for(var i=0; i < keys.length; i++){ formData.append(keys[i], otptArtclStngList[keys[i]]); diff --git a/src/main/webapp/WEB-INF/jsp/fims/stng01020-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/stng01020-main.jsp index b0059fb5..fba12625 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/stng01020-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/stng01020-main.jsp @@ -446,7 +446,7 @@ $(document).ready(function(){ } } - var extrArtclStngList = fnJsonArrayToFormData(rowArr,"extrArtclStngList"); + var extrArtclStngList = FimsSupport.fnJsonArrayToFormData(rowArr,"extrArtclStngList"); var keys = Object.keys(extrArtclStngList); for(var i=0; i < keys.length; i++){ formData.append(keys[i], extrArtclStngList[keys[i]]); diff --git a/src/main/webapp/WEB-INF/jsp/fims/stng01030-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/stng01030-main.jsp index e64e7646..043c27ba 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/stng01030-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/stng01030-main.jsp @@ -346,7 +346,7 @@ $(document).ready(function(){ } } - var zipArtclStngList = fnJsonArrayToFormData(rowArr,"zipArtclStngList"); + var zipArtclStngList = FimsSupport.fnJsonArrayToFormData(rowArr,"zipArtclStngList"); var keys = Object.keys(zipArtclStngList); for(var i=0; i < keys.length; i++){ formData.append(keys[i], zipArtclStngList[keys[i]]); diff --git a/src/main/webapp/WEB-INF/jsp/include/tail.jsp b/src/main/webapp/WEB-INF/jsp/include/tail.jsp index 23c011d8..7e13dbf1 100644 --- a/src/main/webapp/WEB-INF/jsp/include/tail.jsp +++ b/src/main/webapp/WEB-INF/jsp/include/tail.jsp @@ -40,27 +40,24 @@ - - - - - - - + + + + + + - - + - diff --git a/src/main/webapp/WEB-INF/jsp/include/top.jsp b/src/main/webapp/WEB-INF/jsp/include/top.jsp index b53ff839..eb943c8a 100644 --- a/src/main/webapp/WEB-INF/jsp/include/top.jsp +++ b/src/main/webapp/WEB-INF/jsp/include/top.jsp @@ -542,7 +542,7 @@ FimsSupport.mappingButtonAndMenu("btnGoToSchdl","일정관리"); /*--------------------- 사용자 메뉴얼 클릭 이벤트 ---------------------*/ $("#btnDownloadMenual--top").on( "click", function() { - fnMenualDownload(); + FimsSupport.fnMenualDownload(); }); /*--------------------- 보안모드 체크박스 클릭 이벤트 ---------------------*/ diff --git a/src/main/webapp/WEB-INF/jsp/index.jsp b/src/main/webapp/WEB-INF/jsp/index.jsp index 5dc300ab..036b37c8 100644 --- a/src/main/webapp/WEB-INF/jsp/index.jsp +++ b/src/main/webapp/WEB-INF/jsp/index.jsp @@ -68,7 +68,9 @@