From 775f5767be5801a7fd7e36dfc0c333c148dcb21c Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Mon, 17 Apr 2023 16:21:54 +0900
Subject: [PATCH] =?UTF-8?q?feat=20:=20=EB=AA=A8=EB=8B=AC=20=ED=8C=9D?=
 =?UTF-8?q?=EC=97=85=20=EC=98=A4=ED=94=88=20=ED=95=A8=EC=88=98=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/cmm/cmmFimsCrackdownEditPopup.jsp     | 14 ++++-
 .../jsp/fims/biz/rt/rtInitialDataForm.jsp     |  6 +-
 .../framework/css/common/xit-core-extend.css  | 33 ++++++++++
 .../resources/framework/js/cmm/cmmPopup.js    | 60 +++++++++++++++++++
 4 files changed, 109 insertions(+), 4 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownEditPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownEditPopup.jsp
index f22ccc3c..c84c3876 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownEditPopup.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownEditPopup.jsp
@@ -646,8 +646,15 @@ Date       Author       Description
     // });
 
     $("#btnClose").on('click', () => {
+
       window.opener?.callbackSearch();
-      window.close()
+
+      if ( self !== top ) {
+        parent.$("#cmmModal").find(".btn-close").trigger("click");
+      } else {
+        window.close();
+      }
+
     });
 
     $('#addrSearch').on('click', () => CmmPopup.zipPopup());
@@ -724,7 +731,8 @@ Date       Author       Description
       regltId: '${param.regltId}'
       ,regltSeCode: '${param.regltSeCode}'
       ,regltProcessSttusCode: '${param.regltProcessSttusCode}'
-    })
-   });
+    });
+
+  });
 
 </script>
diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtInitialDataForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtInitialDataForm.jsp
index cdce59f8..24bbef43 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtInitialDataForm.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtInitialDataForm.jsp
@@ -263,7 +263,7 @@ Date       Author       Description
                     default:
                         break;
                 }
-                popup = CmmPopup.open(url, params, popOption, popTitle);
+                popup = CmmPopup.openModal(url, params, popOption, popTitle);
             }
             ,onClickGrid: function(props){
                 const selColumn = props.columnInfo.name;
@@ -274,7 +274,11 @@ Date       Author       Description
                             return {regltSeCode: d.regltSeCode, regltId: d.regltId, regltProcessSttusCode: d.regltProcessSttusCode}
                         })
                         ARR_NAV[CUR_TAB_IDX] = new PageNavigation(ARR_GRID[CUR_TAB_IDX], rowDatas, props.rowKey);
+
                         fnBiz.pagePopup(popupDiv, ARR_NAV[CUR_TAB_IDX].gridInfo.curRowData);
+
+                        $(".tooltip").remove();
+
                         break;
 
                     default:
diff --git a/src/main/webapp/resources/framework/css/common/xit-core-extend.css b/src/main/webapp/resources/framework/css/common/xit-core-extend.css
index f96ed74e..62506190 100644
--- a/src/main/webapp/resources/framework/css/common/xit-core-extend.css
+++ b/src/main/webapp/resources/framework/css/common/xit-core-extend.css
@@ -410,4 +410,37 @@
 
 .bg-title-cleanparking {
     background-color: #EEC575 !important;
+}
+
+/* 다이얼로그 창 넓이 */
+.w-dialog-px-500 {
+    --bs-modal-width : 500px;
+}
+
+.w-dialog-px-600 {
+    --bs-modal-width : 600px;
+}
+
+.w-dialog-px-700 {
+    --bs-modal-width : 700px;
+}
+
+.w-dialog-px-800 {
+    --bs-modal-width : 800px;
+}
+
+.w-dialog-px-900 {
+    --bs-modal-width : 900px;
+}
+
+.w-dialog-px-1000 {
+    --bs-modal-width : 1000px;
+}
+
+.w-dialog-px-1100 {
+    --bs-modal-width : 1100px;
+}
+
+.w-dialog-px-1200 {
+    --bs-modal-width : 1200px;
 }
\ No newline at end of file
diff --git a/src/main/webapp/resources/framework/js/cmm/cmmPopup.js b/src/main/webapp/resources/framework/js/cmm/cmmPopup.js
index 6ff83322..9153007f 100644
--- a/src/main/webapp/resources/framework/js/cmm/cmmPopup.js
+++ b/src/main/webapp/resources/framework/js/cmm/cmmPopup.js
@@ -292,6 +292,66 @@ const CmmPopup = {
         return popup;
     }
 
+    , openModal: function (url, params, options, title = 'nonamePopup', method = 'post') {
+        if($("#popupShowBtn").length < 1){
+            let modalTemplate = `<button type="button"
+                    id="popupShowBtn"
+                    data-bs-toggle="modal"
+                    data-bs-target="#cmmModal"
+                    hidden>
+            </button>
+            
+            <div class="modal fade" id="cmmModal" tabindex="-1">
+                <div id="modalDialog" class="modal-dialog">
+                    <div class="modal-content">
+                        <div class="modal-header">
+                            <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close">
+                            </button>
+                        </div>
+                        <div id="modalBody" class="modal-body">
+            
+                        </div>
+                    </div>
+                </div>
+            </div>`;
+
+            $("body").append(modalTemplate);
+        }
+
+        $("#modalDialog").attr("class","modal-dialog");
+
+        if(options.width) {
+            $("#modalDialog").addClass("w-dialog-px-"+options.width);
+        }
+
+        if($("#modalIframe").length > 0){
+            $("#modalIframe").remove();
+        }
+        let modalIframe = $("<iframe></iframe>");
+        modalIframe.attr("id"        , "modalIframe")
+            .attr("name"         , "modalIframe")
+            .attr("src"          , "")
+            .attr("title"        , title)
+            .attr("width"        , "100%")
+            .attr("frameborder"  , "0")
+            .attr("scrolling"    , "no")
+            .css("border"        , "0")
+            .css("overflow"      , "auto")
+            .css("overflow-x"    , "no")
+        ;
+        $("#modalBody").append(modalIframe);
+
+        popup = CmmPopup.open(url, params, options, "modalIframe", method);
+
+        $(popup.frameElement).on("load", function(){
+            let popupHeight = $(popup.frameElement.contentDocument.getElementById("wrap")).height();
+            $(popup.frameElement).attr("height", popupHeight);
+        });
+
+        $("#popupShowBtn").trigger("click");
+
+        return popup;
+    }
     /**
      * <pre>
      * 주소 검색 팝업 호출