From 234091bca1e50ccc72a1ac2bad1839564c176c6d Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Thu, 25 Jan 2024 18:05:34 +0900
Subject: [PATCH] =?UTF-8?q?=EB=8B=A8=EC=86=8D=EC=9E=90=EB=A3=8C=EA=B2=80?=
 =?UTF-8?q?=EC=82=AC,=20=EB=8B=B5=EB=B3=80=EB=AF=B8=EB=A6=AC=EB=B3=B4?=
 =?UTF-8?q?=EA=B8=B0,=20=ED=86=B5=ED=95=A9=EC=A1=B0=ED=9A=8C=20=EC=8A=A4?=
 =?UTF-8?q?=ED=81=AC=EB=A6=BD=ED=8A=B8=20=EB=A1=9C=EB=94=A9=20=EB=B0=A9?=
 =?UTF-8?q?=EC=8B=9D=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cokr/xit/fims/crdn/web/Crdn02Controller.java |  1 -
 .../java/cokr/xit/fims/cvlc/web/Cvlc05Controller.java |  1 -
 .../java/cokr/xit/fims/sprt/web/Sprt01Controller.java |  1 -
 .../webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp   | 10 +++++-----
 .../webapp/WEB-INF/jsp/fims/cvlc/cvlc05010-main.jsp   | 11 ++---------
 .../webapp/WEB-INF/jsp/fims/sprt/sprt01010-main.jsp   |  7 +++----
 src/main/webapp/resources/js/fims/crdn/inspection.js  |  4 ++--
 src/main/webapp/resources/js/fims/cvlc/answerWords.js |  8 ++++----
 .../resources/js/fims/sprt/integrationSearch.js       |  2 +-
 9 files changed, 17 insertions(+), 28 deletions(-)

diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java
index b99950a0..2aac1960 100644
--- a/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java
+++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java
@@ -70,7 +70,6 @@ public class Crdn02Controller extends ApplicationController {
 		ModelAndView mav = new ModelAndView();
 		mav.setViewName("fims/crdn/crdn02010-main");
 		mav.addObject("pageName", "crdn02010");
-		mav.addObject("module", "type='module'");
 
 		Map<String, List<CommonCode>> commonCodes = getCodesOf("FIM002", "FIM003", "FIM010", "FIM026","FIM054");
 		mav.addObject("FIM002List", commonCodes.get("FIM002"));
diff --git a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc05Controller.java b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc05Controller.java
index 2b551be0..22a69729 100644
--- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc05Controller.java
+++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc05Controller.java
@@ -56,7 +56,6 @@ public class Cvlc05Controller extends ApplicationController {
 		ModelAndView mav = new ModelAndView();
 		mav.setViewName("fims/cvlc/cvlc05010-main");
 		mav.addObject("pageName", "cvlc05010");
-		mav.addObject("module", "type='module'");
 
 		mav.addObject("currentUserName", UserInfo.current().getName());
 		ManagedUser currentUser = userMapper.getUser(UserInfo.current().getAccount(), UserInfo.current().getInstitute());
diff --git a/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java b/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java
index 5a903b06..cd0b3fcc 100644
--- a/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java
+++ b/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java
@@ -154,7 +154,6 @@ public class Sprt01Controller extends ApplicationController {
 			mav.addObject("fastSearch", "null");
 		}
 
-		mav.addObject("module", "type='module'");
 		return mav;
 	}
 
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 71e9e053..ae97d101 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
@@ -371,9 +371,9 @@
   	<div class="content-backdrop fade"></div>
 </div>
 
-<script type="module" src="<c:url value='/resources/js/fims/crdn/inspection.js?${ver}'/>"></script>
-<script ${module}>
-import {InspectionControl, fnMakeImgTag} from "<c:url value='/resources/js/fims/crdn/inspection.js?${ver}'/>";
+<script>
+LoadScript("inspectionScript","/resources/js/fims/crdn/inspection.js");
+
 /**************************************************************************
  * Global Variable
  **************************************************************************/
@@ -708,11 +708,11 @@ $(document).ready(function(){
 						$("#nextDataFiles--${pageName}").html("");
 
 						currentDataFileList.forEach(function(item, index, array){
-							var output = fnMakeImgTag(item.URL, item.FILE_NM,"cur"+item.FILE_ID+'${pageName}',item.MOSAIC);
+							var output = fnMakeImgTagForInspection(item.URL, item.FILE_NM,"cur"+item.FILE_ID+'${pageName}',item.MOSAIC);
 							$("#curDataFiles--${pageName}").append(output);
 						});
 						nextDataFileList.forEach(function(item, index, array){
-							var output = fnMakeImgTag(item.URL, item.FILE_NM,"next"+item.FILE_ID+'${pageName}',item.MOSAIC);
+							var output = fnMakeImgTagForInspection(item.URL, item.FILE_NM,"next"+item.FILE_ID+'${pageName}',item.MOSAIC);
 							$("#nextDataFiles--${pageName}").append(output);
 						});
 
diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc05010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc05010-main.jsp
index 6ff49691..61b577a9 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc05010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc05010-main.jsp
@@ -307,15 +307,8 @@
 	</form>
 </template>
 
-<script type="module" src="<c:url value='/resources/js/fims/cvlc/answerWords.js?${ver}'/>"></script>
-<script ${module}>
-import {
-	AnswerBodyControl,
-	MACRO_STRING,
-	fnMacroStringInsert,
-	fnMacroWordsReplace
-} from "<c:url value='/resources/js/fims/cvlc/answerWords.js?${ver}'/>";
-
+<script>
+LoadScript("answerWordsScript","/resources/js/fims/cvlc/answerWords.js");
 /**************************************************************************
  * Global Variable
  **************************************************************************/
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01010-main.jsp
index 0e8a4379..08302c49 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01010-main.jsp
@@ -27,10 +27,9 @@
 
 <span id="tempArea--${pageName}" hidden></span>
 
-<script type="module"
-	src="<c:url value='/resources/js/fims/sprt/integrationSearch.js?${ver}'/>"></script>
-<script ${module}>
-import { IntegrationSearchControl } from "<c:url value='/resources/js/fims/sprt/integrationSearch.js?${ver}'/>";
+<script>
+
+LoadScript("integrationSearchScript","/resources/js/fims/sprt/integrationSearch.js");
 /**************************************************************************
  * Global Variable
  **************************************************************************/
diff --git a/src/main/webapp/resources/js/fims/crdn/inspection.js b/src/main/webapp/resources/js/fims/crdn/inspection.js
index b122149d..b9243db8 100644
--- a/src/main/webapp/resources/js/fims/crdn/inspection.js
+++ b/src/main/webapp/resources/js/fims/crdn/inspection.js
@@ -1,4 +1,4 @@
-export class InspectionControl {
+class InspectionControl {
 	constructor(mainConf, subConf) {
 		this.main = new DatasetControl(mainConf);
 		this.sub = new DatasetControl(subConf);
@@ -6,7 +6,7 @@ export class InspectionControl {
 	
 }
 
-export function fnMakeImgTag(url, title, crdnPhotoId, mosaic) {
+function fnMakeImgTagForInspection(url, title, crdnPhotoId, mosaic) {
 	
 	return `<div style="display:flex;min-width:300px;">
 	<div style="position:relative">
diff --git a/src/main/webapp/resources/js/fims/cvlc/answerWords.js b/src/main/webapp/resources/js/fims/cvlc/answerWords.js
index 9f323f08..dd5aea2a 100644
--- a/src/main/webapp/resources/js/fims/cvlc/answerWords.js
+++ b/src/main/webapp/resources/js/fims/cvlc/answerWords.js
@@ -1,4 +1,4 @@
-export class AnswerBodyControl {
+class AnswerBodyControl {
 	constructor(levyCaseConf, warningCaseConf, nonlevyCaseConf) {
 		this.levy = new DatasetControl(levyCaseConf);
 		this.warning = new DatasetControl(warningCaseConf);
@@ -6,13 +6,13 @@ export class AnswerBodyControl {
 	}
 }
 
-export const MACRO_STRING = {
+const MACRO_STRING = {
 	MACRO_SEQ : "[@일련번호]",
 	MACRO_TELNO : "[@전화번호]",
 	MACRO_PIC_NM : "[@담당자성명]"
 };
 
-export function fnMacroStringInsert(objId, addText) {
+function fnMacroStringInsert(objId, addText) {
 	var insertObj = document.getElementById(objId);
     var textVal = insertObj.value;
     var setPosition = insertObj.selectionStart;
@@ -25,7 +25,7 @@ export function fnMacroStringInsert(objId, addText) {
    	insertObj.focus();
 }
 
-export function fnMacroWordsReplace(header, footer, body, telno, picNm) {
+function fnMacroWordsReplace(header, footer, body, telno, picNm) {
 	var result = header + "\n\n" + body + "\n\n" + footer;
 	result = result.replaceAll("＠", "@");
 	
diff --git a/src/main/webapp/resources/js/fims/sprt/integrationSearch.js b/src/main/webapp/resources/js/fims/sprt/integrationSearch.js
index a2f611e5..94197a6d 100644
--- a/src/main/webapp/resources/js/fims/sprt/integrationSearch.js
+++ b/src/main/webapp/resources/js/fims/sprt/integrationSearch.js
@@ -1,4 +1,4 @@
-export class IntegrationSearchControl extends DatasetControl {
+class IntegrationSearchControl extends DatasetControl {
 	constructor(conf) {
 		super(conf);