From 0b8c076fd867056f474aa23369ae88bfade64d87 Mon Sep 17 00:00:00 2001 From: subsub Date: Tue, 11 Feb 2025 10:15:21 +0900 Subject: [PATCH 01/26] =?UTF-8?q?2025/02/11=20=ED=8C=9D=EC=97=85=202?= =?UTF-8?q?=EA=B0=9C=20=EB=9C=B0=20=EA=B2=BD=EC=9A=B0=20=EB=A7=88=EC=8A=A4?= =?UTF-8?q?=ED=81=AC=EC=99=80=20=ED=8C=9D=EC=97=85=20=EC=9A=B0=EC=84=A0?= =?UTF-8?q?=EC=88=9C=EC=9C=84=20=EC=88=98=EC=A0=95(=EC=97=91=EC=85=80?= =?UTF-8?q?=EB=B6=88=EB=9F=AC=EC=98=A4=EA=B8=B0=20=ED=8C=9D=EC=97=85=20?= =?UTF-8?q?=EC=98=88=EC=99=B8=EC=B2=98=EB=A6=AC)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/jsp/web/fax/faxDataView.jsp | 2 +- .../msgdata/include/msgDataIncludeExcel.jsp | 2 +- src/main/webapp/publish/css/content.css | 9 +++-- src/main/webapp/publish/css/popupLayer.css | 4 +-- src/main/webapp/publish/js/popupLayer.js | 36 ++++++++++++++++--- .../publish/textingmsg_2025_detail.html | 6 ++-- 6 files changed, 45 insertions(+), 14 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp b/src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp index cb2e332e..226aa435 100644 --- a/src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp @@ -628,7 +628,7 @@
-
+

주소록 상세 결과

