Merge branch 'master' of http://106.246.249.162:13000/orderqueen/oqpo-view

src/main/webapp/bootstrap-fileUpload/dist/bootstrap-FileUpload.js

@@ -271,8 +271,8 @@
 				var html = '';
 				html += '<table class="table fileupload-download">';
 				html += '<tbody>';
-				$.each(result, function (key, value) {
-					if(instance[el].options.showThumb == true) {
+				$.each(result, function (key, value) { 
+					if(instance[el].options.showThumb == true && value.fileOrgNm.match(/\.(jpg|jpeg|png|gif|bmp|svg|ico)$/i) ) {
 						html += '<tr class="fileupload-downloadrow thumb row">';
 						html += '<td class="col-xs-1"><img src="'+value.filePath+'" alt="'+value.fileOrgNm+'" width="80px" height="80px" class="fileupload-previewimg"></td>';
 					} else {
@@ -385,7 +385,7 @@
 		availableFileTypes["files"] = ["doc", "docx", "dotx", "docm", "ods", "odt", "ott", "ods", "pdf", "ppt", "pptm", "pptx", "pub", "rtf", "csv", "log", "txt", "xls", "xlsm", "xlsx"];
 		availableFileTypes["images"] = ["bmp", "tif", "tiff", "gif", "jpeg", "jpg", "png", "svg", "ico", "raw"];
 		availableFileTypes["video"] = ["avi", "flv", "swf", "m4v", "mkv", "mov", "mp4", "ogv", "wmv"];
-
+ 
 		buildFileTypes(el);
 
 		if (instance[el].options.debug !== true && instance[el].options.debug !== false) {
@@ -717,7 +717,7 @@
 	 */
 	function genThumb (el, file, fileType, fileExt) {
 		var thumb;
-
+		console.log("genThumb fileType == "+fileType)
 		switch (fileType) {
 			case 'archives':
 				if (instance[el].options.useFontAwesome === true && instance[el].options.fontAwesomeVer !== false) {
@@ -801,7 +801,6 @@
 
 				break;
 		}
-
 		return thumb;
 	}
 

src/main/webapp/js/app/stinfo/ITP_STINFO05010.js

@@ -431,12 +431,49 @@ let viewObj = {
 		$('#ITP_FORM_STINFO05010_VIEW .fnRegDt').text(result.sysRegDttm);
 		$('#ITP_FORM_STINFO05010_VIEW .fnChgId').text(result.sysChgId);
 		$('#ITP_FORM_STINFO05010_VIEW .fnChgDt').text(result.sysChgDttm);
-
+		fileUploadInfo5010(result.imageFileNoList);
+		/*
 		itp_fn_attach_file.view('ITP_FORM_STINFO05010_VIEW_FILE', result.imageFileNoList
 			, 'form-control itp_input', 'border:none; top:12px; left:12px; height:100px; width:125px; position:absolute;');
+		*/
 	}
 };
 
+
+function fileUploadInfo5010(arr) {
+	//파일업로드(등록/수정화면)
+	var uid='#ITP_FORM_STINFO05010_VIEW_FILE'; 
+    $(uid).empty();
+	if(Array.isArray(arr) && arr.length ) {
+		var sid='ITP_FORM_STINFO05010_VIEW';
+		var fileNo=arr[0].fileNo;
+		$(uid).bootstrapFileUpload({
+			url: DOMAIN + '/api/file/upload',
+			inputName: 'uploadFile',
+			folderName: 'affl',
+			fileNumber:  fileNo,
+			fileInput: null,
+			fileTypes: ITP_UPLOAD_DEFAULTS.fileTypes,
+			viewCode: 'R',
+			formMethod: 'post',
+			multiFile: true,
+			multiUpload: false,
+			maxSize: 100,
+			maxFiles: 5,
+			showThumb: false,
+			thumbWidth: 80,
+			thumbHeight: 80,
+			debug: true, 
+			screen_id: sid,
+			showYn: true 
+		});
+		setTimeout(function() {
+			$('#'+sid+'_UPLOAD_FORM').hide();
+		},20);
+	}
+}
+
+
 /*수정화면 Object*/
 let modifyObj = {
 	init: function () {