askbot-dragon 1.2.2 → 1.2.4

package/package.json

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

package/src/components/AnswerDocknowledge.vue

@@ -306,6 +306,7 @@ export default {
                   margin: 0 2px;
                   width: 18px;
                   height: 18px;
+                  flex: none;
                 }
 
                 .alc-title-updateTime {

package/src/components/associationIntention.vue

@@ -63,7 +63,17 @@
       </div>
       <Recommend v-if="msg.recommend && msg.recommend.list && msg.recommend.list.length > 0" :msg="msg" @onRadioClickReco="onRadioClickReco"></Recommend>
     </div>
-    <previewDoc ref="previewDoc" :url="previewHref"></previewDoc>
+    <van-popup v-model="previewShowPopup" position="bottom" :style="{ height: '90%', background:'#FFFFFF'}">
+      <previewDoc ref="previewDoc" :url="previewHref" @close="close"></previewDoc>
+    </van-popup>
+    <el-drawer
+        title="我是标题"
+        :visible.sync="drawer"
+        :with-header="false"
+        size="65%"
+    >
+      <previewDoc ref="previewDoc" :url="previewHref" @close="close"></previewDoc>
+    </el-drawer>
   </div>
 </template>
 
@@ -71,6 +81,7 @@
   import askVideo from "./askVideo";
   import Recommend from "./recommend";
   import previewDoc from "./previewDoc";
+  import { isMobile } from "../assets/js/common";
   export default {
     name: "associationIntention",
     components: {Recommend, askVideo, previewDoc},
@@ -92,7 +103,9 @@
     },
     data() {
       return {
-        previewHref: ""
+        previewHref: "",
+        previewShowPopup:false,
+        drawer:false
       }
     },
     mounted() {
@@ -228,25 +241,31 @@
 
       },
       //预览图片
-      lookAttach(){
-        return
-        // if (e.target.localName == 'a'){
-        //   console.debug('lookImage',e.target.href)
-        //   this.previewHref = e.target.href
-        //   this.$refs.previewDoc.previewShowPopup = true
-        //   // let url = ''
-        //   // try {
-        //   //   url = btoa(e.target.href)
-        //   // }
-        //   // catch {
-        //   //   url = encodeURIComponent(btoa(e.target.href))
-        //   // }
-        //   // window.open('https://test.open.askbot.cn/kkfileview/onlinePreview?url=' + url)
-        //   // e.stopPropagation()
-        //   // e.preventDefault()
-        //   e.returnValue = false
-        // }
+      lookAttach(e){
+        if (e.target.localName == 'a'){
+          this.previewHref = e.target.href;
+          if (isMobile()){
+            this.previewShowPopup = true
+          } else {
+            this.drawer = true;
+          }
+          // let url = ''
+          // try {
+          //   url = btoa(e.target.href)
+          // }
+          // catch {
+          //   url = encodeURIComponent(btoa(e.target.href))
+          // }
+          // window.open('https://test.open.askbot.cn/kkfileview/onlinePreview?url=' + url)
+          // e.stopPropagation()
+          // e.preventDefault()
+          e.returnValue = false
+        }
       },
+      close(){
+        this.previewShowPopup = false;
+        this.drawer = false
+      }
     },
     watch:{
       isOpen:{

package/src/components/fielListView.vue

@@ -47,19 +47,32 @@
                 <embed :src="dialogUrl" width="100%" height="100%" />
             </div>
         </el-dialog> -->
-        <previewDoc ref="previewDoc" :url="previewHref"></previewDoc>
+      <van-popup v-model="previewShowPopup" position="bottom" :style="{ height: '90%', background:'#FFFFFF'}">
+        <previewDoc ref="previewDoc" :url="previewHref" @close="close"></previewDoc>
+      </van-popup>
+      <el-drawer
+          title="我是标题"
+          :visible.sync="drawer"
+          :with-header="false"
+          size="65%"
+      >
+        <previewDoc ref="previewDoc" :url="previewHref" @close="close"></previewDoc>
+      </el-drawer>
     </div>
 </template>
 
 <script>
 import previewDoc from './previewDoc.vue';
+import { isMobile } from "../assets/js/common";
 export default {
     name: "customUpload",
     components: {previewDoc},
     data () {
         return {
             dialogVisible: false,
-            previewHref:""
+            previewHref:"",
+          previewShowPopup:false,
+          drawer:false
         }
     },
     props: ["attachmentList"],
@@ -86,10 +99,10 @@ export default {
               return file
             }
             const fileType = fileName.substring(fileName.lastIndexOf('.'));
-            if (fileType === '.mp4' || fileType === '.MP4' || fileType === '.mov' || fileType === '.MOV') {
+            if (fileType === '.mp4' || fileType === '.MP4' || fileType === '.mov' || fileType === '.MOV' || fileType === 'avi' || fileType === 'flv') {
                 file = 'video'
             }
-            else if (fileType === '.jpg' || fileType === '.png' || fileType === '.JPG' || fileType === '.PNG') {
+            else if (fileType === '.jpg' || fileType === '.png' || fileType === '.JPG' || fileType === '.PNG' || fileType === '.jpeg' || fileType === '.JPEG' || fileType === 'gif') {
                 file = 'image'
             }
             else if (fileType == '.txt') {
@@ -109,22 +122,25 @@ export default {
             }
             return file
         },
-        //下载文件
-        updownload () {
-            window.location.href = this.dialogUrl
-            /*window.open(this.dialogUrl,'_black')*/
-        },
         lookAttach(url){
           if(url !== '') {
-            // this.previewHref = url
-            // this.$refs.previewDoc.previewShowPopup = true
-            const fileType = url.substring(url.lastIndexOf('.'));
-            if (fileType === '.jpg' || fileType === '.png' || fileType === '.JPG' || fileType === '.PNG'){
-              this.previewHref = url
-              this.$refs.previewDoc.previewShowPopup = true
+            this.previewHref = url;
+            if (isMobile()){
+              this.previewShowPopup = true
+            } else {
+              this.drawer = true;
             }
+            // const fileType = url.substring(url.lastIndexOf('.'));
+            // if (fileType === '.jpg' || fileType === '.png' || fileType === '.JPG' || fileType === '.PNG'){
+            //   this.previewHref = url
+            //   this.$refs.previewDoc.previewShowPopup = true
+            // }
           }
-        }
+        },
+      close(){
+          this.previewShowPopup = false;
+          this.drawer = false
+      }
     }
 };
 </script>

package/src/components/formTemplate.vue

@@ -207,7 +207,7 @@
               <el-upload
 
                       ref="upload"
-                      :list-type="item.formField.type === 'IMAGE' || item.formField.type==='FILE'?'picture-card':''"
+                      :list-type="item.formField.type === 'IMAGE' || isBaiLi ? 'picture-card':''"
                       :accept="acceptFieldType(item.formField.type)"
                       name="file"
                       action="/open/media/file/upload"
@@ -220,13 +220,14 @@
                       :http-request="aliyunOssRequest"
                       :on-change="handleEditChange"
                       :on-success="successUpload"
+                      :show-file-list="item.formField.type === 'IMAGE' || isBaiLi ? true : false"
               >
                 <div class="upload-demo">
                   <i class="el-icon-plus"></i>
                 </div>
 <!--                <el-button size="small" type="primary" v-else class="uploadBtn">点击上传</el-button>-->
               </el-upload>
-              <file-list-view :attachmentList="extInfoFieldValue[item.fieldId]" v-if="extInfoFieldValue[item.fieldId] && item.formField.type !== 'IMAGE' && false" @attachDeleteAttch="attachDeleteFile($event,item.fieldId)"></file-list-view>
+              <file-list-view :attachmentList="extInfoFieldValue[item.fieldId]" v-if="extInfoFieldValue[item.fieldId] && item.formField.type !== 'IMAGE' && !isBaiLi" @attachDeleteAttch="attachDeleteFile($event,item.fieldId)"></file-list-view>
             </div>
           </template>
           <div v-else-if="item.formField.type == 'REF_TEMPLATE' || item.formField.type == 'REF'">
@@ -657,12 +658,13 @@
                 :after-read="afterRead"
                 :accept="acceptFieldType(item.formField.type)"
                 :multiple="item.formField.extInfo&&item.formField.extInfo.limitNum&&item.formField.extInfo.limitNum>1?true:false"
+                :preview-image="item.formField.type === 'IMAGE' || isBaiLi ? true : false"
             >
               <div class="vant-upload--picture-card">
                 <i  class="el-icon-plus"></i>
               </div>
             </van-uploader>
-            <file-list-view :attachmentList="extInfoFieldValue[item.fieldId]" v-if="extInfoFieldValue[item.fieldId] && item.formField.type !== 'IMAGE' && !fileUpload && false" @attachDeleteAttch="attachDeleteFile($event,item.fieldId)"></file-list-view>
+            <file-list-view :attachmentList="extInfoFieldValue[item.fieldId]" v-if="extInfoFieldValue[item.fieldId] && item.formField.type !== 'IMAGE' && !fileUpload && !isBaiLi" @attachDeleteAttch="attachDeleteFile($event,item.fieldId)"></file-list-view>
           </div>
         </div>
       </div>
@@ -883,7 +885,8 @@ export default {
       associatedControlsCopy:[],
       attachments:[],
       attachmentList:[],
-      uploadImgQueue:false
+      uploadImgQueue:false,
+      isBaiLi:false
     }
   },
   props: {
@@ -1103,6 +1106,9 @@ export default {
     if (this.mainId == '8b9bd566e3e64156ab764b19defc9d48' || this.mainId == '0b73521f96e4486aaf6be42932bd7b07'){
       this.ckeditor.editorConfig.toolbar = []
     }
+    if (this.mainId == '90df4764122240de939331d372546c28'){
+      this.isBaiLi = true;
+    }
     this.isMobile()
   },
   beforeCreate() {

package/src/components/previewDoc.vue

@@ -1,27 +1,27 @@
 <template>
-    <van-popup v-model="previewShowPopup" position="bottom" :style="{ height: '90%', background:'#FFFFFF'}">
-      <div class="footer">
-        <span>查看详情</span>
-        <section @click="close">
-          <i class="iconfont guoran-shanchu"></i>
-        </section>
-      </div>
-        <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-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>
-    </van-popup>
+  <div class="previewDoc">
+    <div class="footer">
+      <span>查看详情</span>
+      <section @click="close">
+        <i class="iconfont guoran-shanchu"></i>
+      </section>
+    </div>
+    <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-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>
 </template>
 
 <script>
@@ -43,17 +43,10 @@ export default {
     },
     computed:{
         previewUrl() {
-            console.debug('VUE_APP_ENV',process.env.VUE_APP_ENV)
             let url = process.env.VUE_APP_ENV === 'production' ? 'https://kkfileview.askbot.cn/onlinePreview?url=' : 'https://test.open.askbot.cn/kkfileview/onlinePreview?url='
             if(this.url != '') {
-                if(/[\u4E00-\u9FA5]+/g.test(this.url)) {
-                    url += btoa(encodeURIComponent(this.url))
-                } else {
-                    url += btoa(this.url)
-                }
-            }
-            if(this.officePreviewType !== '') {
-                url += '&officePreviewType=pdf'
+              url += btoa(encodeURIComponent(this.url))
+              url += '&encodeURIComponent=true'
             }
             return url
         },
@@ -69,7 +62,7 @@ export default {
     },
     methods :{
         close() {
-            this.previewShowPopup = false
+          this.$emit('close')
         },
         loadIframe(item) {
             let iframe = document.getElementsByClassName('preview_iframe')[0]
@@ -92,9 +85,13 @@ export default {
 </script>
 
 <style lang="less" scoped>
+.previewDoc{
+  height: 100%;
+}
 .preview_iframe {
     width: 100%;
-    height: calc(100% - 52px);
+    height: calc(100% - 65px);
+    overflow-y: scroll;
 }
 .footer {
     width: calc(100% - 40px);
@@ -106,4 +103,7 @@ export default {
     padding: 0 20px;
     border-bottom: 1px solid #cccccc;
 }
+/deep/.el-drawer__body{
+  height: 100%;
+}
 </style>

package/src/components/previewPdf.vue

@@ -145,7 +145,7 @@ export default {
 <style lang="less" scoped>
 .preview_iframe {
     width: 100%;
-    height: 100%;
+    height: calc(100% - 60px);
     box-sizing: border-box;
 }
 .preview_iframe_html{