From 47241564c7ab544c75d11cc717f1258f50808f76 Mon Sep 17 00:00:00 2001
From: dongshubao <294578571@qq.com>
Date: Mon, 13 Jan 2020 12:53:34 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=A8=A1=E6=9D=BFlist1=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E7=BF=BB=E9=A1=B5=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/js/list.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/js/list.js b/assets/js/list.js
index 0b5d188..d73b4b3 100644
--- a/assets/js/list.js
+++ b/assets/js/list.js
@@ -101,7 +101,7 @@ var $vue = new Vue({
 
       this.pageType = 'loading';
       $api.get(this.apiUrl + '/ss.form/' + this.siteId + '/' + this.formId, {
-        page: page
+        params: {page: page}
       }).then(function (res) {
         $this.fieldInfoList = res.data.fieldInfoList;
         $this.allAttributeNames = res.data.allAttributeNames;
@@ -124,4 +124,4 @@ var $vue = new Vue({
   created: function () {
     this.loadPage(1);
   }
-});
\ No newline at end of file
+});

From 140020cdfd8c7768aed1f45953c26ba1566956dd Mon Sep 17 00:00:00 2001
From: dongshubao <294578571@qq.com>
Date: Mon, 13 Jan 2020 17:37:13 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E4=B8=BA=E4=B8=8A=E4=BC=A0=E5=A4=9A=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/js/list.js            |  6 +++---
 assets/js/submit.js          |  7 ++++++-
 pages/logAdd.html            |  5 ++---
 pages/logAdd.js              |  7 ++++++-
 pages/logs.html              | 10 ++++++----
 pages/logs.js                |  4 ++--
 templates/list1/index.html   | 14 ++++++++------
 templates/submit1/index.html | 17 +++++++++++------
 8 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/assets/js/list.js b/assets/js/list.js
index d73b4b3..94807d0 100644
--- a/assets/js/list.js
+++ b/assets/js/list.js
@@ -64,8 +64,8 @@ var $vue = new Vue({
       return item[_.camelCase(attributeName)];
     },
 
-    largeImage: function(item, attributeName) {
-      var imageUrl = this.getAttributeValue(item, attributeName);
+    largeImage: function(imageUrl) {
+      //var imageUrl = this.getAttributeValue(item, attributeName);
       Swal.fire({
         imageUrl: imageUrl,
         showConfirmButton: false,
@@ -124,4 +124,4 @@ var $vue = new Vue({
   created: function () {
     this.loadPage(1);
   }
-});
+});
\ No newline at end of file
diff --git a/assets/js/submit.js b/assets/js/submit.js
index 2c5c972..4e5909f 100644
--- a/assets/js/submit.js
+++ b/assets/js/submit.js
@@ -70,7 +70,12 @@ if (window.DatePicker) {
         if (!error) {
           var res = JSON.parse(file.serverId);
           var fieldInfo = _.find(this.fieldInfoList, function(o) { return o.id === res.fieldId; });
-          fieldInfo.value = res.value;
+          if (fieldInfo.value){
+			  fieldInfo.value += ',' + res.value;
+		  }
+		  else{
+			  fieldInfo.value = res.value;
+		  }
         }
       },
     
diff --git a/pages/logAdd.html b/pages/logAdd.html
index 68e8608..5cf7a44 100644
--- a/pages/logAdd.html
+++ b/pages/logAdd.html
@@ -246,7 +246,7 @@ <h4 v-else class="m-t-0 m-b-30 header-title">新增</h4>
 
                   <template v-else-if="fieldInfo.fieldType === 'Image'">
                     <file-pond
-                      :allow-multiple="false"
+                      :allow-multiple="true"
                       :server="getUploadUrl(fieldInfo)"
                       :files="files"
                       accepted-file-types="image/jpeg, image/png, image/webp"
@@ -254,8 +254,7 @@ <h4 v-else class="m-t-0 m-b-30 header-title">新增</h4>
                       label-file-processing="上传中..."
                       label-file-processing-complete="上传成功"
                       v-on:processfile="imageUploaded"
-                      v-on:removefile="imageRemoved(fieldInfo)"
-                    ></file-pond>
+                      v-on:removefile="imageRemoved(fieldInfo)"/>
 
                     <input
                       v-model="fieldInfo.value"
diff --git a/pages/logAdd.js b/pages/logAdd.js
index 4667d65..a07b5a4 100644
--- a/pages/logAdd.js
+++ b/pages/logAdd.js
@@ -26,7 +26,12 @@ var methods = {
     if (!error) {
       var res = JSON.parse(file.serverId);
       var fieldInfo = _.find(this.fieldInfoList, function(o) { return o.id === res.fieldId; });
-      fieldInfo.value = res.value;
+      if (fieldInfo.value){
+		  fieldInfo.value += ',' + res.value;
+	  }
+	  else{
+		  fieldInfo.value = res.value;
+	  }
     }
   },
 
diff --git a/pages/logs.html b/pages/logs.html
index 09d7e3f..3769f66 100644
--- a/pages/logs.html
+++ b/pages/logs.html
@@ -73,10 +73,12 @@
             <tbody>
               <tr v-for="item in items" :key="item.id">
                 <td v-for="attributeName in allAttributeNames" :key="attributeName" v-if="listAttributeNames.indexOf(attributeName) !== -1">
-                  <img v-if="getAttributeType(attributeName) === 'Image'" :src="getAttributeValue(item, attributeName)" style="max-height: 100px; max-width: 100px; cursor: pointer;" v-on:click="largeImage(item, attributeName)">
-                  <div v-else>
-                      {{ getAttributeValue(item, attributeName) }}
-                  </div>
+					<div v-if="getAttributeType(attributeName) === 'Image'">
+						<img v-for="imageUrl in getAttributeValue(item, attributeName).split(',')" :src="imageUrl" style="max-height: 100px; max-width: 100px; cursor: pointer;" v-on:click="largeImage(imageUrl)">
+					</div>
+					<div v-else>
+						{{ getAttributeValue(item, attributeName) }}
+					</div>
                 </td>
                 <td v-if="isReply">
                   <strong v-if="item.isReplied" class="text-primary">已回复</strong>
diff --git a/pages/logs.js b/pages/logs.js
index fc922f8..3b5d8d3 100644
--- a/pages/logs.js
+++ b/pages/logs.js
@@ -150,8 +150,8 @@ var methods = {
     return item[_.lowerFirst(attributeName)];
   },
 
-  largeImage: function(item, attributeName) {
-    var imageUrl = this.getAttributeValue(item, attributeName);
+  largeImage: function(imageUrl) {
+    //var imageUrl = this.getAttributeValue(item, attributeName);
     swal2.fire({
       imageUrl: imageUrl,
       showConfirmButton: false,
diff --git a/templates/list1/index.html b/templates/list1/index.html
index 8bccfb3..ef35dac 100644
--- a/templates/list1/index.html
+++ b/templates/list1/index.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <html>
 
 <head>
@@ -23,20 +23,22 @@
     <template v-else>
       <div class="card-box">
         <div class="table-responsive mt-3">
+		
           <table class="table tablesaw table-hover m-0">
             <thead>
               <tr>
-                <th v-for="attributeName in allAttributeNames" v-if="listAttributeNames.indexOf(attributeName) !== -1">
+                <th v-for="attributeName in allAttributeNames" v-if="listAttributeNames.indexOf(attributeName) !== -1 && getAttributeType(attributeName) !== 'Hidden'">
                   {{ getAttributeText(attributeName) }}
                 </th>
               </tr>
             </thead>
             <tbody>
               <tr v-for="item in items">
-                <td v-for="attributeName in allAttributeNames" :key="attributeName" v-if="listAttributeNames.indexOf(attributeName) !== -1">
-                  
-                    <img v-if="getAttributeType(attributeName) === 'Image'" :src="getAttributeValue(item, attributeName)" style="max-height: 100px; max-width: 100px; cursor: pointer;" v-on:click="largeImage(item, attributeName)">
-                    <div v-else>
+                <td v-for="attributeName in allAttributeNames" :key="attributeName" v-if="listAttributeNames.indexOf(attributeName) !== -1 && getAttributeType(attributeName) !== 'Hidden'">
+                    <div v-if="getAttributeType(attributeName) === 'Image'">
+						<img v-for="imageUrl in getAttributeValue(item, attributeName).split(',')" :src="imageUrl" style="max-height: 100px; max-width: 100px; cursor: pointer;" v-on:click="largeImage(imageUrl)">
+                    </div>
+					<div v-else>
                         {{ getAttributeValue(item, attributeName) }}
                     </div>
 
diff --git a/templates/submit1/index.html b/templates/submit1/index.html
index 49670e6..e4f85fb 100644
--- a/templates/submit1/index.html
+++ b/templates/submit1/index.html
@@ -8,12 +8,17 @@
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
   <script type="text/javascript" src="../../assets/lib/iframe-resizer-3.6.3/iframeResizer.contentWindow.min.js"></script>
   <link href="../../assets/css/bootstrap.min.css" rel="stylesheet" type="text/css" />
+  <style type="text/css">
+    .filepond--item {
+    width: calc(33% - .5em);
+    }
+  </style>
 </head>
 
 <body class="p-3">
   <div id="form_submit">
     <template v-if="pageType === 'form'">
-      <div v-for="fieldInfo in fieldInfoList" class="form-group">
+      <div v-for="fieldInfo in fieldInfoList" v-if="fieldInfo.fieldType !== 'Hidden'" class="form-group">
         <label> {{ fieldInfo.title }} <span v-if="fieldInfo.validate.indexOf('required') !== -1" class="text-danger">*</span>
           <small v-show="errors.has(fieldInfo.title)" class="text-danger">{{ errors.first(fieldInfo.title) }}</small>
         </label>
@@ -71,7 +76,8 @@
         </template>
         <template v-else-if="fieldInfo.fieldType === 'Image'">
           <file-pond
-            :allow-multiple="false"
+            allow-multiple="true"
+			max-files="3"
             :server="getUploadUrl(fieldInfo)"
             :files="files"
             accepted-file-types="image/jpeg, image/png, image/webp"
@@ -79,8 +85,7 @@
             label-file-processing="上传中..."
             label-file-processing-complete="上传成功"
             v-on:processfile="imageUploaded"
-            v-on:removefile="imageRemoved(fieldInfo)"
-          ></file-pond>
+            v-on:removefile="imageRemoved(fieldInfo)"/>
 
           <input
             v-model="fieldInfo.value"
@@ -116,8 +121,8 @@
         </div>
       </div>
       <hr />
-      <div class="text-center">
-        <button type="button" @click="btnSubmitClick" class="btn btn-primary w-md mr-2">提 交</button>
+      <div style="text-align: right;">
+        <button type="button" @click="btnSubmitClick" style="background-color: #CC0000; border-color: #CC0000;" class="btn btn-primary w-md mr-2">提 交</button>
       </div>
     </template>
     <template v-else-if="pageType === 'error'">