askbot-dragon 1.6.55-beta → 1.6.57-beta

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "askbot-dragon",
-  "version": "1.6.55-beta",
+  "version": "1.6.57-beta",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",

package/src/assets/js/common.js

@@ -70,7 +70,182 @@ let imageTypeObj = {
     aiv: "video",
     news:"news"
 }
+function newInitWaterMark(elId, textValue) {
+    //默认设置
+    var defaultSettings = {
 
+        watermark_txt: "",
+
+        visitorWatermark_txt: "",
+
+        watermark_x: 0, //水印起始位置x轴坐标
+
+        watermark_y: 0, //水印起始位置Y轴坐标
+
+        watermark_rows: 0, //水印行数
+
+        watermark_cols: 0, //水印列数
+
+        watermark_x_space: 40, //水印x轴间隔
+
+        watermark_y_space: 60, //水印y轴间隔
+
+        watermark_color: "black", //水印字体颜色
+
+        watermark_alpha: 0.3, //水印透明度
+
+        watermark_fontsize: "12px", //水印字体大小
+
+        watermark_font: "微软雅黑", //水印字体
+
+        watermark_width: 100, //水印宽度
+
+        watermark_height: 60, //水印长度
+
+        watermark_angle: 20 //水印倾斜度数
+
+    };
+    let textWatermarkValue = textValue;
+    if (textWatermarkValue) {
+        defaultSettings.watermark_txt = textWatermarkValue;
+    }
+    if (!textWatermarkValue) {
+        return;
+    }
+
+    //采用配置项替换默认值，作用类似jquery.extend
+
+    if (arguments.length === 1 && typeof arguments[0] === "object") {
+
+        // 获取参数配置
+
+        var src = arguments[0];
+
+        for (let key in src) {
+
+            if (src[key] && defaultSettings[key] && src[key] === defaultSettings[key])
+
+                continue;
+
+            else if (src[key])
+
+                defaultSettings[key] = src[key];
+
+        }
+
+    }
+
+    var oTemp = document.createDocumentFragment();
+
+    //获取页面最大宽度
+
+    var page_width = Math.max(document.getElementById(elId).scrollWidth, document.getElementById(elId).clientWidth);
+
+    var cutWidth = page_width * 0.0150;
+
+    page_width = page_width - cutWidth;
+
+    //获取页面最大高度
+    var page_height = document.getElementById(elId).scrollHeight;
+    console.log('page_height',page_height, page_width);
+
+    // var page_height = Math.max(document.body.scrollHeight, document.body.clientHeight);
+
+    // var page_height = document.body.scrollHeight+document.body.scrollTop;
+
+    //如果将水印列数设置为0，或水印列数设置过大，超过页面最大宽度，则重新计算水印列数和水印x轴间隔
+
+    if (defaultSettings.watermark_cols == 0 || (parseInt(defaultSettings.watermark_x + defaultSettings
+
+        .watermark_width * defaultSettings.watermark_cols + defaultSettings.watermark_x_space * (
+
+        defaultSettings.watermark_cols - 1)) > page_width)) {
+
+        defaultSettings.watermark_cols = parseInt((page_width - defaultSettings.watermark_x + defaultSettings
+
+            .watermark_x_space) / (defaultSettings.watermark_width + defaultSettings
+
+            .watermark_x_space));
+
+        defaultSettings.watermark_x_space = parseInt((page_width - defaultSettings.watermark_x -
+
+            defaultSettings
+
+                .watermark_width * defaultSettings.watermark_cols) / (defaultSettings.watermark_cols - 1));
+
+    }
+
+    //如果将水印行数设置为0，或水印行数设置过大，超过页面最大长度，则重新计算水印行数和水印y轴间隔
+
+    if (defaultSettings.watermark_rows == 0 || (parseInt(defaultSettings.watermark_y + defaultSettings
+
+        .watermark_height * defaultSettings.watermark_rows + defaultSettings.watermark_y_space * (
+
+        defaultSettings.watermark_rows - 1)) > page_height)) {
+
+        defaultSettings.watermark_rows = parseInt((defaultSettings.watermark_y_space + page_height -
+
+            defaultSettings
+
+                .watermark_y) / (defaultSettings.watermark_height + defaultSettings.watermark_y_space));
+
+        defaultSettings.watermark_y_space = parseInt(((page_height - defaultSettings.watermark_y) -
+
+            defaultSettings
+
+                .watermark_height * defaultSettings.watermark_rows) / (defaultSettings.watermark_rows - 1));
+
+    }
+
+    var x;
+    var y;
+    for (var i = 0; i < defaultSettings.watermark_rows; i++) {
+        y = defaultSettings.watermark_y + (defaultSettings.watermark_y_space + defaultSettings.watermark_height) * i;
+        for (var j = 0; j < defaultSettings.watermark_cols; j++) {
+            x = defaultSettings.watermark_x + (defaultSettings.watermark_width + defaultSettings.watermark_x_space) * j;
+            var mask_div = document.createElement("div");
+
+            mask_div.id = "mask_div" + i + j;
+            mask_div.className = "mask_div";
+            mask_div.style.webkitTransform = "rotate(-" + defaultSettings.watermark_angle + "deg)";
+            mask_div.style.MozTransform = "rotate(-" + defaultSettings.watermark_angle + "deg)";
+            mask_div.style.msTransform = "rotate(-" + defaultSettings.watermark_angle + "deg)";
+            mask_div.style.OTransform = "rotate(-" + defaultSettings.watermark_angle + "deg)";
+            mask_div.style.transform = "rotate(-" + defaultSettings.watermark_angle + "deg)";
+            mask_div.style.visibility = "";
+            mask_div.style.position = "absolute";
+            //奇偶行错开，这样水印就不对齐，显的不呆板
+            mask_div.style.left = x + 20 + "px";
+            mask_div.appendChild(document.createTextNode(defaultSettings.watermark_txt));
+
+            mask_div.style.top = y + 10 + "px";
+
+            mask_div.style.overflow = "hidden";
+
+            mask_div.style.pointerEvents = "none"; //让水印不遮挡页面的点击事件
+
+            mask_div.style.opacity = defaultSettings.watermark_alpha;
+
+            mask_div.style.fontSize = defaultSettings.watermark_fontsize;
+
+            mask_div.style.fontFamily = defaultSettings.watermark_font;
+
+            mask_div.style.color = defaultSettings.watermark_color;
+
+            mask_div.style.textAlign = "center";
+
+            mask_div.style.width = defaultSettings.watermark_width + "px";
+
+            mask_div.style.height = defaultSettings.watermark_width + "px";
+
+            mask_div.style.display = "block";
+
+            oTemp.appendChild(mask_div);
+        }
+    }
+    document.getElementById(elId).appendChild(oTemp);
+}
 export {
-    imageTypeObj
+    imageTypeObj,
+    newInitWaterMark
 }

