askbot-dragon 1.5.78-beta → 1.5.78

package/src/components/pdfPosition.vue

@@ -1,9 +1,5 @@
 <template>
-    <div class="pdf_view" ref="pdfView" @scroll="pdfScroll" :style="{
-        marginTop: isPC ? '50px' : '',
-        marginBottom: tagIds.length > 1 ? '60px' : '0px',
-        height: setHeight
-    }">
+    <div class="pdf_view" id="pdf_view">
         <div class="change_scale" v-if="isPC">
             <section @click="changeScale('reduce')">
                 <i class="el-icon-minus"></i>
@@ -17,6 +13,7 @@
                 </el-option>
             </el-select>
         </div>
+        <div class="pdf_container_view" id="pdf_container_view" @scroll="pdfScroll"  ref="pdfView"></div>
         <div class="btn_footer" v-if="tagIds.length > 1 && !isPC">
             <div class="prev" @click="prev">上一段</div>
             <div class="next" @click="next">下一段</div>
@@ -29,9 +26,13 @@
         </div>
     </div>
 </template>
-
 <script>
+// :style="{
+//     marginBottom: tagIds.length > 1 ? '60px' : '0px',
+//     height: setHeight
+// }"
 import _ from 'lodash'
+import { newInitWaterMark } from "../assets/js/common";
 // import * as pdfjsLib from 'pdfjs-dist'
 // pdfjsLib.GlobalWorkerOptions.workerSrc = 'pdfjs-dist/build/pdf.worker';
 // import { TextLayerBuilder }  from "pdfjs-dist/web/pdf_viewer";
