feat: blockUI popup 적용

src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownFileSelPopup.jsp

@@ -168,6 +168,7 @@
 		}
 		,close: () => {
 			window.opener.unblockUI();
+			window.opener.popup = null;
 			window.close();
 		}
 	}
@@ -279,7 +280,7 @@
 
 		$(window).on("beforeunload", function () {
 			window.opener.unblockUI();
-			//$.unblockUI();
+			window.opener.popup = null;
 			return "";
 		});
 	});

src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownMgtForm.jsp

@@ -51,6 +51,7 @@
 	let GRID = null;
 	var callbackSearch = () => fnBiz.search();
 	var unblockUI = () => $.unblockUI();
+	var popup = null;
 
 	/* *******************************
 	 * Biz function
@@ -79,9 +80,12 @@
 			}
 			$.blockUI({message: '' ,css: {width: '100%', height: '100%'}
 				//모달창 외부 클릭시 닫기
-				//,onOverlayClick: $.unblockUI
+				,onOverlayClick: () => {
+				$.unblockUI();
+				popup.self.close();
+				}
 			});
-			CmmPopup.open(url, params, popOption, popTitle);
+			popup = CmmPopup.open(url, params, popOption, popTitle);
 		}
 		,onClickGrid: function(props){
 			const {page, perPage, totalCount} = GRID.store.data.pageOptions;

src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownPopup.jsp

@@ -268,6 +268,7 @@
 	    ,close: () => {
 			window.opener.gridInfo = null;
 			window.opener.unblockUI();
+			window.opener.popup = null;
 			window.close();
 		}
 	};
@@ -296,12 +297,6 @@
 //		orgData = $('form').serialize();
 		fnBiz.downloadImg();
 
-		$(window).on("beforeunload", function () {
-			window.opener.unblockUI();
-			//$.unblockUI();
-			return "";
-		});
-
 		if(window.opener.gridInfo.curRowPos === 1){
 			$('#prev').attr('disabled', true);
 		}else{

src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCtznSttemntMgtForm.jsp

@@ -101,7 +101,10 @@
 			}
 			$.blockUI({message: '' ,css: {width: '100%', height: '100%'}
 				//모달창 외부 클릭시 닫기
-				//,onOverlayClick: $.unblockUI
+				,onOverlayClick: () => {
+					$.unblockUI();
+					popup.self.close();
+				}
 			});
 			popup = CmmPopup.open(url, params, popOption, popTitle);
 			//var w = window.open("/imageEditor.do", "", "width=800,height=650,top=0px,left=200px,status=,resizable=false,scrollbars=no");

src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCtznSttemntMgtPopup.jsp

@@ -366,6 +366,7 @@
 		,close: () => {
 			window.opener.gridInfo = null;
 			window.opener.unblockUI();
+			window.opener.popup = null;
 			window.close();
 		}
 	};
@@ -392,6 +393,7 @@
 	$(document).ready(function () {
 		$(window).on("beforeunload", function () {
 			window.opener.unblockUI();
+			window.opener.popup = null;
 			return "";
 		});
 

src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecNatlNewspaperMgtForm.jsp

@@ -47,6 +47,7 @@
 	/**************************************************************************
 	 * Global Variable
 	 **************************************************************************/
+	var popup = null;
 	let GRID = null;
 	var callbackSearch = () => fnBiz.search();
 	var unblockUI = () => $.unblockUI();
@@ -79,9 +80,12 @@
 			}
 			$.blockUI({message: '' ,css: {width: '100%', height: '100%'}
 				//모달창 외부 클릭시 닫기
-				//,onOverlayClick: $.unblockUI
+				,onOverlayClick: () => {
+					$.unblockUI();
+					popup.self.close();
+				}
 			});
-			CmmPopup.open(url, params, popOption, popTitle);
+			popup = CmmPopup.open(url, params, popOption, popTitle);
 		}
 		,onClickGrid: function(props){
 			const rowData = props.grid.getRow(props.rowKey);

src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecNatlNewspaperPopup.jsp

@@ -268,6 +268,7 @@
 
 		$('#btnClose').on('click', () => {
 			window.opener.unblockUI();
+			window.opener.popup = null;
 			window.close();
 		});
 	});