askbot-dragon 1.5.67-beta → 1.5.68-beta

package/package.json

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

package/src/components/AnswerDocknowledge.vue

@@ -154,7 +154,8 @@ export default {
             },
             watermark: {
               textWatermarkValue:'',
-              visitorWatermarkValue:''
+              visitorWatermarkValue:'',
+              source:""
             }
         }
     },
@@ -239,7 +240,8 @@ export default {
               "fileInOssPath":url
             }).then(async res =>{
               if(res.data.code == '0') {
-                this.watermark = await this.getknowledgeBaseStructure(item.knowledgeId)
+                this.watermark = await this.getknowledgeBaseStructure(item.knowledgeId);
+                this.watermark.source = item.source;
                 this.previewHref = res.data.data;
                 this.sourceFileType = url.substring(url.lastIndexOf('.'))
                 let isOhmPc = sessionStorage.getItem('isOhmPc')
@@ -321,9 +323,9 @@ export default {
             visitorWatermarkValue:''
           }
           await this.$http.get("/knowledge-api/internal/knowledgeBaseStructure/" + knowledgeId).then( async res =>{
-            if(res.data.code && res.data.code == '0') {
-              watermark.textWatermarkValue = await res.data.data.textWatermarkValue
-              if(res.data.data.visitorWatermark) {
+            if(res.data) {
+              watermark.textWatermarkValue = await res.data.textWatermarkValue
+              if(res.data.visitorWatermark) {
                 let userInfo = sessionStorage.getItem('userInfo') || localStorage.getItem('userInfo')
                 if(userInfo && userInfo !== 'null') {
                   watermark.visitorWatermarkValue = JSON.parse(userInfo).realName

package/src/components/pdfPosition.vue

@@ -49,7 +49,7 @@ const CSS_UNITS = 96.0 / 72.0
 // import { zoomElement } from '../assets/js/hammer'
 export default {
     name: 'pdfView',
-    props: ['tagIds', 'isMessageRecord','fileName'],
+    props: ['tagIds', 'isMessageRecord','fileName', "knowledgeItem"],
     data () {
         return {
             url: '',
@@ -857,6 +857,160 @@ export default {
             this.contentView.style.transform = 'scale(' + this.transformSalce + ')';
             // this.getpdfResloutePage(this.cachePdf[0])
         },
+        //添加水印
+        watermark() {
+          //默认设置
+          var defaultSettings = {
+            watermark_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: .3,//水印透明度
+            watermark_fontsize: 12,//水印字体大小
+            watermark_font: '微软雅黑',//水印字体
+            watermark_width: 100,//水印宽度
+            watermark_height: 80,//水印长度
+            watermark_angle: 20,//水印倾斜度数***
+            visitorWatermark_txt:""
+          };
+          if(this.knowledgeItem.textWatermarkValue){
+            defaultSettings.watermark_txt = this.knowledgeItem.textWatermarkValue;
+          }
+          if (this.knowledgeItem.visitorWatermarkValue){
+            defaultSettings.visitorWatermark_txt = this.knowledgeItem.visitorWatermarkValue
+          }
+          //采用配置项替换默认值，作用类似jquery.extend
+          if (arguments.length === 1 && typeof arguments[0] === "object") {
+            console.log("arguments = " + JSON.stringify(arguments[0]));
+            // 获取参数配置
+            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();
+          //获取页面最大宽度
+          console.debug('pdf_view',document.getElementById('pdf_view'))
+          let scrollWidth = document.getElementById('pdf_view').scrollWidth;
+          let clientWidth = document.getElementById('pdf_view').clientWidth;
+          var page_width = Math.max(scrollWidth, clientWidth);
+
+          var cutWidth = page_width * 0.0150;
+
+          page_width = page_width - cutWidth;
+
+          //获取页面最大高度
+          var page_height = Math.max(document.body.scrollHeight, document.body.clientHeight) + 2860;
+
+          // 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";
+              //奇偶行错开，这样水印就不对齐，显的不呆板
+              console.debug('x',x)
+              if (i % 2 != 0) {
+                mask_div.style.left = x + 'px';
+                if (j % 2 != 0 && this.knowledgeItem.visitorWatermarkValue){
+                  mask_div.appendChild(document.createTextNode(defaultSettings.visitorWatermark_txt));
+                } else {
+                  if (!this.knowledgeItem.textWatermarkValue){
+                    mask_div.appendChild(document.createTextNode(defaultSettings.visitorWatermark_txt));
+                  } else {
+                    mask_div.appendChild(document.createTextNode(defaultSettings.watermark_txt));
+                  }
+                }
+              } else {
+                mask_div.style.left = x + 'px';
+                if (j % 2 != 0 && this.knowledgeItem.textWatermarkValue){
+                  mask_div.appendChild(document.createTextNode(defaultSettings.watermark_txt));
+                } else {
+                  if (!this.knowledgeItem.visitorWatermarkValue){
+                    mask_div.appendChild(document.createTextNode(defaultSettings.watermark_txt));
+                  } else {
+                    mask_div.appendChild(document.createTextNode(defaultSettings.visitorWatermark_txt));
+                  }
+                }
+              }
+
+              mask_div.style.top = y + 'px';
+              mask_div.style.overflow = "hidden";
+              mask_div.style.zIndex = "9999";
+              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_height + 'px';
+              mask_div.style.display = "block";
+              oTemp.appendChild(mask_div);
+            }
+          }
+          this.contentView.appendChild(oTemp);
+
+      },
     },
     computed: {
         perviewUrl () {
@@ -886,7 +1040,13 @@ export default {
                     this.contentView = document.createElement('div')
                     this.contentView.setAttribute('id','contentView')
                     this.contentView.style.transformOrigin = '0px 0px 0px'
-                    this.$http.get('/knowledge-api/knowledge/knowledge-part-location-info/list?ids=' + value.join(',')).then(res => {
+                    this.contentView.setAttribute('id','contentView');
+                    this.$nextTick(() => {
+                      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()
+                      }
+                    })
+                  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}
                         // 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}

package/src/components/previewPdf.vue

@@ -54,7 +54,7 @@
     </div>
     <div id="drawer_content_pre">
       <template v-if="tagIds && tagIds.length != 0 && drawer">
-        <pdfPosition :tagIds="tagIds" :isMessageRecord="isMessageRecord" :fileName="fileName" ref="pdfPosition"></pdfPosition>
+        <pdfPosition :tagIds="tagIds" :isMessageRecord="isMessageRecord" :fileName="fileName" :knowledgeItem="watermark" ref="pdfPosition"></pdfPosition>
       </template>
       <template v-else>
         <div v-if="fileType == 'VIDEO'" style="width: 100%;">
@@ -160,8 +160,8 @@ export default {
             url = url + this.url
             url += '&officePreviewType=pdf'
             if(this.watermark) {
-              url = this.watermark.textWatermarkValue ? (url += this.watermark.textWatermarkValue) : url
-              url = this.watermark.visitorWatermarkValue ? (url += this.watermark.visitorWatermarkValue) : url
+              url = this.watermark.textWatermarkValue ? (url += '&textWatermarkValue=' + this.watermark.textWatermarkValue) : url
+              url = this.watermark.visitorWatermarkValue ? (url += '&visitorWatermarkValue=' + this.watermark.visitorWatermarkValue) : url
             }
             return url
         },