From 5ff4076acd183e834683d63b759cf6301eeca0c3 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Wed, 27 Dec 2023 10:08:44 +0900 Subject: [PATCH] =?UTF-8?q?=EC=97=91=EC=85=80=EB=8B=A4=EC=9A=B4=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/cokr/xit/fims/cmmn/CmmnQuery.java | 10 +++++----- .../webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp | 12 ++++++------ .../webapp/WEB-INF/jsp/fims/crdn/crdn03010-main.jsp | 4 ++-- .../webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp | 4 ++-- .../webapp/WEB-INF/jsp/fims/crdn/crdn08010-main.jsp | 4 ++-- .../webapp/WEB-INF/jsp/fims/cvlc/cvlc01010-main.jsp | 4 ++-- .../webapp/WEB-INF/jsp/fims/cvlc/cvlc02010-main.jsp | 4 ++-- .../webapp/WEB-INF/jsp/fims/cvlc/cvlc03010-main.jsp | 4 ++-- .../webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp | 4 ++-- .../webapp/WEB-INF/jsp/fims/excl/excl02010-main.jsp | 4 ++-- .../webapp/WEB-INF/jsp/fims/levy/levy01010-main.jsp | 4 ++-- .../webapp/WEB-INF/jsp/fims/sprt/sprt01010-main.jsp | 8 ++++---- .../webapp/WEB-INF/jsp/fims/sprt/sprt01110-info.jsp | 4 ++-- .../resources/js/fims/framework/cmm/cmmUtil.js | 10 +++++----- 14 files changed, 40 insertions(+), 40 deletions(-) diff --git a/src/main/java/cokr/xit/fims/cmmn/CmmnQuery.java b/src/main/java/cokr/xit/fims/cmmn/CmmnQuery.java index 9ef8317d..1ea9d147 100644 --- a/src/main/java/cokr/xit/fims/cmmn/CmmnQuery.java +++ b/src/main/java/cokr/xit/fims/cmmn/CmmnQuery.java @@ -9,7 +9,7 @@ public class CmmnQuery extends QueryRequest { private String mainOption; private String subOption; - private String colDefs; + private String cellDefs; private String[] excelTitle; private int[] excelTitleWidth; @@ -51,12 +51,12 @@ public class CmmnQuery extends QueryRequest { return self(); } - public String getColDefs() { - return ifEmpty(colDefs, () -> null); + public String getCellDefs() { + return ifEmpty(cellDefs, () -> null); } - public T setColDefs(String colDefs) { - this.colDefs = colDefs; + public T setCellDefs(String cellDefs) { + this.cellDefs = cellDefs; return self(); } diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp index 10418aa5..97865e3c 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp @@ -982,9 +982,9 @@ $(document).ready(function(){ $P.photoInspectionControl.query.excelTitle = headerInfo.excelTitle; $P.photoInspectionControl.query.excelTitleWidth = headerInfo.excelTitleWidth; - var colDefs = getColDefs($("#photoInspection_Table_0--${pageName} thead th").not(".dummy-th").not(":eq(0)"), + var cellDefs = getCellDefs($("#photoInspection_Table_0--${pageName} thead th").not(".dummy-th").not(":eq(0)"), $($("#photoInspectionRow--${pageName}")[0].content).find("td").not(".dummy-td").not(":eq(0)")); - $P.photoInspectionControl.query.colDefs = colDefs; + $P.photoInspectionControl.query.cellDefs = cellDefs; $P.photoInspectionControl.download(); @@ -1000,9 +1000,9 @@ $(document).ready(function(){ $P.sameVehicleControl.main.query.excelTitle = headerInfo.excelTitle; $P.sameVehicleControl.main.query.excelTitleWidth = headerInfo.excelTitleWidth; - var colDefs = getColDefs($("#sameVehicleInspectionMain_Table_0--${pageName} thead th").not(".dummy-th"), + var cellDefs = getCellDefs($("#sameVehicleInspectionMain_Table_0--${pageName} thead th").not(".dummy-th"), $($("#sameVehicleInspectionMainRow--${pageName}")[0].content).find("td").not(".dummy-td")); - $P.sameVehicleControl.main.query.colDefs = colDefs; + $P.sameVehicleControl.main.query.cellDefs = cellDefs; $P.sameVehicleControl.main.download(); } else { @@ -1010,9 +1010,9 @@ $(document).ready(function(){ $P.sameVehicleControl.sub.query.excelTitle = headerInfo.excelTitle; $P.sameVehicleControl.sub.query.excelTitleWidth = headerInfo.excelTitleWidth; - var colDefs = getColDefs($("#sameVehicleInspectionSub_Table_0--${pageName} thead th").not(".dummy-th").not(":hidden"), + var cellDefs = getCellDefs($("#sameVehicleInspectionSub_Table_0--${pageName} thead th").not(".dummy-th").not(":hidden"), $($("#sameVehicleInspectionSubRow--${pageName}")[0].content).find("td").not(".dummy-td").not(".privacy-mask")); - $P.sameVehicleControl.sub.query.colDefs = colDefs; + $P.sameVehicleControl.sub.query.cellDefs = cellDefs; $P.sameVehicleControl.sub.download(); } diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn03010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn03010-main.jsp index c9ed7372..4ee8bba3 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn03010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn03010-main.jsp @@ -311,9 +311,9 @@ $(document).ready(function(){ $P.crdnControl.query.excelTitle = headerInfo.excelTitle; $P.crdnControl.query.excelTitleWidth = headerInfo.excelTitleWidth; - var colDefs = getColDefs($("#crdnTheadTr--${pageName} th").not(".dummy-th").not(":eq(0)"), + var cellDefs = getCellDefs($("#crdnTheadTr--${pageName} th").not(".dummy-th").not(":eq(0)"), $($("#crdnRow--${pageName}")[0].content).find("td").not(".dummy-td").not(":eq(0)")); - $P.crdnControl.query.colDefs = colDefs; + $P.crdnControl.query.cellDefs = cellDefs; $P.crdnControl.download(); }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp index dbfec129..5a694c94 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp @@ -480,9 +480,9 @@ $(document).ready(function(){ $P.crdnControl.query.excelTitle = headerInfo.excelTitle; $P.crdnControl.query.excelTitleWidth = headerInfo.excelTitleWidth; - var colDefs = getColDefs($("#crdnThead--${pageName} th").not(".dummy-th").not(":eq(0)"), + var cellDefs = getCellDefs($("#crdnThead--${pageName} th").not(".dummy-th").not(":eq(0)"), $($("#crdnRow--${pageName}")[0].content).find("td").not(".dummy-td").not(":eq(0)")); - $P.crdnControl.query.colDefs = colDefs; + $P.crdnControl.query.cellDefs = cellDefs; $P.crdnControl.download(); }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08010-main.jsp index f828c021..170a3b68 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08010-main.jsp @@ -449,9 +449,9 @@ $(document).ready(function(){ $P.exmptnVhclControl.query.excelTitle = headerInfo.excelTitle; $P.exmptnVhclControl.query.excelTitleWidth = headerInfo.excelTitleWidth; - var colDefs = getColDefs($("#exmptnVhclTheadTr--${pageName} th").not(".dummy-th").not(":eq(0)"), + var cellDefs = getCellDefs($("#exmptnVhclTheadTr--${pageName} th").not(".dummy-th").not(":eq(0)"), $($("#exmptnVhclRow--${pageName}")[0].content).find("td").not(".dummy-td").not(":eq(0)")); - $P.exmptnVhclControl.query.colDefs = colDefs; + $P.exmptnVhclControl.query.cellDefs = cellDefs; $P.exmptnVhclControl.download(); }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01010-main.jsp index 5e51d9e5..d9b9aeb3 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01010-main.jsp @@ -642,9 +642,9 @@ $(document).ready(function(){ $P.crdnControl.query.excelTitle = headerInfo.excelTitle; $P.crdnControl.query.excelTitleWidth = headerInfo.excelTitleWidth; - var colDefs = getColDefs($("#crdnThead--${pageName} th").not(".dummy-th").not(":eq(0)"), + var cellDefs = getCellDefs($("#crdnThead--${pageName} th").not(".dummy-th").not(":eq(0)"), $($("#crdnRow--${pageName}")[0].content).find("td").not(".dummy-td").not(":eq(0)")); - $P.crdnControl.query.colDefs = colDefs; + $P.crdnControl.query.cellDefs = cellDefs; $P.crdnControl.download(); }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02010-main.jsp index a9e642a1..d8224c0f 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02010-main.jsp @@ -672,9 +672,9 @@ $(document).ready(function(){ $P.crdnControl.query.excelTitle = headerInfo.excelTitle; $P.crdnControl.query.excelTitleWidth = headerInfo.excelTitleWidth; - var colDefs = getColDefs($("#crdnThead--${pageName} th").not(".dummy-th").not(":eq(0)").not(":eq(0)"), + var cellDefs = getCellDefs($("#crdnThead--${pageName} th").not(".dummy-th").not(":eq(0)").not(":eq(0)"), $($("#crdnRow--${pageName}")[0].content).find("td").not(".dummy-td").not(":eq(0)").not(":eq(0)")); - $P.crdnControl.query.colDefs = colDefs; + $P.crdnControl.query.cellDefs = cellDefs; $P.crdnControl.download(); }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc03010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc03010-main.jsp index 9dcf9483..c10602f0 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc03010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc03010-main.jsp @@ -536,9 +536,9 @@ $(document).ready(function(){ $P.crdnControl.query.excelTitle = headerInfo.excelTitle; $P.crdnControl.query.excelTitleWidth = headerInfo.excelTitleWidth; - var colDefs = getColDefs($("#crdnThead--${pageName} th").not(".dummy-th").not(":eq(0)"), + var cellDefs = getCellDefs($("#crdnThead--${pageName} th").not(".dummy-th").not(":eq(0)"), $($("#crdnRow--${pageName}")[0].content).find("td").not(".dummy-td").not(":eq(0)")); - $P.crdnControl.query.colDefs = colDefs; + $P.crdnControl.query.cellDefs = cellDefs; $P.crdnControl.download(); }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp index bf6565c2..fa7f3ecb 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp @@ -574,9 +574,9 @@ ${pageName}Control.query.excelTitleWidth = headerInfo.excelTitleWidth; // DataTables(그리드) 데이터 - let colDefs = getColDefs($("#theadTr--${pageName} th").not(".dummy-th").not(":eq(0)") + let cellDefs = getCellDefs($("#theadTr--${pageName} th").not(".dummy-th").not(":eq(0)") , $($("#${infoPrefix}Row--${pageName}")[0].content).find("td").not(".dummy-td").not(":eq(0)")); - ${pageName}Control.query.colDefs = colDefs; + ${pageName}Control.query.cellDefs = cellDefs; ${pageName}Control.download(); } diff --git a/src/main/webapp/WEB-INF/jsp/fims/excl/excl02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/excl/excl02010-main.jsp index 326acb9b..8617c69e 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/excl/excl02010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/excl/excl02010-main.jsp @@ -610,9 +610,9 @@ ${pageName}Control.query.excelTitleWidth = headerInfo.excelTitleWidth; // DataTables(그리드) 데이터 - let colDefs = getColDefs($("#theadTr--${pageName} th").not(".dummy-th").not(":eq(0)") + let cellDefs = getCellDefs($("#theadTr--${pageName} th").not(".dummy-th").not(":eq(0)") , $($("#${infoPrefix}Row--${pageName}")[0].content).find("td").not(".dummy-td").not(":eq(0)")); - ${pageName}Control.query.colDefs = colDefs; + ${pageName}Control.query.cellDefs = cellDefs; ${pageName}Control.download(); } diff --git a/src/main/webapp/WEB-INF/jsp/fims/levy/levy01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/levy/levy01010-main.jsp index 200318db..f76cc73d 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/levy/levy01010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/levy/levy01010-main.jsp @@ -522,9 +522,9 @@ ${pageName}Control.query.excelTitleWidth = headerInfo.excelTitleWidth; // DataTables(그리드) 데이터 - let colDefs = getColDefs($("#theadTr--${pageName} th").not(".dummy-th").not(":eq(0)") + let cellDefs = getCellDefs($("#theadTr--${pageName} th").not(".dummy-th").not(":eq(0)") , $($("#${infoPrefix}Row--${pageName}")[0].content).find("td").not(".dummy-td").not(":eq(0)")); - ${pageName}Control.query.colDefs = colDefs; + ${pageName}Control.query.cellDefs = cellDefs; ${pageName}Control.download(); } diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01010-main.jsp index 06db5650..44d9d5f8 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01010-main.jsp @@ -341,7 +341,7 @@ integrationSearch.setTotalData = (updown, list) => { // 엑셀 integrationSearch.fnExcel = (updown) => { var headerInfo; - var colDefs; + var cellDefs; if(updown == "up"){ if(integrationSearchControl.updataset.empty){ @@ -351,7 +351,7 @@ integrationSearch.fnExcel = (updown) => { headerInfo = $("#upTheadTr--${pageName} th").not(".dummy-th").not(":eq(0)").not(":hidden").getHeaderInfo(); - colDefs = getColDefs($("#upTheadTr--${pageName} th").not(".dummy-th").not(":eq(0)").not(":hidden"), + cellDefs = getCellDefs($("#upTheadTr--${pageName} th").not(".dummy-th").not(":eq(0)").not(":hidden"), $($("#row--${pageName}")[0].content).find("td").not(".dummy-td").not(":eq(0)").not(".privacy-mask")); integrationSearchControl.query.gridType = "up"; @@ -363,7 +363,7 @@ integrationSearch.fnExcel = (updown) => { headerInfo = $("#downTheadTr--${pageName} th").not(".dummy-th").not(":eq(0)").not(":hidden").getHeaderInfo(); - colDefs = getColDefs($("#downTheadTr--${pageName} th").not(".dummy-th").not(":eq(0)").not(":hidden"), + cellDefs = getCellDefs($("#downTheadTr--${pageName} th").not(".dummy-th").not(":eq(0)").not(":hidden"), $($("#row--${pageName}")[0].content).find("td").not(".dummy-td").not(":eq(0)").not(".privacy-mask")); integrationSearchControl.query.gridType = "down"; @@ -372,7 +372,7 @@ integrationSearch.fnExcel = (updown) => { integrationSearchControl.query.excelTitle = headerInfo.excelTitle; integrationSearchControl.query.excelTitleWidth = headerInfo.excelTitleWidth; - integrationSearchControl.query.colDefs = colDefs; + integrationSearchControl.query.cellDefs = cellDefs; integrationSearchControl.download(); diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01110-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01110-info.jsp index 1f40dfc6..c7958f28 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01110-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01110-info.jsp @@ -149,9 +149,9 @@ $(document).ready(function(){ query.excelTitle = headerInfo.excelTitle; query.excelTitleWidth = headerInfo.excelTitleWidth; - var colDefs = getColDefs($("#theadTr--${pageName} th").not(".dummy-th"), + var cellDefs = getCellDefs($("#theadTr--${pageName} th").not(".dummy-th"), $($("#found--${pageName}")[0].content).find("td").not(".dummy-td")); - query.colDefs = colDefs; + query.cellDefs = cellDefs; query.download = "xls"; query.crdnIDs = $P.crdnIds.join(","); diff --git a/src/main/webapp/resources/js/fims/framework/cmm/cmmUtil.js b/src/main/webapp/resources/js/fims/framework/cmm/cmmUtil.js index 0917df3c..9996b7c9 100644 --- a/src/main/webapp/resources/js/fims/framework/cmm/cmmUtil.js +++ b/src/main/webapp/resources/js/fims/framework/cmm/cmmUtil.js @@ -1,6 +1,6 @@ //엑셀 파일 생성 정보 -function getColDefs($th, $td){ - var colDefs = []; +function getCellDefs($th, $td){ + var cellDefs = []; for(var i=0; i < $th.length; i++){ @@ -14,18 +14,18 @@ function getColDefs($th, $td){ field = field.replace("{", ""); field = field.replace("}", ""); - var colDef = { + var cellDef = { label : label, width : width, field : field }; - colDefs.push(colDef); + cellDefs.push(cellDef); } } - return JSON.stringify(colDefs); + return JSON.stringify(cellDefs); } /**************************************************************************