diff --git a/src/main/webapp/WEB-INF/jsp/web/msgdata/include/msgDataIncludeExcel.jsp b/src/main/webapp/WEB-INF/jsp/web/msgdata/include/msgDataIncludeExcel.jsp index 3016456a..7561e7df 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgdata/include/msgDataIncludeExcel.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/include/msgDataIncludeExcel.jsp @@ -749,7 +749,7 @@ $(document).on('click', '#errorExcelBtn', function() {
-
+

주소록 상세 결과

diff --git a/src/main/webapp/publish/css/content.css b/src/main/webapp/publish/css/content.css index 96dbc182..4658f36f 100644 --- a/src/main/webapp/publish/css/content.css +++ b/src/main/webapp/publish/css/content.css @@ -601,6 +601,7 @@ input[type=text]::-ms-reveal, input[type=password]::-ms-reveal, input[type=email .send_general.sec .tType1 tbody tr:first-child {border-top: 0;} .send_top .excelWrap {padding: 20px 0;} .excel_middle {background-color: #f2f2f2; padding: 9px 20px; border-radius: 5px; margin: 20px 0;} +.excel_middle .select_btnWrap div{gap:6px;} .send_top .excelWrap .excel_selBox {margin-bottom: 10px; display: flex; justify-content: space-between;} .send_top .excelWrap .excel_selBox select.selType1 {padding: 0 80px 0 10px;} .send_top .excelWrap .excel_selBox span {color: #e40000; font-size: 14px; padding-left: 5px;} @@ -1576,8 +1577,9 @@ button.check_validity:hover {border: 1px solid #a3a3a3;box-shadow: 0px 0px 5px .kakaotalkset_cont .list_info .btn_list{background-image: url(/publish/images/btn_list_icon.png);} .kakaotalkset_cont .list_info .btn_thumbnail{background-image: url(/publish/images/btn_thumbnail_icon.png);} .kakaotalkset_cont .list_info .btnType8{width: 140px;} -.kakaotalkset_cont .kakao_template_list{margin: 20px 0 0 0;} -.kakaotalkset_cont .kakao_template_list li{position: relative; display: inline-block; width: calc((100% - 135px)/4); border-radius: 25px; box-shadow: inset 0 0px 8px rgba(0,0,0,0.2); padding: 8px 8px 16px 8px; margin: 0 20px 40px 0;} +.kakaotalkset_cont .kakao_template_list{display:flex;margin: 20px 0 0 0;flex-wrap:wrap;gap:13px;} +/* .kakaotalkset_cont .kakao_template_list li{position: relative; display: inline-block; width: calc((100% - 135px)/4); border-radius: 25px; box-shadow: inset 0 0px 8px rgba(0,0,0,0.2); padding: 8px 8px 16px 8px; margin: 0 20px 40px 0;} */ +.kakaotalkset_cont .kakao_template_list li{position: relative; width:calc((100%/4) - 26px); border-radius: 25px; box-shadow: inset 0 0px 8px rgba(0,0,0,0.2); padding: 8px 8px 16px 8px;} .kakaotalkset_cont .kakao_template_list li.template_none{box-shadow: none; width: 100%; text-align: center; font-size: 18px; font-weight: 400;} .kakaotalkset_cont .kakao_template_list li.template_none::after{display: none;} .kakaotalkset_cont .kakao_template_list li:nth-child(4n){margin: 0 0 0 0;} @@ -1733,6 +1735,7 @@ button.check_validity:hover {border: 1px solid #a3a3a3;box-shadow: 0px 0px 5px .send_top .kakaotalksend_cont .kakao_wrap .send_left .variable_wrap .excel_btn{height: 40px; border: 5px solid #129738; color: #129738; font-size: 16px; font-weight: 500; padding: 0 15px; border-radius: 5px;} .send_top .kakaotalksend_cont .kakao_wrap .send_left .variable_wrap .excel_btn i{width: 17px; height: 15px; background-image: url(/publish/images/content/excel_img.png); margin: 0 5px 5px 0;} .send_top .kakaotalksend_cont .kakao_wrap .send_left .receiver_wrap01{display: none !important;} +.send_top .kakaotalksend_cont .kakao_wrap .send_left .receiver_wrap02 .btnType{margin:0 0 0 6px;} .send_top .kakaotalksend_cont .kakao_wrap .send_left .receiver_wrap02 .listType{width: 100%;} .send_top .kakaotalksend_cont .kakao_wrap .send_left .receipt_num .list_table_num{width: calc(100% - 60px);} .kakaotalksend_cont .kakao_wrap .put_right .qmMark{width: 19px; height: 19px; background-image: url(/publish/images/content/qmIcon_s.png); margin: -0.3px 0 2px 4px;} @@ -1740,7 +1743,7 @@ button.check_validity:hover {border: 1px solid #a3a3a3;box-shadow: 0px 0px 5px .kakaotalksend_cont .kakao_wrap .kakao_template_text {display: flex;justify-content: space-between;} .kakaotalksend_cont .kakao_wrap .put_right .btn_popup_wrap{margin: 0 0 5px 0;} .kakaotalksend_cont .kakao_wrap .replace_send_wrap .put_left{height: 234px;} -.kakaotalksend_cont .kakao_wrap .replace_send_wrap .put_left.short textarea{height: calc(100% - 58px);} +.kakaotalksend_cont .kakao_wrap .replace_send_wrap .put_left.short textarea{height: calc(100% - 80px);} .kakaotalksend_cont .kakao_wrap .button_type_wrap{display: flex; border: 1px solid #e5e5e5; border-radius: 5px; padding: 10px 20px; margin: 10px 0 0 0;} .kakaotalksend_cont .kakao_wrap .button_type_wrap dt{width: 110px; font-weight: 400; padding: 8px 0 0 0;} .kakaotalksend_cont .kakao_wrap .button_type_wrap .button_type_input{width: 483px;} diff --git a/src/main/webapp/publish/css/popupLayer.css b/src/main/webapp/publish/css/popupLayer.css index 5c3626ef..3beed5ec 100644 --- a/src/main/webapp/publish/css/popupLayer.css +++ b/src/main/webapp/publish/css/popupLayer.css @@ -296,7 +296,7 @@ .histroy_trans ul {background-color: #f5f5f5; padding: 0 20px; border: 1px solid #dadada; border-radius: 0 0 5px 5px; margin-top: -3px;} .histroy_trans ul li {position: relative; height: 30px; line-height: 30px; border-bottom: 1px solid #e8e8e8;} .histroy_trans ul li:only-child {border-bottom: 0;} -.histroy_trans ul li p {display: inline-block; color: #666; font-size: 14px; font-weight: 300; padding-left: 15px; letter-spacing: 0.5px;} +.histroy_trans ul li p {display: inline-block; width: 100%; color: #666; font-size: 14px; font-weight: 300; letter-spacing: 0.5px; text-align:center;} .histroy_trans ul li button {position: absolute; right: 0; top: 50%; transform: translateY(-50%);} .popup_btn_wrap2.hisroy_btn {width: 178px;} .popup_btn_wrap2.hisroy_btn button {width: calc(100%/2 - 2.5px); height: 32px; font-size: 14px;} @@ -1035,7 +1035,7 @@ /* 발신프로필 등록 */ .add_profile_popup01 .layer_tType1 .cf_text{display: block; font-size: 16px; font-weight: 300; color: #666; padding: 10px 0 0 0;} .add_profile_popup01 .layer_tType1 td{padding: 10px 0 10px 10px;} -.add_profile_popup01 .layer_tType1 select{width: 207px;} +.add_profile_popup01 .layer_tType1 select{min-width: 200px;width:auto;} .add_profile_popup01 .table_top{padding: 0 0 10px 0;} .add_profile_popup01 .table_top p{font-size: 16px; color: #555;} .add_profile_popup01 .kakaotalk_tag{position: absolute; left: 27px; top: 20px;} diff --git a/src/main/webapp/publish/js/popupLayer.js b/src/main/webapp/publish/js/popupLayer.js index c2e17c73..71facede 100644 --- a/src/main/webapp/publish/js/popupLayer.js +++ b/src/main/webapp/publish/js/popupLayer.js @@ -116,6 +116,19 @@ function tooltip() { $("body").find(".mask").addClass("on"); $("body").css("overflow","hidden"); wrapWindowByMask(popName); + + if($(e.target).closest(".popup-com").is(".popup-com") == true){ + $(".mask").attr("style","z-index:101;"); + $("."+popName).closest(".tooltip-wrap").attr("style","z-index:105;"); + } + + // 엑셀 불러오기 > 주소록 상세결과 팝업 마스크 오류 예외처리 + if($("[data-tooltip-con="+popName+"]").is(".adr_detail_result")){ + $(".mask").removeClass("on"); + $(".adr_detail_result").before('
'); + $("body").css("overflow","hidden"); + $(".adr_detail_result").closest(".tooltip-wrap").attr("style","z-index:120;"); + } /* 주소록 대량등록, 주소롟 불러오기 팝업에 있는 테이블 스크롤바 꾸미기 */ $(".adr_pop_list2 .adr_bd_wrap").mCustomScrollbar({ @@ -148,17 +161,32 @@ function tooltip() { /* 상세보기 버튼 클릭 시 레이어팝업*/ // 팝업이 보이고 있으면 마스크 노출/미노출 // 레이어 팝업 2개 뜰 경우 - if($(".popup-com:visible").length <= 1){ + if($(".popup-com:visible").length < 1){ $(".mask").removeClass("on"); - }else{} + }else{ + $(".mask").attr("style","z-index:99;"); + $(".mask").addClass("on"); + $("body").css("overflow","hidden"); + } if($(this).closest(".adr_layer").is(".adr_popup14") == true){ $(".mask").addClass("on"); + $("body").css("overflow","hidden"); }else{} + // 결과상세에서 레이어팝업 2개 뜰 경우 - if($(this).closest(".adr_layer").is(".rev_popup02") == true){ + if($(this).closest(".adr_layer").is(".rev_popup02") == true && $(this).closest(".adr_layer").is(".add_adr_popup") == false){ $(".mask").addClass("on"); - }else{} + $("body").css("overflow","hidden"); + } + else{} + + // 엑셀 불러오기 > 주소록 상세결과 팝업 마스크 오류 예외처리 + if($(this).closest(".adr_layer").is(".adr_detail_result")){ + $(".mask").removeClass("off"); + $(".adr_detail_result").siblings(".mask").remove(); + } + }) } diff --git a/src/main/webapp/publish/textingmsg_2025_detail.html b/src/main/webapp/publish/textingmsg_2025_detail.html index 9bca4843..21470587 100644 --- a/src/main/webapp/publish/textingmsg_2025_detail.html +++ b/src/main/webapp/publish/textingmsg_2025_detail.html @@ -244,7 +244,7 @@
-
+

발송대상 리스트

@@ -335,7 +335,7 @@
- +
@@ -542,7 +542,7 @@
-
+

주소록에 등록

From f4ecaa4bb9964891e329e6e3317f0b56288605c9 Mon Sep 17 00:00:00 2001 From: "hehihoho3@gmail.com" Date: Wed, 19 Feb 2025 15:49:58 +0900 Subject: [PATCH 02/26] =?UTF-8?q?fn=5FphoneAddProcess=20=EA=B3=B5=ED=86=B5?= =?UTF-8?q?=ED=95=A8=EC=88=98=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsp/web/msgdata/MsgDataSMLView.jsp | 66 ++----------------- 1 file changed, 5 insertions(+), 61 deletions(-) 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 b2c2a274..9f547fa1 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp @@ -1119,20 +1119,8 @@ $(document).ready(function (){ .map(num => removeDash(num.trim())) .filter(num => num !== "") .filter(num => isValidPhoneNumber(num)); // 유효한 번호만 필터링; - - console.log('numbers : ', numbers); - const addrData = processPhoneNumbers(numbers); - - // 기존 tableL의 데이터를 가져옵니다. - var existingData = tableL.getData(); - - // 데이터 병합 및 중복 제거 - const result = mergeAndValidateData(existingData, addrData); - - - // 테이블 데이터 업데이트 - if (!updateTableData(tableL, result)) return false; + fn_phoneAddProcess(tableL, numbers); // textarea 초기화 textarea.val(''); // jQuery 객체에서 값을 초기화할 때는 .val('') 사용 @@ -1302,19 +1290,8 @@ $(document).ready(function (){ return false; } - console.log('numbers : ', numbers); - const addrData = processPhoneNumbers(numbers); - - // 기존 tableL의 데이터를 가져옵니다. - var existingData = tableL.getData(); - - // 데이터 병합 및 중복 제거 - const result = mergeAndValidateData(existingData, addrData); - - - // 테이블 데이터 업데이트 - if (!updateTableData(tableL, result)) return false; + fn_phoneAddProcess(tableL, numbers); $("#btnLatestAddPhoneClose").trigger("click"); @@ -1340,19 +1317,8 @@ $(document).ready(function (){ return false; } - console.log('numbers : ', numbers); - const addrData = processPhoneNumbers(numbers); - - // 기존 tableL의 데이터를 가져옵니다. - var existingData = tableL.getData(); - - // 데이터 병합 및 중복 제거 - const result = mergeAndValidateData(existingData, addrData); - - - // 테이블 데이터 업데이트 - if (!updateTableData(tableL, result)) return false; + fn_phoneAddProcess(tableL, numbers); $("#btnLatestAddPhoneClose").trigger("click"); @@ -1392,19 +1358,8 @@ $(document).ready(function (){ return false; } - console.log('numbers : ', numbers); - const addrData = processPhoneNumbers(numbers); - - // 기존 tableL의 데이터를 가져옵니다. - var existingData = tableL.getData(); - - // 데이터 병합 및 중복 제거 - const result = mergeAndValidateData(existingData, addrData); - - - // 테이블 데이터 업데이트 - if (!updateTableData(tableL, result)) return false; + fn_phoneAddProcess(tableL, numbers); $("#btnLatestAddPhoneClose").trigger("click"); @@ -1430,19 +1385,8 @@ $(document).ready(function (){ return false; } - console.log('numbers : ', numbers); - const addrData = processPhoneNumbers(numbers); - - // 기존 tableL의 데이터를 가져옵니다. - var existingData = tableL.getData(); - - // 데이터 병합 및 중복 제거 - const result = mergeAndValidateData(existingData, addrData); - - - // 테이블 데이터 업데이트 - if (!updateTableData(tableL, result)) return false; + fn_phoneAddProcess(tableL, numbers); $("#btnLatestAddPhoneClose").trigger("click"); From c97a3bb12bfc466e6af0014f7ce4f88fa966ffeb Mon Sep 17 00:00:00 2001 From: Eunjipark Date: Thu, 20 Feb 2025 16:09:19 +0900 Subject: [PATCH 03/26] =?UTF-8?q?2025/02/20=20=EB=AC=B8=EC=9E=90=EC=A0=84?= =?UTF-8?q?=EC=86=A1=20>=20=EC=95=88=EC=8B=AC=EB=B2=88=ED=98=B8=20?= =?UTF-8?q?=EC=82=AC=EC=9A=A9=20=EA=B4=80=EB=A0=A8=20=EC=95=88=EB=82=B4=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsp/web/msgdata/MsgDataSMLView.jsp | 8 +++- .../WEB-INF/jsp/web/pop/infoListPop.jsp | 42 +++++++++++++++++++ src/main/webapp/publish/css/content.css | 9 ++++ src/main/webapp/publish/css/popupLayer.css | 8 +++- src/main/webapp/publish/js/content.js | 4 +- 5 files changed, 66 insertions(+), 5 deletions(-) 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 b2c2a274..ff516438 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp @@ -3201,6 +3201,8 @@ function infoPop(pageUrl){ document.popForm.method = "post"; if(pageUrl == "adrvertisement1"){ window.open("about:blank", 'infoPop', 'width=790, height=800, top=100, left=100, fullscreen=no, menubar=no, status=no, toolbar=no, titlebar=yes, location=no, scrollbars=1'); + }else if(pageUrl == "selectMsgDataView3"){ + window.open("about:blank", 'infoPop', 'width=600, height=550, top=100, left=100, fullscreen=no, menubar=no, status=no, toolbar=no, titlebar=yes, location=no, scrollbars=1'); }else{ window.open("about:blank", 'infoPop', 'width=790, height=350, top=100, left=100, fullscreen=no, menubar=no, status=no, toolbar=no, titlebar=yes, location=no, scrollbars=1'); } @@ -3209,6 +3211,7 @@ function infoPop(pageUrl){ document.popForm.submit(); } + $(document).on('click', '.addressregi_btn', function() { var tableData = tableL.getRows(); var dataLen = tableL.getRows().length; @@ -4217,7 +4220,7 @@ function getMjMsgSentListAll(pageNo) { -