Merge branch 'main' of http://211.119.124.110:3000/xit-app/adds-fo.git into main

src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-info.jsp

@@ -480,9 +480,17 @@
 			// URL에 c: d: 제거
 			$P.fileInfos.forEach(f => {
 				// FIXME: URL에 c: d: 제거 ???
-				f.URL = f.URL.replace(/c:/g, "");
-				f.URL = f.URL.replace(/d:/g, "");
-				promiseArr.push(fnCreateFileFromFileInfo(f));
+				// if(f.URL){
+				// 	f.URL = f.URL.toLowerCase().replace(/c:/g, "");
+				// 	f.URL = f.URL.toLowerCase().replace(/d:/g, "");
+				// }
+				try{
+					fnCreateFileFromFileInfo(f)
+					promiseArr.push(fnCreateFileFromFileInfo(f));
+				}catch(e){
+					console.log(e);
+				}
+				//promiseArr.push(fnCreateFileFromFileInfo(f));
 			});
 			
 			Promise.all(promiseArr).then((values) => {

src/main/webapp/resources/js/adds/cmmn/adds-cmmnUtil.js

@@ -1,38 +1,16 @@
 /**************************************************************************
- * 서버의 파일 정보로 javascript File 객체 생성
- **************************************************************************/
-async function fnCreateFileFromFileInfo(fileInfo) {
+* 서버의 파일 정보로 javascript File 객체 생성
+**************************************************************************/
+async function fnCreateFileFromFileInfo(fileInfo){
 
-    try {
-        let response = await fetch(fileInfo.URL);
+	let response = await fetch(fileInfo.URL);
+	let data = await response.blob();
+	let metadata = {
+		type: fileInfo.MIME_TYPE
+	};
+	let file = new File([data], fileInfo.FILE_NM, metadata);
+	file.id = fileInfo.FILE_ID;
+	file.url = fileInfo.URL;
 
-        if (!response.ok) {
-            //throw new Error(`HTTP error! status: ${response.status}`);
-            let file = new File([], fileInfo.FILE_NM, metadata);
-            file.id = fileInfo.FILE_ID;
-            file.url = fileInfo.URL;
-            return new Promise(resolve => {
-                resolve(file);
-            });
-        }
-
-        let data = await response.blob();
-
-        let metadata = {
-            type: fileInfo.MIME_TYPE
-        };
-        let file = new File([data], fileInfo.FILE_NM, metadata);
-        file.id = fileInfo.FILE_ID;
-        file.url = fileInfo.URL;
-
-        return new Promise(resolve => {
-            resolve(file);
-        });
-    } catch (error) {
-        console.error('Fetch error:', error);
-
-        // Handle the error appropriately, e.g., return a default value or rethrow
-        // Here, we'll return null to indicate failure
-        return null;
-    }
+	return new Promise(resolve => { resolve(file); });
 }