diff --git a/README.md b/README.md index b9335a95..e93d1273 100644 --- a/README.md +++ b/README.md @@ -181,3 +181,30 @@ escapeXml를 true로 설정함으로써 가장 간단하게 XSS(링크)를 방 따라서 XSS 방어하기 위해서는 을 사용하는 게 좋다. +# 팝업호출시 blockUI 적용 +```js +// 팝업호출하는 화면단 : ~Form.jsp +// tiles biz jsp단에서 var popup 선언되어 있음 +$.blockUI({message: '' ,css: {width: '100%', height: '100%'} + //모달창 외부 클릭시 닫기 + ,onOverlayClick: () => { + $.unblockUI(); + popup?.self?.close(); + } +}); +popup = CmmPopup.open(url, params, popOption, popTitle); + +// 팝업창 +// event에 아래 코드 추가 +// tiles biz jsp단에서 var unblockUI = () => $.unblockUI() 선언되어 있음 +$(window).on("unload", function (e) { + window.opener?.unblockUI(); + return null; +}); + +$("#btnClose").on('click', () => { + window.opener?.unblockUI(); + window.close() +}); + +``` diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/cjm/cjmSampleForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/cjm/cjmSampleForm.jsp index 74a9661c..806224b2 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/cjm/cjmSampleForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/cjm/cjmSampleForm.jsp @@ -97,7 +97,14 @@ default: break; } - CmmPopup.open(url, params, popOption, popTitle); + $.blockUI({message: '' ,css: {width: '100%', height: '100%'} + //모달창 외부 클릭시 닫기 + ,onOverlayClick: () => { + $.unblockUI(); + popup?.self?.close(); + } + }); + popup = CmmPopup.open(url, params, popOption, popTitle); } ,clickRegBtn: function(props){ @@ -301,4 +308,4 @@ - \ No newline at end of file + diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ec0100Form.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ec0100Form.jsp index 6cc5e870..cc64ea92 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ec0100Form.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ec0100Form.jsp @@ -68,7 +68,14 @@ const fnClickProgramBtn = (props) => { const rowData = props.grid.getRow(props.rowKey); - CmmPopup.open( + $.blockUI({message: '' ,css: {width: '100%', height: '100%'} + //모달창 외부 클릭시 닫기 + ,onOverlayClick: () => { + $.unblockUI(); + popup?.self?.close(); + } + }); + popup = CmmPopup.open( '' , { progrmFileNm: rowData.progrmFileNm @@ -174,7 +181,14 @@ * 데이터 등록 ======================== */ const addProgram = () => { - CmmPopup.open( + $.blockUI({message: '' ,css: {width: '100%', height: '100%'} + //모달창 외부 클릭시 닫기 + ,onOverlayClick: () => { + $.unblockUI(); + popup?.self?.close(); + } + }); + popup = CmmPopup.open( '' , null , { diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ec0100Popup.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ec0100Popup.jsp index c7ecf2df..4ab59d88 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ec0100Popup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ec0100Popup.jsp @@ -69,7 +69,7 @@ 등록 - 닫기 + 닫기 diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownFileSelPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownFileSelPopup.jsp index 7feb9653..0e305670 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownFileSelPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownFileSelPopup.jsp @@ -41,7 +41,7 @@ @@ -166,17 +166,22 @@ GRID.resetData([]); } } - ,close: () => { - window.opener.unblockUI(); - window.opener.popup = null; - window.close(); - } } /************************************************************************** * event **************************************************************************/ $(() => { + $(window).on("unload", function (e) { + window.opener?.unblockUI(); + return null; + }); + + $("#btnClose").on('click', () => { + window.opener?.unblockUI(); + window.close() + }); + $('#folder').on('change', function(e) { //document.getElementById("folder").select(); //document.selection.clear(); @@ -277,11 +282,5 @@ **************************************************************************/ $(document).ready(function(){ initGrid(); - - $(window).on("beforeunload", function () { - window.opener.unblockUI(); - window.opener.popup = null; - return ""; - }); }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownMgtForm.jsp index 451183b1..2f3580a6 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownMgtForm.jsp @@ -50,8 +50,8 @@ **************************************************************************/ let GRID = null; var callbackSearch = () => fnBiz.search(); - var unblockUI = () => $.unblockUI(); - var popup = null; + //var unblockUI = () => $.unblockUI(); + //var popup = null; /* ******************************* * Biz function @@ -81,8 +81,8 @@ $.blockUI({message: '' ,css: {width: '100%', height: '100%'} //모달창 외부 클릭시 닫기 ,onOverlayClick: () => { - $.unblockUI(); - popup.self.close(); + $.unblockUI(); + popup?.self?.close(); } }); popup = CmmPopup.open(url, params, popOption, popTitle); diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownPopup.jsp index 8ab1f11f..2a77959e 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownPopup.jsp @@ -5,7 +5,7 @@ - diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthAuthorMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthAuthorMgtForm.jsp index 8738ed09..6450bfe2 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthAuthorMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthAuthorMgtForm.jsp @@ -77,7 +77,14 @@ default: break; } - CmmPopup.open(url, params, popOption, popTitle); + $.blockUI({message: '' ,css: {width: '100%', height: '100%'} + //모달창 외부 클릭시 닫기 + ,onOverlayClick: () => { + $.unblockUI(); + popup?.self?.close(); + } + }); + popup = CmmPopup.open(url, params, popOption, popTitle); } ,fnClickAuthRegBtn : function(props){ const rowData = props.grid.getRow(props.rowKey); diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthAuthorMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthAuthorMgtPopup.jsp index b73b2e0e..40d40028 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthAuthorMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthAuthorMgtPopup.jsp @@ -121,6 +121,16 @@ * event **************************************************************************/ $(() => { + $(window).on("unload", function (e) { + window.opener?.unblockUI(); + return null; + }); + + $("#btnClose").on('click', () => { + window.opener?.unblockUI(); + window.close() + }); + $('#btnRegist').on('click', () => fnBiz.add()); $('#btnModify').on('click', () => fnBiz.modify()); diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthGrpMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthGrpMgtForm.jsp index c07523b9..122fb0ca 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthGrpMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthGrpMgtForm.jsp @@ -72,7 +72,14 @@ default: break; } - CmmPopup.open(url, params, popOption, popTitle); + $.blockUI({message: '' ,css: {width: '100%', height: '100%'} + //모달창 외부 클릭시 닫기 + ,onOverlayClick: () => { + $.unblockUI(); + popup?.self?.close(); + } + }); + popup = CmmPopup.open(url, params, popOption, popTitle); } ,onClickGrid: function(props){ diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthGrpMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthGrpMgtPopup.jsp index 939fc83e..b78b5fa3 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthGrpMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthGrpMgtPopup.jsp @@ -115,6 +115,15 @@ * event **************************************************************************/ $(() => { + $(window).on("unload", function (e) { + window.opener?.unblockUI(); + return null; + }); + + $("#btnClose").on('click', () => { + window.opener?.unblockUI(); + window.close() + }); $('#btnRegist').on('click', () => fnBiz.add()); $('#btnModify').on('click', () => fnBiz.modify()); diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthHierarchyMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthHierarchyMgtForm.jsp index d73e24da..c296c35c 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthHierarchyMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthHierarchyMgtForm.jsp @@ -102,7 +102,14 @@ default: break; } - CmmPopup.open(url, params, popOption, popTitle); + $.blockUI({message: '' ,css: {width: '100%', height: '100%'} + //모달창 외부 클릭시 닫기 + ,onOverlayClick: () => { + $.unblockUI(); + popup?.self?.close(); + } + }); + popup = CmmPopup.open(url, params, popOption, popTitle); } } diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthHierarchyMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthHierarchyMgtPopup.jsp index 924d76dc..d0e3a1e1 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthHierarchyMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthHierarchyMgtPopup.jsp @@ -253,9 +253,14 @@ * event **************************************************************************/ $(() => { - $('#btnClose').on('click', () => { - window.opener.callbackSearch(); - window.close(); + $(window).on("unload", function (e) { + window.opener?.unblockUI(); + return null; + }); + + $("#btnClose").on('click', () => { + window.opener?.unblockUI(); + window.close() }); $('#btnRegist').on('click', () => fnBiz.save()); diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthRoleGrantMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthRoleGrantMgtPopup.jsp index 6e68fe57..3550edad 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthRoleGrantMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthRoleGrantMgtPopup.jsp @@ -42,7 +42,7 @@ @@ -99,6 +99,16 @@ * event **************************************************************************/ $(() => { + $(window).on("unload", function (e) { + window.opener?.unblockUI(); + return null; + }); + + $("#btnClose").on('click', () => { + window.opener?.unblockUI(); + window.close() + }); + $('#btnSearch').on('click', () => fnBiz.search()); $('#btnRegist').on('click', () => { diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthRoleMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthRoleMgtForm.jsp index b059ab14..eb067665 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthRoleMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthRoleMgtForm.jsp @@ -74,7 +74,14 @@ default: break; } - CmmPopup.open(url, params, popOption, popTitle); + $.blockUI({message: '' ,css: {width: '100%', height: '100%'} + //모달창 외부 클릭시 닫기 + ,onOverlayClick: () => { + $.unblockUI(); + popup?.self?.close(); + } + }); + popup = CmmPopup.open(url, params, popOption, popTitle); } ,onClickGrid: function(props){ diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthRoleMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthRoleMgtPopup.jsp index 3bf977bc..044c4257 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthRoleMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthRoleMgtPopup.jsp @@ -141,6 +141,16 @@ * event **************************************************************************/ $(() => { + $(window).on("unload", function (e) { + window.opener?.unblockUI(); + return null; + }); + + $("#btnClose").on('click', () => { + window.opener?.unblockUI(); + window.close() + }); + $('#btnRegist').on('click', () => { fnBiz.add(); }); diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/bbs/mngBoardCreateMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/bbs/mngBoardCreateMgtForm.jsp index 6196c0b2..d352f8c2 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/bbs/mngBoardCreateMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/bbs/mngBoardCreateMgtForm.jsp @@ -76,7 +76,14 @@ default: break; } - CmmPopup.open(url, params, popOption, popTitle); + $.blockUI({message: '' ,css: {width: '100%', height: '100%'} + //모달창 외부 클릭시 닫기 + ,onOverlayClick: () => { + $.unblockUI(); + popup?.self?.close(); + } + }); + popup = CmmPopup.open(url, params, popOption, popTitle); } ,onClickGrid: function(props){ const rowData = props.grid.getRow(props.rowKey); diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/bbs/mngBoardCreateMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/bbs/mngBoardCreateMgtPopup.jsp index 6c7e96f8..057fe439 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/bbs/mngBoardCreateMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/bbs/mngBoardCreateMgtPopup.jsp @@ -188,6 +188,16 @@ * event **************************************************************************/ $(() => { + $(window).on("unload", function (e) { + window.opener?.unblockUI(); + return null; + }); + + $("#btnClose").on('click', () => { + window.opener?.unblockUI(); + window.close() + }); + $('#btnRegist').on('click', () => { fnBiz.add(); }); diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/bbs/mngBoardCreateSchPopup.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/bbs/mngBoardCreateSchPopup.jsp index 802b3396..951335c6 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/bbs/mngBoardCreateSchPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/bbs/mngBoardCreateSchPopup.jsp @@ -44,7 +44,7 @@
@@ -65,6 +65,7 @@ } ,onClickGrid: (ev) => { const data = ev.grid.getRow(ev.rowKey); + window.opener?.unblockUI(); window.opener.callbackSearch(data); window.close(); } @@ -74,6 +75,15 @@ * event **************************************************************************/ $(() => { + $(window).on("unload", function (e) { + window.opener?.unblockUI(); + return null; + }); + + $("#btnClose").on('click', () => { + window.opener?.unblockUI(); + window.close() + }); $('#btnSearch').on('click', () => fnBiz.search()); }); diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/bbs/mngBoardTmplMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/bbs/mngBoardTmplMgtForm.jsp index 871cfffd..6120dd49 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/bbs/mngBoardTmplMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/bbs/mngBoardTmplMgtForm.jsp @@ -76,7 +76,14 @@ default: break; } - CmmPopup.open(url, params, popOption, popTitle); + $.blockUI({message: '' ,css: {width: '100%', height: '100%'} + //모달창 외부 클릭시 닫기 + ,onOverlayClick: () => { + $.unblockUI(); + popup?.self?.close(); + } + }); + popup = CmmPopup.open(url, params, popOption, popTitle); } ,onClickGrid: function(props){ const rowData = props.grid.getRow(props.rowKey); diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/bbs/mngBoardTmplMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/bbs/mngBoardTmplMgtPopup.jsp index 5c05c316..e54e109a 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/bbs/mngBoardTmplMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/bbs/mngBoardTmplMgtPopup.jsp @@ -75,7 +75,7 @@ 미리보기 - 닫기 + 닫기 @@ -150,6 +150,16 @@ * event **************************************************************************/ $(() => { + $(window).on("unload", function (e) { + window.opener?.unblockUI(); + return null; + }); + + $("#btnClose").on('click', () => { + window.opener?.unblockUI(); + window.close() + }); + $('#btnRegist').on('click', () => { fnBiz.add(); }); diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/bbs/mngBoardTmplSchPopup.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/bbs/mngBoardTmplSchPopup.jsp index 56591dd3..a41e1ec2 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/bbs/mngBoardTmplSchPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/bbs/mngBoardTmplSchPopup.jsp @@ -62,16 +62,7 @@
- - - - - - - - - diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/bbs/mngBoardUseMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/bbs/mngBoardUseMgtForm.jsp index fd26624d..b7f6a460 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/bbs/mngBoardUseMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/bbs/mngBoardUseMgtForm.jsp @@ -74,7 +74,14 @@ default: break; } - CmmPopup.open(url, params, popOption, popTitle); + $.blockUI({message: '' ,css: {width: '100%', height: '100%'} + //모달창 외부 클릭시 닫기 + ,onOverlayClick: () => { + $.unblockUI(); + popup?.self?.close(); + } + }); + popup = CmmPopup.open(url, params, popOption, popTitle); } ,onClickGrid: function(props){ const rowData = props.grid.getRow(props.rowKey); diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/bbs/mngBoardUseMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/bbs/mngBoardUseMgtPopup.jsp index bdd87e44..e2c5f81b 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/bbs/mngBoardUseMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/bbs/mngBoardUseMgtPopup.jsp @@ -134,6 +134,16 @@ * event **************************************************************************/ $(() => { + $(window).on("unload", function (e) { + window.opener?.unblockUI(); + return null; + }); + + $("#btnClose").on('click', () => { + window.opener?.unblockUI(); + window.close() + }); + $('#btnRegist').on('click', () => { fnBiz.add(); }); diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngCodeCfnMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngCodeCfnMgtForm.jsp index dcccf893..d322d215 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngCodeCfnMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngCodeCfnMgtForm.jsp @@ -76,7 +76,14 @@ default: break; } - CmmPopup.open(url, params, popOption, popTitle); + $.blockUI({message: '' ,css: {width: '100%', height: '100%'} + //모달창 외부 클릭시 닫기 + ,onOverlayClick: () => { + $.unblockUI(); + popup?.self?.close(); + } + }); + popup = CmmPopup.open(url, params, popOption, popTitle); } ,onClickGrid: function(props){ const rowData = props.grid.getRow(props.rowKey); diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngCodeCfnMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngCodeCfnMgtPopup.jsp index 97a734e0..742c95ab 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngCodeCfnMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngCodeCfnMgtPopup.jsp @@ -118,6 +118,16 @@ * event **************************************************************************/ $(() => { + $(window).on("unload", function (e) { + window.opener?.unblockUI(); + return null; + }); + + $("#btnClose").on('click', () => { + window.opener?.unblockUI(); + window.close() + }); + $('#btnRegist').on('click', () => { fnBiz.add(); }); diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngCodeDtlMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngCodeDtlMgtForm.jsp index f113eca2..0f6681bc 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngCodeDtlMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngCodeDtlMgtForm.jsp @@ -90,7 +90,14 @@ default: break; } - CmmPopup.open(url, params, popOption, popTitle); + $.blockUI({message: '' ,css: {width: '100%', height: '100%'} + //모달창 외부 클릭시 닫기 + ,onOverlayClick: () => { + $.unblockUI(); + popup?.self?.close(); + } + }); + popup = CmmPopup.open(url, params, popOption, popTitle); } ,onClickGrid: function(props){ const rowData = props.grid.getRow(props.rowKey); diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngCodeDtlMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngCodeDtlMgtPopup.jsp index 17a985e1..e32ea09d 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngCodeDtlMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngCodeDtlMgtPopup.jsp @@ -187,6 +187,16 @@ * event **************************************************************************/ $(() => { + $(window).on("unload", function (e) { + window.opener?.unblockUI(); + return null; + }); + + $("#btnClose").on('click', () => { + window.opener?.unblockUI(); + window.close() + }); + $('#btnRegist').on('click', () => { fnBiz.add(); }); diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngCodeGrpMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngCodeGrpMgtForm.jsp index 4417fb68..13e6249a 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngCodeGrpMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngCodeGrpMgtForm.jsp @@ -85,7 +85,14 @@ default: break; } - CmmPopup.open(url, params, popOption, popTitle); + $.blockUI({message: '' ,css: {width: '100%', height: '100%'} + //모달창 외부 클릭시 닫기 + ,onOverlayClick: () => { + $.unblockUI(); + popup?.self?.close(); + } + }); + popup = CmmPopup.open(url, params, popOption, popTitle); } ,onClickGrid: function(props){ const rowData = props.grid.getRow(props.rowKey); diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngCodeGrpMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngCodeGrpMgtPopup.jsp index d5b1e068..5a7b9f34 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngCodeGrpMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngCodeGrpMgtPopup.jsp @@ -134,6 +134,16 @@ * event **************************************************************************/ $(() => { + $(window).on("unload", function (e) { + window.opener?.unblockUI(); + return null; + }); + + $("#btnClose").on('click', () => { + window.opener?.unblockUI(); + window.close() + }); + $('#btnRegist').on('click', () => { fnBiz.add(); }); diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngZipCodeByExcelPopup.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngZipCodeByExcelPopup.jsp index f2797c2a..76736329 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngZipCodeByExcelPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngZipCodeByExcelPopup.jsp @@ -26,7 +26,7 @@ @@ -36,6 +36,16 @@ diff --git a/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/layout-tiles-biz-pop.jsp b/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/layout-tiles-biz-pop.jsp index 79b480ed..4f3bc9c6 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/layout-tiles-biz-pop.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/layout-tiles-biz-pop.jsp @@ -8,7 +8,7 @@ ${pageTitle} - <%@include file="/WEB-INF/jsp/framework/layouts/tiles/biz/cmmn/BizIncludeBase.jsp" %> +<%-- <%@include file="/WEB-INF/jsp/framework/layouts/tiles/biz/cmmn/BizIncludeBase.jsp" %>--%>