From 58357b78915e623f0005df61173572692e142ede Mon Sep 17 00:00:00 2001 From: hylee Date: Mon, 2 Sep 2024 17:41:09 +0900 Subject: [PATCH] =?UTF-8?q?rowData[key]=20=3D=20typeof=20row[idx]=20=3D=3D?= =?UTF-8?q?=3D=20'string'=20=3F=20row[idx].trim()=20:=20row[idx];=20//=20?= =?UTF-8?q?=EB=AC=B8=EC=9E=90=EC=97=B4=EC=9D=B8=EC=A7=80=20=ED=99=95?= =?UTF-8?q?=EC=9D=B8=ED=95=98=EA=B3=A0=20trim()=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webapp/WEB-INF/jsp/web/addr/AddrList.jsp | 47 +++- .../jsp/web/addr/include/addrListforExcel.jsp | 15 +- .../jsp/web/msgdata/MsgDataSMLView.jsp | 44 +--- src/main/webapp/js/web/addr/event.js | 236 ++++++++++++++---- src/main/webapp/js/web/addr/init.js | 30 +++ 5 files changed, 278 insertions(+), 94 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/addr/AddrList.jsp b/src/main/webapp/WEB-INF/jsp/web/addr/AddrList.jsp index 089f3a82..e17439f1 100644 --- a/src/main/webapp/WEB-INF/jsp/web/addr/AddrList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/addr/AddrList.jsp @@ -28,6 +28,16 @@ $(document).ready(function(){ // addrMassTab(1); // 중복 휴대폰번호 버튼 노출여부 + + + // excel 오류정보 테스트 + $('#errorExcelBtn').click(function(){ + if($tableError.getDataCount()<1){ + alert('오류 정보가 없습니다.'); + return false; + } + $tableError.download("xlsx", "error_data.xlsx"); + }); }); // 메인 화면 좌측메뉴 최신화 @@ -213,7 +223,8 @@ function setAddrMassClose() { //location.reload(); listAddrGrp(); addrGroupLoadAjax(); - addrLoadAjax(); + addrLoadAjax(); + errorPopClean(); // 에러 팝업 초기화 } // 주소록 그룹 중복체크 @@ -651,6 +662,7 @@ function fn_tabToggle(tabNum){
+
@@ -694,6 +706,39 @@ function fn_tabToggle(tabNum){
+ + + + +
+ +
diff --git a/src/main/webapp/WEB-INF/jsp/web/addr/include/addrListforExcel.jsp b/src/main/webapp/WEB-INF/jsp/web/addr/include/addrListforExcel.jsp index 69789caf..a2982350 100644 --- a/src/main/webapp/WEB-INF/jsp/web/addr/include/addrListforExcel.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/addr/include/addrListforExcel.jsp @@ -314,6 +314,7 @@ $(document).on('drop', function (e){ //파일 드래그앤드롭 종료 function excelFileChange(file) { + errorPopClean(); // 에러 popup 초기화 if (file) { fn_loadAddActive(); var reader = new FileReader(); @@ -354,7 +355,8 @@ function processExcelData(data) { data.forEach((row, index) => { var rowData = {}; keys.forEach((key, idx) => { // index 변수명 변경 (내부와 외부에서 사용되므로 충돌 방지) - rowData[key] = row[idx] ? row[idx].trim() : ""; // 각 컬럼에 대해 기본값을 설정 + console.log('row[idx] : ', row[idx]); + rowData[key] = typeof row[idx] === 'string' ? row[idx].trim() : row[idx]; // 문자열인지 확인하고 trim() 적용 }); tableData.push(rowData); @@ -495,6 +497,7 @@ $(document).on("click", "#duplicationChkAll", function(e) { } */ +
@@ -549,13 +552,17 @@ $(document).on("click", "#duplicationChkAll", function(e) {

- 총 0건 / 중복 0건 + 총 0건 + / 중복 0건 + / 오류 0건 + +

+   - + -

diff --git a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp index a80e44a7..b95842f3 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp @@ -7,6 +7,8 @@ + + <% pageContext.setAttribute("newLineChar", "\r\n"); %>