@@ -47,7 +48,7 @@ const { TextLayerBuilder } = window['pdfjs-dist/web/pdf_viewer']
 // import { zoomElement } from '../assets/js/hammer'
 export default {
     name: 'pdfView',
-    props: ['tagIds', 'isMessageRecord'],
+    props: ['tagIds', 'isMessageRecord','textWatermarkStr'],
     data () {
         return {
             url: '',
@@ -258,6 +259,9 @@ export default {
                 this.contentView.style.paddingBottom = '60px'
                 // contentView.style.overflowY = 'auto'
                 this.$refs.pdfView.appendChild(this.contentView);
+                if (this.textWatermarkStr){
+                  newInitWaterMark('pdf_container_view',this.textWatermarkStr)
+                }
             }
             this.renderPages(pageIndex)
         },
@@ -444,7 +448,7 @@ export default {
                 endNum = startNum + Math.ceil(height / (that.pageSize.height + that.PAGE_INTVERVAL))
             }
             for (let pageIndex = startNum; pageIndex < endNum; pageIndex++) {
-                if (pageIndex > 0 && pageIndex < that.pages.length) {
+                if (pageIndex > 0 && pageIndex <= that.pages.length) {
                     that.loadPdfData(pageIndex)
                 }
             }
@@ -864,6 +868,7 @@ export default {
                     // 在 pdf_view 下创建 所有canvs的容器
                     this.contentView = document.createElement('div')
                     this.contentView.style.transformOrigin = '0px 0px 0px'
+                    this.contentView.setAttribute('id','contentView');
                     this.$http.get('/knowledge-api/knowledge/knowledge-part-location-info/list?ids=' + value.join(',')).then(res => {
                         // res.data = {"data":[{"id":"64591b7d8bb8ab1b91c65f24","knowledgeId":"64591a9c8da27649473f3b4b","mainId":"fb348d095c0b4fd7bbd37826563dac7d","page":3,"total":18,"pageHeight":540.0,"pageWidth":960.00946,"publicPageFileUrl":"https://askbot-pdf-all.oss-cn-zhangjiakou.aliyuncs.com/fb348d095c0b4fd7bbd37826563dac7d/2023/05/08/11/55/18/64591b638bb8ab1b91c65eed/3.pdf","extractInfo":{"location":[280.488,161.32,398.71573,61.99298],"content":"黄花城水长城旅游区位于北京市怀柔区九渡河镇境内，距北京市区65公里，是以奇而著称，融山川、碧水、古长城为一体的旅游休闲胜地。而这里的“三绝景”更是引人入","lines":[{"content":"黄花城水长城旅游区位于北京市怀柔区九渡河镇境内，距","location":[280.488,161.32,398.71573,15.9869995]},{"content":"北京市区65公里，是以奇而著称，融山川、碧水、古长","location":[283.691,184.30899,392.3055,15.9869995]},{"content":"城为一体的旅游休闲胜地。而这里的“三绝景”更是引人入","location":[282.699,207.32599,394.3033,15.9869995]}],"tagId":null}}],"code":"0","msg":null,"traceId":null}
                         // res.data = {"data":[{"id":"64590ce1eb1320043401cc90","knowledgeId":"64590cd5017b461d67e282e1","mainId":"fb348d095c0b4fd7bbd37826563dac7d","page":2,"total":5,"pageHeight":841.8898,"pageWidth":595.30396,"publicPageFileUrl":"https://askbot-pdf-all.oss-cn-zhangjiakou.aliyuncs.com/fb348d095c0b4fd7bbd37826563dac7d/2023/05/08/10/53/20/64590ce0eb1320043401cc7b/2.pdf","extractInfo":{"location":[89.32981,638.1907,415.15512,98.63251],"content":":北京地铁 13\r号线 :藤黄\r色 :西直门站—\r东直门站 :17 :41.\r5 :6\r准\rB :2002年\r09月\r28日 ","lines":[{"content":":北京地铁 13\r号线 ","location":[89.32981,638.1907,99.44599,98.63251]},{"content":":藤黄\r色 ","location":[188.7758,638.1907,46.79959,98.63251]},{"content":":西直门站—\r东直门站 ","location":[235.5754,638.1907,86.09996,98.63251]},{"content":":17 ","location":[321.67535,638.1907,36.200012,98.63251]},{"content":":41.\r5 ","location":[357.87537,638.1907,39.400696,98.63251]},{"content":":6\r准\rB ","location":[397.27606,638.1907,41.099,98.63251]},{"content":":2002年\r09月\r28日 ","location":[438.37506,638.1907,66.10986,98.63251]}],"tagId":null}}],"code":"0","msg":null,"traceId":null}
@@ -1030,9 +1035,9 @@ export default {
                             // tagIds 会按照gpt识别的生成有序的数组，前端直接按照下标的顺序取就可以了
                             // 缓存拿到的所有数据
                             this.cachePdf = res.data.data
-                            let publicPageFileUrl = res.data.data[0].publicPageFileUrl
+                            let publicPageFileUrl = res.data.data && res.data.data[0] ? res.data.data[0].publicPageFileUrl : ''
                             this.currentPage = 0
-                            if (publicPageFileUrl.substring(publicPageFileUrl.lastIndexOf('.')) === '.pdf') {
+                            if (publicPageFileUrl && publicPageFileUrl.substring(publicPageFileUrl.lastIndexOf('.')) === '.pdf') {
                                 this.preViewType = 'pdf'
                                 this.setPageAllLine(this.cachePdf)
                                 this.getpdfResloutePage(res.data.data[0])
@@ -1098,12 +1103,12 @@ export default {
 <style lang="less" scoped>
 .pdf_view {
     width: 100%;
-    height: calc(100% - 110px);
+    // height: calc(100% - 110px);
+    height: 100%;
     overflow: auto;
     background-color: #f5f7fb;
     // margin-bottom: 60px;
     box-sizing: border-box;
-
     // position: relative;
     // > div {
     //     width: 100%;
@@ -1292,6 +1297,12 @@ export default {
             background: rgba(221, 222, 223, 1);
         }
     }
+  .pdf_container_view{
+    height: 100%;
+    width: 100%;
+    position: relative;
+    overflow: auto;
+  }
 }
 </style>
 <style lang="less">

package/src/components/previewDoc.vue

@@ -1,4 +1,9 @@
+<!-- preview-document 
+  组件主要负责 富文本中配置的链接，图片 及上传附件下的附件列表中的单纯预览
+  走的是kkview项目预览或者iframe直接打开文件地址，不对预览文件解析不包含其他功能开发
+-->
 <template>
+
   <div class="previewDoc">
     <div class="footer">
       <span>查看详情</span>