tolag3/mjon_git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2025/02/11 팝업 2개 뜰 경우 마스크와 팝업 우선순위 수정(엑셀불러오기 팝업 예외처리)

Browse Source
This commit is contained in:
subsub 2025-02-11 10:15:21 +09:00
parent ebc3ce2933
commit 0b8c076fd8
6 changed files with 45 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp
View File

@ -628,7 +628,7 @@
<div class="tooltip-wrap">
<div class="popup-com adr_layer popup02" tabindex="0" data-tooltip-con="popup02" data-focus="popup02" data-focus-prev="popup02-close" style="width: 1000px;">
<div class="tooltip-wrap">
<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;">
<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;">
<div class="popup_heading">
<p>주소록 상세 결과</p>
<button type="button" class="tooltip-close" data-focus="adr_popup14-close"><img src="/publish/images/content/layerPopup_close.png" alt="팝업 닫기"></button>

2
src/main/webapp/WEB-INF/jsp/web/msgdata/include/msgDataIncludeExcel.jsp
View File

@ -749,7 +749,7 @@ $(document).on('click', '#errorExcelBtn', function() {
<!-- 주소록 상세 결과 팝업 data-tooltip:adr_popup14 -->
<div class="tooltip-wrap">
<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;">
<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;">
<div class="popup_heading">
<p>주소록 상세 결과</p>
<button type="button" class="tooltip-close" data-focus="adr_popup14-close"><img src="/publish/images/content/layerPopup_close.png" alt="팝업 닫기"></button>

9
src/main/webapp/publish/css/content.css
View File

@ -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;}

4
src/main/webapp/publish/css/popupLayer.css
View File

@ -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;}

36
src/main/webapp/publish/js/popupLayer.js
View File

@ -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('<div class="mask on"></div>');
$("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();
}
})
}

6
src/main/webapp/publish/textingmsg_2025_detail.html
View File

@ -244,7 +244,7 @@
<!-- 발송대상리스트 팝업 -->
<div class="tooltip-wrap">
<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;">
<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;">
<div class="popup_heading">
<p>발송대상 리스트</p>
<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 @@
<div class="table_btn clearfix">
<div class="table_btn_left">
<button type="button" class="excel_btn btnType"><i class="downroad"></i>엑셀 다운로드</button>
<button type="button" data-tooltip="rev_popup02" class="btnType btnType14"><i class="add_img"></i>주소록 등록</button>
<button type="button" data-tooltip="rev_popup02" class="btnType btnType14 btn_adr_add"><i class="add_img"></i>주소록 등록</button>
</div>
</div>
@ -542,7 +542,7 @@
<!-- 주소록에 등록 팝업 -->
<div class="tooltip-wrap">
<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;">
<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;">
<div class="popup_heading">
<p>주소록에 등록</p>
<button type="button" class="tooltip-close" data-focus="rev_popup02-close"><img src="/publish/images/content/layerPopup_close.png" alt="팝업 닫기"></button>