askbot-dragon 1.8.31-beta → 1.8.33-beta

package/package.json

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

package/src/assets/js/common.js

@@ -86,23 +86,23 @@ function newInitWaterMark(elId, textValue) {
 
         watermark_cols: 0, //水印列数
 
-        watermark_x_space: 40, //水印x轴间隔
+        watermark_x_space: 60, //水印x轴间隔
 
-        watermark_y_space: 60, //水印y轴间隔
+        watermark_y_space: 90, //水印y轴间隔
 
-        watermark_color: "black", //水印字体颜色
+        watermark_color: "#949494", //水印字体颜色
 
-        watermark_alpha: 0.3, //水印透明度
+        watermark_alpha: 0.15, //水印透明度
 
-        watermark_fontsize: "12px", //水印字体大小
+        watermark_fontsize: "24px", //水印字体大小
 
-        watermark_font: "微软雅黑", //水印字体
+        watermark_font: '-apple-system, BlinkMacSystemFont, "PingFang SC", "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial, sans-serif', //水印字体
 
-        watermark_width: 100, //水印宽度
+        watermark_width: 150, //水印宽度
 
         watermark_height: 60, //水印长度
 
-        watermark_angle: 20 //水印倾斜度数
+        watermark_angle: 15 //水印倾斜度数
 
     };
     let textWatermarkValue = textValue;
@@ -238,7 +238,7 @@ function newInitWaterMark(elId, textValue) {
 
             mask_div.style.textAlign = "center";
 
-            mask_div.style.width = defaultSettings.watermark_width + "px";
+            mask_div.style.width = 'auto';
 
             mask_div.style.height = defaultSettings.watermark_width + "px";
 

package/src/components/preview/newPositionPreview.vue

@@ -18,9 +18,9 @@
       ></excel-view>
       <pdf-view v-else-if="fileType === 'PDF'" ref="pdfView" :split_paragraphs="splitParagraph" :ossPath="url" :isPC="isPC" :textWatermarkStr="textWatermarkStr"></pdf-view>
       <mark-down-view v-else-if="fileType === 'MD'" :url="url" :split_paragraphs="splitParagraph" :textWatermarkStr="textWatermarkStr"></mark-down-view>
-      <div v-else-if="fileType === 'URL'">
-        <div class="preview_iframe_html" style="text-align:left" v-html="fileText"></div>
-      </div>
+      <template v-else-if="fileType === 'URL'">
+        <div class="preview_iframe_html" id="preview_iframe_html" style="text-align:left" v-html="fileText"></div>
+      </template>
     </div>
     <template v-if="splitParagraph.length > 1 && fileType !== 'XLS' && fileType !== 'XLSX'">
       <div class="btn_footer" v-if="!isPC">
@@ -42,6 +42,7 @@ import DocView from "./docView";
 import ExcelView from "./excelView";
 import PdfView from "./pdfView";
 import MarkDownView from "./markDownView";
+import { newInitWaterMark } from "../../assets/js/common";
 export default {
   name: "newPositionPreview",
   components: { MarkDownView, PdfView, ExcelView, DocView },
@@ -287,6 +288,9 @@ export default {
             dom.style.backgroundImage = 'none';
           }
           this.setColor()
+          if (this.textWatermarkStr){
+            newInitWaterMark('preview_iframe_html',this.textWatermarkStr)
+          }
         })
         this.$emit('loadingSuccess');
         return;
@@ -313,6 +317,9 @@ export default {
                   dom.style.backgroundImage = 'none';
                 }
                 this.setColor()
+                if (this.textWatermarkStr){
+                  newInitWaterMark('preview_iframe_html',this.textWatermarkStr)
+                }
               })
               this.$emit('loadingSuccess');
             }
@@ -329,6 +336,9 @@ export default {
                 dom.style.backgroundImage = 'none';
               }
               this.setColor()
+              if (this.textWatermarkStr){
+                newInitWaterMark('preview_iframe_html',this.textWatermarkStr)
+              }
             })
             this.$emit('loadingSuccess');
           }

package/src/components/preview/pdfView.vue

@@ -307,9 +307,6 @@ export default {
         // 将文本 div 添加到覆盖层中
         let pagesDiv = document.getElementById('canvas-wrapper' + pageIndex);
         pagesDiv.appendChild(textDiv)
-        if (this.textWatermarkStr){
-          newInitWaterMark('canvas-wrapper' + pageIndex, this.textWatermarkStr)
-        }
       })
       this.renderInProgress = false;
       this.$set(pageData,'loading',false)
@@ -645,6 +642,9 @@ export default {
     console.log('ossPath',this.ossPath)
     // this.clearPages();
     // this.loadPdf();
+    if (this.textWatermarkStr){
+      newInitWaterMark('pdfViewPage', this.textWatermarkStr)
+    }
   },
   beforeDestroy() {
     window.removeEventListener("resize", this.onResize);