From 895a662982a3ef745562a77f189835be175e4387 Mon Sep 17 00:00:00 2001 From: leebj Date: Thu, 8 Aug 2024 12:50:24 +0900 Subject: [PATCH] =?UTF-8?q?=EB=8B=A4=EC=9D=B4=EC=96=BC=EB=A1=9C=EA=B7=B8?= =?UTF-8?q?=20=EA=B4=80=EB=A0=A8=20=EC=86=8C=EC=8A=A4=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp | 10 ++++++++-- .../webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp | 12 ++++++++++-- .../webapp/WEB-INF/jsp/fims/user/user02010-main.jsp | 2 +- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp index 8dcd72ec..796f04dc 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp @@ -1012,13 +1012,19 @@ $(document).ready(function(){ url: wctx.url("/user/user02/010/main.do") + "?openerPageName=${pageName}" , data: params || {} , success: resp => { + + let dialogName = "userDialog"; + let dialogId = dialogName+"-"+uuid(); + dialog.open({ - id: "userDialog--${pageName}" + id: dialogId , title: "사용자 검색" , content: resp , size: "lg" , init: () => { - setDialogZindex(); + setDialogZindex(); + $("#"+dialogId).attr("name", dialogName); + $("#"+dialogId).attr("data-ref-doctx","${pageName}"); } }); } diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp index be41d79a..79a5178d 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp @@ -564,12 +564,20 @@ $(document).ready(function(){ url: wctx.url("/user/user02/010/main.do") + "?openerPageName=${pageName}" , data: params || {} , success: resp => { + + let dialogName = "userDialog"; + let dialogId = dialogName+"-"+uuid(); + dialog.open({ - id: "userDialog--${pageName}" + id: dialogId , title: "사용자 검색" , content: resp , size: "lg" - , init: () => { setDialogZindex(); } + , init: () => { + setDialogZindex(); + $("#"+dialogId).attr("name", dialogName); + $("#"+dialogId).attr("data-ref-doctx","${pageName}"); + } }); } }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/user/user02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/user/user02010-main.jsp index 4ed5ed0c..3c9bdf12 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/user/user02010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/user/user02010-main.jsp @@ -255,7 +255,7 @@ ${callbackFuncName}(userId, $P.control.dataset.getValue("USER_NM")); } - dialog.close($P.control.prefixed("Dialog--${openerPageName}")); + dialog.close($("#frmSearch--${pageName}").parents(".modal")[0].id); } /**************************************************************************