2025/02/11 팝업 2개 뜰 경우 마스크와 팝업 우선순위 수정(엑셀불러오기 팝업 예외처리)
@0b8c076fd867056f474aa23369ae88bfade64d87
--- src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp
+++ src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp
... | ... | @@ -628,7 +628,7 @@ |
| 628 | 628 |
<div class="tooltip-wrap"> |
| 629 | 629 |
<div class="popup-com adr_layer popup02" tabindex="0" data-tooltip-con="popup02" data-focus="popup02" data-focus-prev="popup02-close" style="width: 1000px;"> |
| 630 | 630 |
<div class="tooltip-wrap"> |
| 631 |
- <div class="popup-com adr_layer adr_popup14 adr_detail_result" tabindex="0" data-tooltip-con="adr_popup14" data-focus="adr_popup14" data-focus-prev="adr_popu14-close" style="width: 525px;"> |
|
| 631 |
+ <div class="popup-com adr_layer adr_popup14 adr_detail_result" tabindex="0" data-tooltip-con="adr_popup14" data-focus="adr_popup14" data-focus-prev="adr_popu14-close" style="width: 525px; z-index:125;"> |
|
| 632 | 632 |
<div class="popup_heading"> |
| 633 | 633 |
<p>주소록 상세 결과</p> |
| 634 | 634 |
<button type="button" class="tooltip-close" data-focus="adr_popup14-close"><img src="/publish/images/content/layerPopup_close.png" alt="팝업 닫기"></button> |
--- src/main/webapp/WEB-INF/jsp/web/msgdata/include/msgDataIncludeExcel.jsp
+++ src/main/webapp/WEB-INF/jsp/web/msgdata/include/msgDataIncludeExcel.jsp
... | ... | @@ -749,7 +749,7 @@ |
| 749 | 749 |
|
| 750 | 750 |
<!-- 주소록 상세 결과 팝업 data-tooltip:adr_popup14 --> |
| 751 | 751 |
<div class="tooltip-wrap"> |
| 752 |
- <div class="popup-com adr_layer adr_detail_result adr_popup14" tabindex="0" data-tooltip-con="adr_popup14" data-focus="adr_popup14" data-focus-prev="adr_popu14-close" style="width: 525px;"> |
|
| 752 |
+ <div class="popup-com adr_layer adr_detail_result adr_popup14" tabindex="0" data-tooltip-con="adr_popup14" data-focus="adr_popup14" data-focus-prev="adr_popu14-close" style="width: 525px;z-index:125;"> |
|
| 753 | 753 |
<div class="popup_heading"> |
| 754 | 754 |
<p>주소록 상세 결과</p> |
| 755 | 755 |
<button type="button" class="tooltip-close" data-focus="adr_popup14-close"><img src="/publish/images/content/layerPopup_close.png" alt="팝업 닫기"></button> |
--- src/main/webapp/publish/css/content.css
+++ src/main/webapp/publish/css/content.css
... | ... | @@ -601,6 +601,7 @@ |
| 601 | 601 |
.send_general.sec .tType1 tbody tr:first-child {border-top: 0;}
|
| 602 | 602 |
.send_top .excelWrap {padding: 20px 0;}
|
| 603 | 603 |
.excel_middle {background-color: #f2f2f2; padding: 9px 20px; border-radius: 5px; margin: 20px 0;}
|
| 604 |
+.excel_middle .select_btnWrap div{gap:6px;}
|
|
| 604 | 605 |
.send_top .excelWrap .excel_selBox {margin-bottom: 10px; display: flex; justify-content: space-between;}
|
| 605 | 606 |
.send_top .excelWrap .excel_selBox select.selType1 {padding: 0 80px 0 10px;}
|
| 606 | 607 |
.send_top .excelWrap .excel_selBox span {color: #e40000; font-size: 14px; padding-left: 5px;}
|
... | ... | @@ -1576,8 +1577,9 @@ |
| 1576 | 1577 |
.kakaotalkset_cont .list_info .btn_list{background-image: url(/publish/images/btn_list_icon.png);}
|
| 1577 | 1578 |
.kakaotalkset_cont .list_info .btn_thumbnail{background-image: url(/publish/images/btn_thumbnail_icon.png);}
|
| 1578 | 1579 |
.kakaotalkset_cont .list_info .btnType8{width: 140px;}
|
| 1579 |
-.kakaotalkset_cont .kakao_template_list{margin: 20px 0 0 0;}
|
|
| 1580 |
-.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;}
|
|
| 1580 |
+.kakaotalkset_cont .kakao_template_list{display:flex;margin: 20px 0 0 0;flex-wrap:wrap;gap:13px;}
|
|
| 1581 |
+/* .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;} */
|
|
| 1582 |
+.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;}
|
|
| 1581 | 1583 |
.kakaotalkset_cont .kakao_template_list li.template_none{box-shadow: none; width: 100%; text-align: center; font-size: 18px; font-weight: 400;}
|
| 1582 | 1584 |
.kakaotalkset_cont .kakao_template_list li.template_none::after{display: none;}
|
| 1583 | 1585 |
.kakaotalkset_cont .kakao_template_list li:nth-child(4n){margin: 0 0 0 0;}
|
... | ... | @@ -1733,6 +1735,7 @@ |
| 1733 | 1735 |
.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;}
|
| 1734 | 1736 |
.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;}
|
| 1735 | 1737 |
.send_top .kakaotalksend_cont .kakao_wrap .send_left .receiver_wrap01{display: none !important;}
|
| 1738 |
+.send_top .kakaotalksend_cont .kakao_wrap .send_left .receiver_wrap02 .btnType{margin:0 0 0 6px;}
|
|
| 1736 | 1739 |
.send_top .kakaotalksend_cont .kakao_wrap .send_left .receiver_wrap02 .listType{width: 100%;}
|
| 1737 | 1740 |
.send_top .kakaotalksend_cont .kakao_wrap .send_left .receipt_num .list_table_num{width: calc(100% - 60px);}
|
| 1738 | 1741 |
.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 @@ |
| 1740 | 1743 |
.kakaotalksend_cont .kakao_wrap .kakao_template_text {display: flex;justify-content: space-between;}
|
| 1741 | 1744 |
.kakaotalksend_cont .kakao_wrap .put_right .btn_popup_wrap{margin: 0 0 5px 0;}
|
| 1742 | 1745 |
.kakaotalksend_cont .kakao_wrap .replace_send_wrap .put_left{height: 234px;}
|
| 1743 |
-.kakaotalksend_cont .kakao_wrap .replace_send_wrap .put_left.short textarea{height: calc(100% - 58px);}
|
|
| 1746 |
+.kakaotalksend_cont .kakao_wrap .replace_send_wrap .put_left.short textarea{height: calc(100% - 80px);}
|
|
| 1744 | 1747 |
.kakaotalksend_cont .kakao_wrap .button_type_wrap{display: flex; border: 1px solid #e5e5e5; border-radius: 5px; padding: 10px 20px; margin: 10px 0 0 0;}
|
| 1745 | 1748 |
.kakaotalksend_cont .kakao_wrap .button_type_wrap dt{width: 110px; font-weight: 400; padding: 8px 0 0 0;}
|
| 1746 | 1749 |
.kakaotalksend_cont .kakao_wrap .button_type_wrap .button_type_input{width: 483px;}
|
--- src/main/webapp/publish/css/popupLayer.css
+++ src/main/webapp/publish/css/popupLayer.css
... | ... | @@ -296,7 +296,7 @@ |
| 296 | 296 |
.histroy_trans ul {background-color: #f5f5f5; padding: 0 20px; border: 1px solid #dadada; border-radius: 0 0 5px 5px; margin-top: -3px;}
|
| 297 | 297 |
.histroy_trans ul li {position: relative; height: 30px; line-height: 30px; border-bottom: 1px solid #e8e8e8;}
|
| 298 | 298 |
.histroy_trans ul li:only-child {border-bottom: 0;}
|
| 299 |
-.histroy_trans ul li p {display: inline-block; color: #666; font-size: 14px; font-weight: 300; padding-left: 15px; letter-spacing: 0.5px;}
|
|
| 299 |
+.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;}
|
|
| 300 | 300 |
.histroy_trans ul li button {position: absolute; right: 0; top: 50%; transform: translateY(-50%);}
|
| 301 | 301 |
.popup_btn_wrap2.hisroy_btn {width: 178px;}
|
| 302 | 302 |
.popup_btn_wrap2.hisroy_btn button {width: calc(100%/2 - 2.5px); height: 32px; font-size: 14px;}
|
... | ... | @@ -1035,7 +1035,7 @@ |
| 1035 | 1035 |
/* 발신프로필 등록 */ |
| 1036 | 1036 |
.add_profile_popup01 .layer_tType1 .cf_text{display: block; font-size: 16px; font-weight: 300; color: #666; padding: 10px 0 0 0;}
|
| 1037 | 1037 |
.add_profile_popup01 .layer_tType1 td{padding: 10px 0 10px 10px;}
|
| 1038 |
-.add_profile_popup01 .layer_tType1 select{width: 207px;}
|
|
| 1038 |
+.add_profile_popup01 .layer_tType1 select{min-width: 200px;width:auto;}
|
|
| 1039 | 1039 |
.add_profile_popup01 .table_top{padding: 0 0 10px 0;}
|
| 1040 | 1040 |
.add_profile_popup01 .table_top p{font-size: 16px; color: #555;}
|
| 1041 | 1041 |
.add_profile_popup01 .kakaotalk_tag{position: absolute; left: 27px; top: 20px;}
|
--- src/main/webapp/publish/js/popupLayer.js
+++ src/main/webapp/publish/js/popupLayer.js
... | ... | @@ -116,6 +116,19 @@ |
| 116 | 116 |
$("body").find(".mask").addClass("on");
|
| 117 | 117 |
$("body").css("overflow","hidden");
|
| 118 | 118 |
wrapWindowByMask(popName); |
| 119 |
+ |
|
| 120 |
+ if($(e.target).closest(".popup-com").is(".popup-com") == true){
|
|
| 121 |
+ $(".mask").attr("style","z-index:101;");
|
|
| 122 |
+ $("."+popName).closest(".tooltip-wrap").attr("style","z-index:105;");
|
|
| 123 |
+ } |
|
| 124 |
+ |
|
| 125 |
+ // 엑셀 불러오기 > 주소록 상세결과 팝업 마스크 오류 예외처리 |
|
| 126 |
+ if($("[data-tooltip-con="+popName+"]").is(".adr_detail_result")){
|
|
| 127 |
+ $(".mask").removeClass("on");
|
|
| 128 |
+ $(".adr_detail_result").before('<div class="mask on"></div>');
|
|
| 129 |
+ $("body").css("overflow","hidden");
|
|
| 130 |
+ $(".adr_detail_result").closest(".tooltip-wrap").attr("style","z-index:120;");
|
|
| 131 |
+ } |
|
| 119 | 132 |
|
| 120 | 133 |
/* 주소록 대량등록, 주소롟 불러오기 팝업에 있는 테이블 스크롤바 꾸미기 */ |
| 121 | 134 |
$(".adr_pop_list2 .adr_bd_wrap").mCustomScrollbar({
|
... | ... | @@ -148,17 +161,32 @@ |
| 148 | 161 |
/* 상세보기 버튼 클릭 시 레이어팝업*/ |
| 149 | 162 |
// 팝업이 보이고 있으면 마스크 노출/미노출 |
| 150 | 163 |
// 레이어 팝업 2개 뜰 경우 |
| 151 |
- if($(".popup-com:visible").length <= 1){
|
|
| 164 |
+ if($(".popup-com:visible").length < 1){
|
|
| 152 | 165 |
$(".mask").removeClass("on");
|
| 153 |
- }else{}
|
|
| 166 |
+ }else{
|
|
| 167 |
+ $(".mask").attr("style","z-index:99;");
|
|
| 168 |
+ $(".mask").addClass("on");
|
|
| 169 |
+ $("body").css("overflow","hidden");
|
|
| 170 |
+ } |
|
| 154 | 171 |
|
| 155 | 172 |
if($(this).closest(".adr_layer").is(".adr_popup14") == true){
|
| 156 | 173 |
$(".mask").addClass("on");
|
| 174 |
+ $("body").css("overflow","hidden");
|
|
| 157 | 175 |
}else{}
|
| 176 |
+ |
|
| 158 | 177 |
// 결과상세에서 레이어팝업 2개 뜰 경우 |
| 159 |
- if($(this).closest(".adr_layer").is(".rev_popup02") == true){
|
|
| 178 |
+ if($(this).closest(".adr_layer").is(".rev_popup02") == true && $(this).closest(".adr_layer").is(".add_adr_popup") == false){
|
|
| 160 | 179 |
$(".mask").addClass("on");
|
| 161 |
- }else{}
|
|
| 180 |
+ $("body").css("overflow","hidden");
|
|
| 181 |
+ } |
|
| 182 |
+ else{}
|
|
| 183 |
+ |
|
| 184 |
+ // 엑셀 불러오기 > 주소록 상세결과 팝업 마스크 오류 예외처리 |
|
| 185 |
+ if($(this).closest(".adr_layer").is(".adr_detail_result")){
|
|
| 186 |
+ $(".mask").removeClass("off");
|
|
| 187 |
+ $(".adr_detail_result").siblings(".mask").remove();
|
|
| 188 |
+ } |
|
| 189 |
+ |
|
| 162 | 190 |
}) |
| 163 | 191 |
} |
| 164 | 192 |
|
--- src/main/webapp/publish/textingmsg_2025_detail.html
+++ src/main/webapp/publish/textingmsg_2025_detail.html
... | ... | @@ -244,7 +244,7 @@ |
| 244 | 244 |
|
| 245 | 245 |
<!-- 발송대상리스트 팝업 --> |
| 246 | 246 |
<div class="tooltip-wrap"> |
| 247 |
- <div class="popup-com ad_layer rev_popup04" tabindex="0" data-tooltip-con="rev_popup04" data-focus="rev_popup04" data-focus-prev="rev_popup04-close" style="width:530px;"> |
|
| 247 |
+ <div class="popup-com ad_layer rev_popup04 transmit_list_popup" tabindex="0" data-tooltip-con="rev_popup04" data-focus="rev_popup04" data-focus-prev="rev_popup04-close" style="width:530px;"> |
|
| 248 | 248 |
<div class="popup_heading"> |
| 249 | 249 |
<p>발송대상 리스트</p> |
| 250 | 250 |
<button type="button" class="tooltip-close" data-focus="rev_popup04-close"><img src="/publish/images/content/layerPopup_close.png" alt="팝업 닫기"></button> |
... | ... | @@ -335,7 +335,7 @@ |
| 335 | 335 |
<div class="table_btn clearfix"> |
| 336 | 336 |
<div class="table_btn_left"> |
| 337 | 337 |
<button type="button" class="excel_btn btnType"><i class="downroad"></i>엑셀 다운로드</button> |
| 338 |
- <button type="button" data-tooltip="rev_popup02" class="btnType btnType14"><i class="add_img"></i>주소록 등록</button> |
|
| 338 |
+ <button type="button" data-tooltip="rev_popup02" class="btnType btnType14 btn_adr_add"><i class="add_img"></i>주소록 등록</button> |
|
| 339 | 339 |
</div> |
| 340 | 340 |
</div> |
| 341 | 341 |
|
... | ... | @@ -542,7 +542,7 @@ |
| 542 | 542 |
|
| 543 | 543 |
<!-- 주소록에 등록 팝업 --> |
| 544 | 544 |
<div class="tooltip-wrap"> |
| 545 |
- <div class="popup-com adr_layer rev_popup02" tabindex="0" data-tooltip-con="rev_popup02" data-focus="rev_popup02" data-focus-prev="rev_popup02-close" style="width: 510px;"> |
|
| 545 |
+ <div class="popup-com adr_layer rev_popup02 add_adr_popup" tabindex="0" data-tooltip-con="rev_popup02" data-focus="rev_popup02" data-focus-prev="rev_popup02-close" style="width: 510px;"> |
|
| 546 | 546 |
<div class="popup_heading"> |
| 547 | 547 |
<p>주소록에 등록</p> |
| 548 | 548 |
<button type="button" class="tooltip-close" data-focus="rev_popup02-close"><img src="/publish/images/content/layerPopup_close.png" alt="팝업 닫기"></button> |
Add a comment
Delete comment
Once you delete this comment, you won't be able to recover it. Are you sure you want to delete this comment?