diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01020-info.jsp
index cc6b47be..8d757f06 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01020-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01020-info.jsp
@@ -262,6 +262,9 @@
-
+
+
-
-
-
-
-
-
@@ -267,13 +266,14 @@ $(document).ready(function(){
var $P = pageObject["${pageName}"];
$P.captureFileArr = [];
+ $P.localUploadArr = [];
/**************************************************************************
* DatasetControl, Dataset, FormFields
**************************************************************************/
$P.formFields = new FimsFormFields("#frmEdit--${pageName}");
- $P.uploadSet = uploadSupport("#uploadFileList--${pageName}");
+ $P.uploadSet = uploadSupport("#inputUploadSet--${pageName}");
$P.crdnControl = new DatasetControl({
urls : { load : "", create : wctx.url("/${taskSeCd}/crdn/crdn05/030/create.do") },
@@ -299,6 +299,11 @@ $(document).ready(function(){
if(formData.get("uploadFileList").size == 0){
formData.delete("uploadFileList");
}
+
+ if($P.localUploadArr.length > 0){
+ $P.localUploadArr.forEach(item => formData.append("uploadFileList",item));
+ }
+
if($P.captureFileArr.length > 0){
$P.captureFileArr.forEach(item => formData.append("uploadFileList",item));
}
@@ -313,8 +318,13 @@ $(document).ready(function(){
/**************************************************************************
* DatasetControl.on, Dataset.on
**************************************************************************/
- $P.uploadSet.onDatasetChange = () => { $P.fnDisplay(); };
- $P.uploadSet.onRemove = () => { $P.fnDisplay(); };
+ $P.uploadSet.onDatasetChange = () => {
+ var files = $P.uploadSet.getDataset();
+ files.forEach(item => $P.localUploadArr.push(item));
+
+ $P.fnDisplay();
+ };
+ $P.uploadSet.onRemove = () => { };
$P.crdnControl.onSave = (resp) => {
if (resp.saved) {
@@ -328,17 +338,21 @@ $(document).ready(function(){
$P.fnDisplay = () => {
var displayArea = document.querySelector("#display--${pageName}");
- var imgTags = $P.uploadSet.inStrings("
").join("\n");
- displayArea.innerHTML = imgTags;
- var display2Area = document.querySelector("#display2--${pageName}");
- var imgTags2 = "";
+ var imgTagsFromUploadSet = $P.localUploadArr.map(function(item){
+ return "
";
+ }).join("\n");
+
+
+ var imgTagsFromVideo = "";
if($P.captureFileArr.length > 0){
$P.captureFileArr.forEach(function(item, index){
- imgTags2 += "
";
+ imgTagsFromVideo += "
";
});
}
- display2Area.innerHTML = imgTags2;
+
+ displayArea.innerHTML = imgTagsFromUploadSet + imgTagsFromVideo;
+
};
$P.fnSave = () => {
@@ -387,7 +401,9 @@ $(document).ready(function(){
**************************************************************************/
$("#btnInst--${pageName}").on('click', () => $P.fnSave());
- $("#btnAddFile--${pageName}").on('click', () => { $("#uploadFileList--${pageName}").trigger("click"); });
+
+ $("#btnAddFile--${pageName}").on('click', () => { $("#inputUploadSet--${pageName}").trigger("click"); });
+
$("#btnOpenVideoCapture--${pageName}").on('click', () => {
window.open(wctx.url("/sprt/sprt03/010/main.do?openerPageName=${pageName}")
,"newVideoCapture"
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03020-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03020-main.jsp
index 8cfe6537..4eaef27e 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03020-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt03020-main.jsp
@@ -76,6 +76,7 @@