From 30b73180bbf00e4bebf041268f53acbde95031c0 Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Thu, 22 Jun 2023 10:50:20 +0900
Subject: [PATCH] =?UTF-8?q?tui=EA=B7=B8=EB=A6=AC=EB=93=9C=20=EA=B4=80?=
 =?UTF-8?q?=EB=A0=A8=20=EC=8A=A4=ED=81=AC=EB=A6=BD=ED=8A=B8=20=EC=A0=9C?=
 =?UTF-8?q?=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/jsp/include/tail.jsp              | 2 +-
 src/main/webapp/WEB-INF/jsp/include/top.jsp               | 8 +++-----
 src/main/webapp/WEB-INF/jsp/include/userMenus.jsp         | 6 +++---
 src/main/webapp/WEB-INF/jsp/index.jsp                     | 6 +++++-
 src/main/webapp/WEB-INF/jsp/login.jsp                     | 5 ++---
 .../css/fims/framework/common/xit-core-extend.css         | 4 ++--
 src/main/webapp/resources/js/base/base-fims.js            | 2 +-
 7 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/include/tail.jsp b/src/main/webapp/WEB-INF/jsp/include/tail.jsp
index 1521b416..2486592c 100644
--- a/src/main/webapp/WEB-INF/jsp/include/tail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/include/tail.jsp
@@ -98,4 +98,4 @@ async function selectURL(multiple) {
 }
 </c:if>
 
-${functions}</c:set>
+</c:set>
diff --git a/src/main/webapp/WEB-INF/jsp/include/top.jsp b/src/main/webapp/WEB-INF/jsp/include/top.jsp
index 5dfb194b..ceae5a64 100644
--- a/src/main/webapp/WEB-INF/jsp/include/top.jsp
+++ b/src/main/webapp/WEB-INF/jsp/include/top.jsp
@@ -146,9 +146,7 @@
 
 </nav>
 
+<c:set var="topScript" scope="request">
+console.log('TODO: 보안모드 관련 스크립트 작성 필요');
+</c:set>
 
-<!-- / Navbar -->
-<c:set var="functions" scope="request">${functions}
-function setPageTitle(pageTitle) {
-	$("#pageTitle").html(pageTitle);
-}</c:set>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/jsp/include/userMenus.jsp b/src/main/webapp/WEB-INF/jsp/include/userMenus.jsp
index 1fb8cc23..030effe9 100644
--- a/src/main/webapp/WEB-INF/jsp/include/userMenus.jsp
+++ b/src/main/webapp/WEB-INF/jsp/include/userMenus.jsp
@@ -19,13 +19,13 @@
   </ul>
 </aside>
 <!-- / Menu -->
-<c:set var="userMenus" scope="request">let userMenus = ${userMenus};
+<c:set var="userMenus" scope="request">
+
+let userMenus = ${userMenus};
 
 function setUserMenus(menus) {
 	let menuSupport = new FimsMenuSupport("#layout-menu").setMenuInfo(menus).setActive(wctx.current());
 	let currentMenu = menuSupport.getMenu(wctx.current());
-	if (currentMenu)
-		setPageTitle(currentMenu.name);
 }
 
 setUserMenus(userMenus);
diff --git a/src/main/webapp/WEB-INF/jsp/index.jsp b/src/main/webapp/WEB-INF/jsp/index.jsp
index fa474217..e765b264 100644
--- a/src/main/webapp/WEB-INF/jsp/index.jsp
+++ b/src/main/webapp/WEB-INF/jsp/index.jsp
@@ -34,8 +34,12 @@
     </div>
 
     <jsp:include page="/WEB-INF/jsp/include/tail.jsp" />
-    <script >
+    <script>
+
         ${functions}
+
+        ${topScript}
+        
         ${userMenus}
 
         $(function(){
diff --git a/src/main/webapp/WEB-INF/jsp/login.jsp b/src/main/webapp/WEB-INF/jsp/login.jsp
index cad50fe4..155201f9 100644
--- a/src/main/webapp/WEB-INF/jsp/login.jsp
+++ b/src/main/webapp/WEB-INF/jsp/login.jsp
@@ -38,9 +38,6 @@
 	<link rel="stylesheet" href="<c:url value="/resources/css/fims/framework/common/common.css"/>"/>
 	<link rel="stylesheet" href="<c:url value="/resources/3rd-party/jquery-ui/1.13.2/themes/redmond/jquery-ui.css"/>" />
 	<link rel="stylesheet" href="<c:url value="/resources/lib/fims/framework/datepicker/datepicker.css"/>" />
-	<link rel="stylesheet" href="<c:url value="/resources/3rd-party/tui/grid/4.21.5/tui-grid/tui-grid.css"/>" />
-	<link rel="stylesheet" href="<c:url value="/resources/css/fims/framework/common/xit-tui-grid.css"/>" />
-	<link rel="stylesheet" href="<c:url value="/resources/3rd-party/tui/grid/4.21.5/tui-pagination/tui-pagination.css"/>" />
 	
 
 	<link href="<c:url value='/'/>resources/css/fims/framework/oldcommon.css" rel="stylesheet" type="text/css" >
@@ -84,7 +81,9 @@
 <jsp:include page="/WEB-INF/jsp/include/tail.jsp" />
 
 <script type="text/javascript">
+
 ${functions}
+
 function login() {
 	if (!$("#formAuthentication input").validInputs()) return;
 	
diff --git a/src/main/webapp/resources/css/fims/framework/common/xit-core-extend.css b/src/main/webapp/resources/css/fims/framework/common/xit-core-extend.css
index 81e634db..faacc46b 100644
--- a/src/main/webapp/resources/css/fims/framework/common/xit-core-extend.css
+++ b/src/main/webapp/resources/css/fims/framework/common/xit-core-extend.css
@@ -267,12 +267,12 @@
     box-shadow: 0 0 18px 5px rgba(0,0,0,0.2);
 }
 
-.container-window1 table:not(.tui-grid-container) {
+.container-window1 table {
     font-family: 'Dotum';
     text-align: left;
 }
 
-.container-window3 table:not(.tui-grid-container) {
+.container-window3 table {
     font-family: 'Dotum';
     text-align: left;
 }
diff --git a/src/main/webapp/resources/js/base/base-fims.js b/src/main/webapp/resources/js/base/base-fims.js
index 60b5d346..e83e9121 100644
--- a/src/main/webapp/resources/js/base/base-fims.js
+++ b/src/main/webapp/resources/js/base/base-fims.js
@@ -65,7 +65,7 @@ class FimsFormFields extends FormFields {
                     //보안모드 마스킹 항목
                     if(input.tagName === 'INPUT' && input.id && input.classList.contains("privacy")){
                         let maskVal = value.replace(/[0-9a-zA-Z]/g, "*");
-                        document.getElementById(input.id+"$mask").value = maskVal;
+                        document.getElementById("mask-"+input.id).value = maskVal;
                     }
                 }