askbot-dragon 1.0.24 → 1.0.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "askbot-dragon",
-  "version": "1.0.24",
+  "version": "1.0.26",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",

package/src/components/fielListView.vue

@@ -8,7 +8,7 @@
                     <div class="attch-item-left" @click="lookAttach(item.url)">
                         <i v-if="item.url == ''" class="el-icon-loading" style="color:#366AFF;margin: 5px;"></i>
                         <img src="../assets/image/video.png"
-                            v-else-if="setSrc(item.name) == 'video'" />
+                            v-else-if="setSrc(item.name) == 'video'"/>
                         <img src="../assets/image/image.png"
                             v-else-if="setSrc(item.name) == 'image'" />
                         <img src="../assets/image/txt.png"
@@ -77,7 +77,7 @@ export default {
         setSrc (fileName) {
             let file = ""
             const fileType = fileName.substring(fileName.lastIndexOf('.'));
-            if (fileType === '.mp4' || fileType === '.MP4') {
+            if (fileType === '.mp4' || fileType === '.MP4' || fileType === '.mov' || fileType === '.MOV') {
                 file = 'video'
             }
             else if (fileType === '.jpg' || fileType === '.png' || fileType === '.JPG' || fileType === '.PNG') {

package/src/components/formTemplate.vue

@@ -203,7 +203,7 @@
             ></el-cascader>-->
           </template>
           <template v-else-if="item.formField.type==='FILE' || item.formField.type === 'IMAGE' || item.formField.type === 'ATTACHMENT' || item.formField.type === 'VIDEO'">
-            <div @click="checkUpload(item.fieldId,item.formField.extInfo)" @mouseover="checkUpload(item.fieldId,item.formField.extInfo)" style="display:flex;flex-direction: column">
+            <div @click="checkUpload(item.fieldId,item.formField.extInfo)" @mouseover="checkUpload(item.fieldId,item.formField.extInfo)" class="form-field-file" style="display:flex;flex-direction: column">
               <el-upload
 
                       ref="upload"
@@ -3001,6 +3001,13 @@ export default {
     font-size: 1em;
     padding-bottom: 8px;
   }
+  .form-field-file{
+    #attachment-upload{
+      /deep/.image-list{
+        padding: 0;
+      }
+    }
+  }
 }
 .pcFormClass{
   width: 400px;
@@ -3139,6 +3146,11 @@ export default {
             color: #A9B3C6;
            /* color: #000000;*/
           }
+          #attachment-upload{
+            /deep/.image-list{
+              padding: 0;
+            }
+          }
         }
         .workorder_description{
          /* padding: 8px 16px;*/

package/src/components/previewDoc.vue

@@ -3,9 +3,18 @@
         <div v-if="fileType == 'VIDEO'" style="width: 100%;height: calc(100% - 70px)">
             <video :src="url" controls width="100%;" height="98%"></video>
         </div>
-        <template v-else>
-            <iframe class="preview_iframe" :src="previewUrl" style="border:none;"></iframe>
+        <template v-else-if="url.includes('https://www') || url.includes('http://www')">
+            <iframe class="preview_iframe"
+                    :src="url"
+                    width="100%"
+                    height="100%"
+                    scrolling="100%"
+                    frameborder="no"
+                    border="0"></iframe>
         </template>
+       <template v-else>
+        <iframe class="preview_iframe" :src="previewUrl" style="border:none;"></iframe>
+      </template>
         <div class="footer">
             <section class="close_btn" @click="close">
                 关闭
@@ -43,7 +52,7 @@ export default {
         },
         fileType() {
             const fileType = this.url.substring(this.url.lastIndexOf('.'));
-            if (fileType === '.mp4' || fileType === '.MP4') {
+            if (fileType === '.mp4' || fileType === '.MP4'  || fileType === '.MOV'  || fileType === '.mov') {
                 return 'VIDEO'
             } else {
                 return 'OTHER'