package/src/components/AnswerDocknowledge.vue

@@ -98,6 +98,7 @@
         </div>
         <previewPdf ref="previewPdf"
                     :url="previewHref"
+                    :previewOssPath="previewOssPath"
                     :title="title" :sourceFileType="sourceFileType"
                     officePreviewType="pdf"
                     @previewToDialog="previewToDialog"
@@ -203,7 +204,7 @@ export default {
             title:'',
             previewKnowledgeId:"",
             previewKnowledge:{},
-            title:'',
+            previewOssPath:""
         }
     },
     props: ['msg', 'isAskLightning', 'isMessageRecord', "isApp","isHasChat","activeKnowledgeId"],
@@ -288,6 +289,7 @@ export default {
             this.previewKnowledgeId = item.knowledgeId
             this.$refs.previewPdf.previewShowPopup = false;
             this.$refs.previewPdf.drawer = false;
+            this.previewOssPath = url;
             let index = url.lastIndexOf('?')
             let type = ''
             let httpUrl = '/knowledge-api/knowledge/getTemporaryCertificate'

package/src/components/pdfPosition.vue

@@ -33,6 +33,7 @@
 
 <script>
 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";
@@ -49,7 +50,7 @@ const CSS_UNITS = 96.0 / 72.0
 // import { zoomElement } from '../assets/js/hammer'
 export default {
     name: 'pdfView',
-    props: ['tagIds', 'isMessageRecord','fileName', "knowledgeItem"],
+    props: ['tagIds', 'isMessageRecord','fileName', "knowledgeItem",'textWatermarkStr'],
     data () {
         return {
             url: '',
@@ -261,8 +262,8 @@ export default {
                 this.contentView.style.paddingBottom = '60px'
                 // contentView.style.overflowY = 'auto'
                 this.$refs.pdfView.appendChild(this.contentView);
-                if (this.knowledgeItem && (this.knowledgeItem.source === 'CORP_LOCAL_FILE' || this.knowledgeItem.source === 'YUQUE' || this.knowledgeItem.source === 'FEISHU') && (this.knowledgeItem.visitorWatermarkValue || this.knowledgeItem.textWatermarkValue)){
-                  this.watermark()
+                if (this.textWatermarkStr){
+                  newInitWaterMark('pdf_container_view',this.textWatermarkStr)
                 }
             }
             this.renderPages(pageIndex)

package/src/components/previewDoc.vue

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

package/src/components/previewPdf.vue

@@ -1,3 +1,9 @@
+
+<!-- preview-pdf
+  组件主要负责 知识项目中 文件的预览，携带定位信息参数 tagIds tagId 的会解析文件增加定位功能
+  不携带定位信息的 也是走 kkview项目预览
+  另外增加了在知识项目中预览当前文件的一些功能
+-->
 <template>
     <!-- <van-popup v-model="previewShowPopup" position="bottom" :style="{ height: '90%', background:'#FFFFFF'}" v-if="previewShowPopup">
       <div class="footer">
@@ -49,6 +55,9 @@
     <div class="drawer-footer">
       <span>{{title ? title : "查看详情"}}</span>
       <div class="header-right">
+        <div class="onload_btn" v-if="isDownload" @click="downLoad">
+          下载
+        </div>
         <div class="summaryBtn"
              :class="showSummary ? 'summaryActiveBtn' : ''"
              @click="summaryFun"
@@ -71,7 +80,7 @@
         </section>
       </div>
     </div>
-    <div id="drawer_content_pre" :style="{ height:isDownload ? 'calc(100% - 110px)' :'calc(100% - 50px)'}">
+    <div id="drawer_content_pre">
       <intelligent-summary
           v-show="showSummary"
           :knowledgeId="knowledgeId"
@@ -81,7 +90,7 @@
           :style="{marginTop:tagIds && tagIds.length != 0 ? '50px' : ''}"
       ></intelligent-summary>
       <template v-if="tagIds && tagIds.length != 0 && drawer">
-        <pdfPosition :tagIds="tagIds" :isMessageRecord="isMessageRecord" :fileName="fileName" :knowledgeItem="watermark" ref="pdfPosition"></pdfPosition>
+        <pdfPosition :tagIds="tagIds" :isMessageRecord="isMessageRecord" :fileName="fileName" :textWatermarkStr="textWatermarkStr"  ref="pdfPosition"></pdfPosition>
       </template>
       <template v-else>
         <div v-if="fileType == 'VIDEO'" style="width: 100%;">
@@ -104,9 +113,6 @@
         </template>
       </template>
     </div>
-    <div class="onload_btn" v-if="isDownload" @click="downLoad">
-      下载
-    </div>
     <div class="loading_img" v-show="loading">
             <img src="https://guoranopen-zjk.oss-cn-zhangjiakou.aliyuncs.com/cdn-common/images/loading.gif" alt="">
         </div>
@@ -134,15 +140,12 @@ export default {
             previewKnowledgeId:"",
             showSummary:true,
             iframeHeight:"100%",
-            isDownload:true,
+            isDownload:false,
             textWatermarkStr:""
         }
     },
     mounted() {
       window.addEventListener('message',this.handleIframeMessage,false);
-      if (!this.tagIds || this.tagIds.length == 0){
-        this.getTextWatermark();
-      }
     },
     props:{
         url:{
@@ -172,6 +175,10 @@ export default {
         knowledgeId:{
           type: String,
           default: '',
+        },
+        previewOssPath:{
+          type: String,
+          default: '',
         }
     },
     components:{
@@ -210,6 +217,14 @@ export default {
             this.getSummarySuccess();
           }
         }
+      },
+      knowledgeId:{
+        handler(val){
+          console.log('knowledgeId',val)
+          if (val){
+            this.getTextWatermark();
+          }
+        }
       }
     },
     computed:{
@@ -331,7 +346,7 @@ export default {
         let url = '/knowledge-api/open/knowledge/getPermissionInfo';
         let obj = {
           "knowledgeId":this.knowledgeId,
-          "userId":sessionStorage.getItem('_userId') || localStorage.getItem('_userId')
+          "userId":sessionStorage.getItem('loginUserId')
         }
         this.$http.post(url,obj).then(res => {
           console.log('getTextWatermark',res.data.data)
@@ -342,7 +357,7 @@ export default {
         })
       },
       downLoad () {
-        let url = this.url
+        let url = this.previewOssPath
         if (decodeURIComponent(url) != url) {
           url = decodeURIComponent(url)
         }
@@ -415,23 +430,16 @@ export default {
   scroll-behavior: smooth;
 }
 .onload_btn {
-  position: absolute;
-  left: 50%;
-  transform: translateX(-50%);
-  bottom: 10px;
-  width: 200px;
-  background-color: #366AFF;
-  color: white;
-  height: 48px;
+  width: 80px;
+  height: 26px;
   display: flex;
   align-items: center;
   justify-content: center;
-  border-radius: 28px;
   cursor: pointer;
-  z-index: 9999;
-  i{
-    margin-right: 8px;
-  }
+  margin-right: 10px;
+  border-radius: 15px;
+  color: #ffffff;
+  background-color: #366aff;
 }
 .preview_iframe {
     width: 100%;

package/src/components/welcomeKnowledgeFile.vue

@@ -36,6 +36,7 @@
         </div>
         <previewPdf ref="previewPdf"
                     :url="previewHref"
+                    :previewOssPath="previewOssPath"
                     :sourceFileType="sourceFileType"
                     officePreviewType="pdf"
                     @previewToDialog="previewToDialog"
@@ -97,7 +98,8 @@ export default {
             sourceFileType: '',
             page: 1,
             previewKnowledgeId:"",
-            previewKnowledge:{}
+            previewKnowledge:{},
+            previewOssPath:""
         }
     },
     components: {
@@ -116,6 +118,7 @@ export default {
             this.previewKnowledgeId = item.knowledgeId
             this.$refs.previewPdf.previewShowPopup = false;
             this.$refs.previewPdf.drawer = false;
+            this.previewOssPath = item.url;
             let index = item.url.lastIndexOf('?')
             let type = ''
             let httpUrl = '/knowledge-api/knowledge/getTemporaryCertificate'