askbot-dragon 1.8.21-beta → 1.8.23-beta

package/package.json

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

package/src/assets/js/common.js

@@ -147,7 +147,7 @@ function newInitWaterMark(elId, textValue) {
 
     //获取页面最大高度
     var page_height = document.getElementById(elId).scrollHeight;
-    console.log('page_height',page_height, page_width,document.getElementById('docView').clientHeight);
+    console.log('page_height',page_height, page_width);
 
     // var page_height = Math.max(document.body.scrollHeight, document.body.clientHeight);
 
@@ -240,11 +240,7 @@ function newInitWaterMark(elId, textValue) {
 
             mask_div.style.width = defaultSettings.watermark_width + "px";
 
-            if (elId === 'docHtml'){
-                mask_div.style.height = document.getElementById('docView').clientHeight + "px";
-            } else {
-                mask_div.style.height = defaultSettings.watermark_width + "px";
-            }
+            mask_div.style.height = defaultSettings.watermark_width + "px";
 
             mask_div.style.display = "block";
 

package/src/components/AiGuide.vue

@@ -314,7 +314,7 @@ export default {
             }
 
             &-active {
-                background-color: @background-content-color;
+                background-color: @primary-color;
                 border: 1px solid @border-color-primary;
                 color: @font-primary-light-color;
             }

package/src/components/preview/docView.vue

@@ -84,6 +84,11 @@ export default {
               paragraphs.forEach(paragraph => {
                 paragraph.style.background = this.colors[colorIndex]
               })
+            } else if (this.fileSuffix === 'HTML'){
+              const paragraphs = this.$el.querySelectorAll(`[data-paragraph-id="${items.paragraph_id}"]`);
+              paragraphs.forEach(paragraph => {
+                paragraph.style.background = this.colors[colorIndex]
+              })
             } else if (dom){
               dom.style.background = this.colors[colorIndex];
             }

package/src/components/preview/markDownView.vue

@@ -0,0 +1,70 @@
+<template>
+  <div class="downView">
+    <div class="mark_down" id="mark_down" ref="markDown" v-html="compiledMarkdown">
+    </div>
+  </div>
+</template>
+
+<script>
+import hljs from "highlight.js";
+import { newInitWaterMark } from "../../assets/js/common";
+
+const marked = require("marked")
+export default {
+  name: "markDownView",
+  data(){
+    return{
+      markdownContent:"",
+      compiledMarkdown:""
+    }
+  },
+  props:{
+    url:{
+      type:String,
+      default:""
+    },
+    textWatermarkStr:{
+      type:String,
+      default:""
+    }
+  },
+  computed:{
+
+  },
+  mounted(){
+    this.$http.get(this.url).then(res => {
+      console.log('getMdText',res)
+      let markdown = marked.marked(res.bodyText, {
+        breaks: true
+      })
+      this.compiledMarkdown = this.parseCode(markdown, "content");
+      setTimeout(() => {
+        if (this.textWatermarkStr){
+          newInitWaterMark('mark_down',this.textWatermarkStr)
+        }
+      },500)
+    })
+  },
+  methods:{
+    parseCode(markDownText) {
+      const parser = new DOMParser();
+      const doc = parser.parseFromString(markDownText, 'text/html');
+      doc.querySelectorAll('pre code').forEach((block) => {
+        hljs.highlightBlock(block);
+      });
+      return doc.documentElement.outerHTML
+    },
+  }
+};
+</script>
+
+<style scoped lang="less">
+.downView{
+  width: 100%;
+  flex: none;
+  box-sizing: border-box;
+  .mark_down{
+    position: relative;
+  }
+}
+</style>

package/src/components/preview/newPositionPreview.vue

@@ -17,6 +17,7 @@
                   :textWatermarkStr="textWatermarkStr"
       ></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>
     <template v-if="splitParagraph.length > 1 && fileType !== 'XLS' && fileType !== 'XLSX'">
       <div class="btn_footer" v-if="!isPC">
@@ -37,9 +38,10 @@
 import DocView from "./docView";
 import ExcelView from "./excelView";
 import PdfView from "./pdfView";
+import MarkDownView from "./markDownView";
 export default {
   name: "newPositionPreview",
-  components: { PdfView, ExcelView, DocView },
+  components: { MarkDownView, PdfView, ExcelView, DocView },
   data(){
     return{
       tagId:[],

package/src/components/previewPdf.vue

@@ -5,7 +5,7 @@
 -->
 <template>
     <el-drawer title="" :visible.sync="drawer" :with-header="false" :append-to-body="true" :destroy-on-close="true"
-        :modal="false" :direction="previewShowPopup ? 'btt' : 'rtl'" :size="previewShowPopup ? '90%' : '65%'"
+        :modal="false" :direction="!isPc ? 'btt' : 'rtl'" :size="!isPc ? '90%' : '65%'"
         custom-class="pdf-preview-drawer" v-if="drawer">
         <div class="drawer-header"
             :class="(isDownload || (isHasChat && fileType != 'IMAGE')) && isLiBang ? 'has_btn_libang_head' : (isLiBang ? 'libang_head' : (isDownload || (isHasChat && fileType != 'IMAGE') ? 'has_btn_head' : ''))"
@@ -104,7 +104,7 @@
                 </pdfPosition>
             </div>
             <new-position-preview ref="newPositionPreview"
-                v-else-if="tagIds && tagIds.length != 0 && newVersion && newFileType !== 'PPT'"
+                v-else-if="tagIds && tagIds.length != 0 && newVersion && newFileType !== 'PPT' && newFileType !== 'IMAGE'"
                 :textWatermarkStr="textWatermarkStr"
                 :knowledgeId="knowledgeId" :tagIds="tagIds" :url="previewHref"></new-position-preview>
             <template v-else>
@@ -354,7 +354,7 @@ export default {
             this.showSummary = false;
         },
         loadIframe() {
-            if (this.fileType == 'VIDEO' || this.fileType == 'WECHAT' || (this.tagIds && this.tagIds.length != 0 && this.newFileType !== 'PPT')) {
+            if (this.fileType == 'VIDEO' || this.fileType == 'WECHAT' || (this.tagIds && this.tagIds.length != 0 && this.newFileType !== 'PPT'&& this.newFileType !== 'IMAGE')) {
                 this.loading = false
             } else {
                 let iframe = document.getElementsByClassName('preview_iframe')[0] || document.getElementsByClassName('preview_iframe_kk')[0];
@@ -519,17 +519,20 @@ export default {
             if (/(iPhone|iPad|iPod|iOS|Android)/i.test(navigator.userAgent)) {
                 this.isPc = false
             } else {
-                this.isPc = true
+                let documentWidth = document.documentElement.clientWidth;
+        if(documentWidth < 750) {
+            this.isPc = false
+        } else {this.isPc = true
             }
-        },
-        clickFloder() {
+        }
+        },clickFloder() {
             this.$emit('previewClickFloder')
         },
         getOssPath(url) {
             let httpUrl = '/knowledge-api/knowledge/getTemporaryCertificate';
             let type = this.getFileType(url)
             this.newFileType = type;
-            if (type === 'VIDEO' || type === 'PDF' || type === 'EXCEL' || type === 'TXT' || type === 'DOC') {
+            if (type === 'VIDEO' || type === 'PDF' || type === 'EXCEL' || type === 'TXT' || type === 'DOC'|| type === 'MD') {
                 httpUrl += '?needEncrypt=false'
             } else {
                 httpUrl += '?needEncrypt=true'
@@ -563,7 +566,8 @@ export default {
             } else if (fileType === '.pdf') {
                 return 'PDF'
             } else if (fileType === '.txt') {
-                return 'TXT'
+                return 'TXT'} else if (fileType === '.md'){
+        return 'MD'
             } else {
                 return 'OTHER'
             }
@@ -577,7 +581,7 @@ export default {
                 if (res.data.code == 0) {
                     if (res.data.data && res.data.data.length > 0 && res.data.data[0].extractVersion == 'v3') {
                         this.newVersion = true;
-                        if (this.newFileType !== 'PPT') {
+                        if (this.newFileType !== 'PPT'|| this.newFileType !== 'IMAGE') {
                             this.loading = false;
                         }
                         for (let i = 0; i < res.data.data.length; i++) {