askbot-dragon 1.6.19-beta → 1.6.20-beta

package/package.json

@@ -1,14 +1,17 @@
 {
   "name": "askbot-dragon",
-  "version": "1.6.19-beta",
+  "version": "1.6.20-beta",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
+    "@ckeditor/ckeditor5-ui": "^10.1.0",
+    "@ckeditor/ckeditor5-vue2": "^3.0.1",
     "ali-oss": "^6.2.1",
     "audio-loader": "^1.0.3",
+    "ckeditor": "^4.12.1",
     "core-js": "^3.6.5",
     "install": "^0.13.0",
     "jquery": "^3.5.1",

package/public/index.html

@@ -23,11 +23,13 @@
         });
       }
     </script>
+    <script src="https://guoranopen-zjk.oss-cn-zhangjiakou.aliyuncs.com/ckeditor5-build-classic/0.4.4/ckeditor.js"></script>
     <!-- 项目图标 -->
     <link rel="stylesheet"  href="//at.alicdn.com/t/font_1566110_3hu6pyd938i.css"/>
     <!-- guoran图标 -->
     <link rel="stylesheet"  href="//at.alicdn.com/t/c/font_2913049_qtm7orae3l.css"/>
     <script src="https://res.wx.qq.com/open/js/jweixin-1.2.0.js"></script>
+    <!-- <script src="https://static.guoranbot.com/ckeditor5-build-classic/0.3.7/build/ckeditor.js"></script> -->
     
     <!-- vue -->
     <!-- <script src="https://static.guoranbot.com/vue/2.6.11/dist/vue.min.js"></script>

package/src/assets/js/hammer.js

@@ -3,6 +3,15 @@ export function zoomElement (el) {
 	let store = {
 		scale: 1
 	};
+	if (!el){
+		return
+	}
+	let scale = 1;
+	if (el.style.transform){
+		let transForm = el.style.transform;
+		var values = transForm.split('(')[1].split(')')[0].split(',');
+		scale = values[0] ? values[0] : 1
+	}
 	// 缩放事件的处理
 	el.addEventListener('touchstart', function (event) {
 		let touches = event.touches;
@@ -67,13 +76,15 @@ export function zoomElement (el) {
 				newScale = 3;
 			}
 			// 最小缩放比例限制
-			if(newScale < 1) {
-				newScale = 1;
+			if(newScale < scale) {
+				newScale = scale;
 			}
 			// 记住使用的缩放值
 			store.scale = newScale;
 			// 图像应用缩放效果
 			el.style.transform = 'scale(' + newScale + ')';
+			el.style.transformOrigin = 'top left'
+
 		}
 	});
 	document.addEventListener('touchend', function () {

package/src/assets/less/converSationContainer/common.less

@@ -35,6 +35,13 @@
     border-radius: 6px;
     background-color: #bfceec !important;
 }
+@media screen and (max-width: 767px){
+    ::-webkit-scrollbar {
+        width: 0;
+        height: 0;
+        background-color:@system_bordercolor_4;
+    }
+}
 
 // 弹窗body
 .el-dialog__body{

package/src/components/ActionAlertIframe.vue

@@ -26,7 +26,7 @@
                 class="grzh-iframe"
                 :src="actionAlertIframe.template"
                 width="100%"
-                height="95%"
+                height="90%"
                 :scrolling="actionAlertIframe.scrolling"
                 frameborder="no"
                 border="0"
@@ -87,6 +87,29 @@ export default {
           this.actionAlertIframe.template = this.actionAlertIframe.template  + "&iframeId=" + this.tampId
         }
         this.actionAlertIframe.template = this.actionAlertIframe.template.split("&").join("&")
+
+        // 监听回退事件
+        let _that = this;
+
+        (function () {
+            console.log(95, 'addEventListener window.onpopstate');
+            if (window.history && window.history.pushState) {
+                console.log(97, 'window.history && window.history.pushState');
+                window.onpopstate = function (e) {
+                    console.log(9999, 'window.onpopstate innner', e);
+                    if (_that.showAskFullScreen) {
+                        window.history.go(1);
+                    }
+                    // window.history.pushState('forward', null, '');
+                    // window.history.forward(1);
+                    _that.showAskFullScreen = false;
+                    if ( e && e.stopPropagation ) {
+                        console.log(105, 'e.stopPropagation');
+                        e.stopPropagation();
+                    }
+                };
+            }
+        })();
     },
 };
 </script>

package/src/components/AiGuide.vue

@@ -16,7 +16,7 @@
                 <span v-html="aiGuide.content.description"></span>
             </div>
             <!-- 一级分类 -->
-            <div v-show="aiGuide.content.typesVisible" class="ig-types-f">
+            <div v-show="aiGuide.content.typesVisible && aiGuide.content.options && aiGuide.content.options.length > 0" class="ig-types-f">
                 <span
                     v-for="(fType, fTypeIndex) in aiGuide.content.options"
                     :key="`f_${fTypeIndex}`"
@@ -31,9 +31,7 @@
                 >
             </div>
             <!-- 二级分类 -->
-            <div v-show="aiGuide.content.typesVisible && aiGuide.content.options[
-                        activeFirstTypeIndex
-                    ].types.length !== 0" class="ig-types-s">
+           <div v-if="aiGuide.content.typesVisible && aiGuide.content.options[activeFirstTypeIndex] && aiGuide.content.options[activeFirstTypeIndex].types && aiGuide.content.options[activeFirstTypeIndex].types.length !== 0" class="ig-types-s">
                 <span
                     v-for="(sType, sTypeIndex) in aiGuide.content.options[
                         activeFirstTypeIndex
@@ -234,11 +232,11 @@ export default {
     beforeMount() {},
     mounted() {
         this.isMobile();
-        if (this.aiGuide.content.options[0].types.length === 0) {
+        if (this.aiGuide.content.options[0] && this.aiGuide.content.options[0] && this.aiGuide.content.options[0].types && this.aiGuide.content.options[0].types.length === 0) {
             this.activeOtherObj = this.aiGuide.content.options[0];
         } else {
             this.activeSecondTypeIndex = 0;
-            this.activeOtherObj = this.aiGuide.content.options[0].types[0];
+            this.activeOtherObj = this.aiGuide.content.options[0] && this.aiGuide.content.options[0].types && this.aiGuide.content.options[0].types[0] ? this.aiGuide.content.options[0].types[0] : [];
         }
     },
     methods: {

package/src/components/AnswerDocknowledge.vue

@@ -70,7 +70,7 @@
                 </div>
             </div>
         </div>
-        <previewPdf ref="previewPdf" :url="previewHref" :sourceFileType="sourceFileType" officePreviewType="pdf"></previewPdf>
+        <previewPdf ref="previewPdf" :url="previewHref" :watermark="watermark" :sourceFileType="sourceFileType" officePreviewType="pdf"></previewPdf>
     </div>
 </template>
   
@@ -154,6 +154,11 @@ export default {
               MP3: "audio",
               yqhtml: "yqhtml",
               feishuhtml:"feishuhtml"
+            },
+            watermark: {
+              textWatermarkValue:'',
+              visitorWatermarkValue:'',
+              source:""
             }
         }
     },
@@ -201,6 +206,9 @@ export default {
     methods: {
         //预览图片
         lookAttach(url, item, event) {
+          // console.log(item.knowledgeId);
+          // this.$http.get("/knowledge-api/internal/knowledgeBaseStructure/" + "642ffbccde420e2772f7787b")
+          // debugger
           event.preventDefault();
           if (this.isAskLightning == 1 && !this.isApp){
             window.parent.postMessage({
@@ -233,8 +241,10 @@ export default {
             }
             this.$http.post(httpUrl, {
               "fileInOssPath":url
-            }).then(res =>{
+            }).then(async res =>{
               if(res.data.code == '0') {
+                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')
@@ -247,7 +257,18 @@ export default {
                 }
                 this.$refs.previewPdf.fileType = type
                 this.$refs.previewPdf.tagIds = item.tagIds
-                this.$refs.previewPdf.isMessageRecord = this.isMessageRecord ? true : false 
+                this.$refs.previewPdf.isMessageRecord = this.isMessageRecord ? true : false ;
+                let index = url.indexOf("?");
+                let newFileInOssPath = url;
+                if (index !== -1){
+                  newFileInOssPath =  url.substring(0, url.indexOf("?"))
+                }
+                let fileName = newFileInOssPath.substring(newFileInOssPath.lastIndexOf('.'))
+                if (fileName === '.doc' || fileName === '.docx' || fileName === '.txt'|| fileName === '.html'){
+                  this.$refs.previewPdf.fileName = fileName;
+                } else {
+                  this.$refs.previewPdf.fileName = '';
+                }
                 if(item.tagIds && item.tagIds.length != 0) {
                   this.$refs.previewPdf.loading = false
                   return
@@ -298,6 +319,24 @@ export default {
               // return res.data
             })
           // return imgurl
+        },
+        async getknowledgeBaseStructure(knowledgeId) {
+          let watermark = {
+            textWatermarkValue:'',
+            visitorWatermarkValue:''
+          }
+          await this.$http.get("/knowledge-api/internal/knowledgeBaseStructure/" + knowledgeId).then( async res =>{
+            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
+                }
+              }
+            }
+          })
+          return watermark
         }
     }
 }
@@ -408,6 +447,8 @@ export default {
                   }
                 }
                 .alc-box-introduction-previewImage {
+                  width: 100%;
+                  display: block;
                   overflow: hidden;
                   text-overflow: ellipsis;
                   display: -webkit-box;

package/src/components/ConversationContainer.vue

@@ -12,15 +12,15 @@
         <loading-process :dataNote="dataNote" :finished="finished"></loading-process>
       </div>
     </div> -->
-    <MyEditor></MyEditor>
+
     <!-- <form-template
          :formList="formList2"
          @submitClick="submitClick"
      ></form-template> -->
-    <form-template
+    <!-- <form-template
          :formList="formList"
          @submitClick="submitClick"
-     ></form-template>
+     ></form-template> -->
     <!-- <form-template
          :formList="formList3"
          @submitClick="submitClick"
@@ -77,11 +77,11 @@
 </template>
 <script>
 import TextMessage from '@/components/message/TextMessage'
-import FormTemplate from "@/components/formTemplate";
+// import FormTemplate from "@/components/formTemplate";
 
 /*import FormTemplate from "@/components/formTemplate";
 import TextMessage from "@/components/message/TextMessage";*/
-import MyEditor from '@/components/MyEditor'
+
 //  import FormTemplate from '@/components/formTemplate'
 import AnswerRadio from './answerRadio'
 // import TicketMessage from './message/TicketMessage'
@@ -119,7 +119,7 @@ export default {
     // LoadingProcess,
     // MsgLoading,
     // ActionSatisfaction,
-    AssociationIntention,
+     AssociationIntention,
     /* VoiceComponent,*/
     TicketMessage,
     // AsserDeatils,
@@ -130,12 +130,11 @@ export default {
     // VoiceCompontent,
     AiGuide,
     AnswerVoice,
-    FormTemplate,
+    //  FormTemplate,
     // FormTemplate,
     // FileType,
     // ChatContent,
     AnswerDocknowledge,
-    MyEditor
   },
   props: {
     messages: Array
@@ -212,7 +211,7 @@ export default {
                             "knowledgeId": "658a93de63d378228271913a",
                             "knowledgePartId": "ypZaqYwBD3jzLtPbz5K8",
                             "from": "ppt_preview",
-                            "introduction": "Spark是什么Spark 是一个开源的大数据处理引擎，它提供了一整套开发 API，包括流计算和机器学习。它支持批处理和流处理。Spark 的一个显著特点是它能够在内存中进行迭代计算，从而加快数据处理速度。尽管 Spark 是用 Scala 开发的，但它也为 Java、Scala、Python 和 R 等高级编程语言提供了开发接口。",
+                            "introduction": "Spark是什么Spark 是一个开源的大数据处理引擎，它提供了一整套开发 API，。",
                             "previewImage": "https://askbot-pdf-all.oss-cn-zhangjiakou.aliyuncs.com/31623ccfe9dd4957bbd59c5823878bbe/2023/12/27/03/39/08/658b9c477cf604285f7cb81d/pdf-image-1913302477976388839.png"
                         }
                     ],
@@ -4653,6 +4652,7 @@ export default {
             url:
               'https://guoranopen-zjk.oss-cn-zhangjiakou.aliyuncs.com/2021/08/24/07/35/41221223-c180-4f3f-bdc8-94875b693965/WeChat_20210719215122.mp4',
             videoFlag: false,
+            nodownload: false,
             videoUploadPercent: 0,
             isShowUploadVideo: true,
             recommend: {

package/src/components/askVideo.vue

@@ -15,13 +15,16 @@
                 :controlslist="nodownload&&'nodownload'"
                 :raw-controls="true"
                 x5-video-player-type="h5-page"
-                style="object-fit: contain;width: calc(100vw - 139px);height: 160px;background-color: black;border-radius: 25px;max-width: 230px;padding-left: 10px"
+                style="object-fit: contain;width: calc(100vw - 169px);height: 160px;background-color: black;border-radius: 25px;max-width: 200px;padding-left: 10px"
                 preload
                 :poster="videoSrc+'?spm=qipa250&x-oss-process=video/snapshot,t_1000,f_jpg,w_0,h_0,m_fast'"
                 class="video-player vjs-custom-skin"
                 :id="msg.id+'key'">
           <source :src="videoSrc"/>
         </video>
+        <div v-show="!nodownload" class="dragon-video-download">
+          <a :href="msg.content.url" download><span class="el-icon-download"></span></a>
+        </div>
       <div id="output"></div>
     </div>
 </template>
@@ -123,6 +126,8 @@
 video::-webkit-media-controls-mute-button { display: none !important;}
 #dragon-video{
   position: relative;
+  width: calc(100vw - 109px);
+  max-width: 260px;
   #outputVideo{
     position: absolute;
     top: 0px;
@@ -134,6 +139,24 @@ video::-webkit-media-controls-mute-button { display: none !important;}
     }
 
   }
+  .dragon-video-download{
+    position: absolute;
+    width: 40px;
+    height: 26px;
+    background-color: rgba(54, 106, 255, 0.5);
+    border-radius: 13px;
+    text-align: center;
+    bottom: 2px;
+    right: 6px;
+    a {
+      span {
+        height: 26px;
+        line-height: 26px;
+        display: block;
+        color: white;
+      }
+    }
+  }
 }
 
 </style>

package/src/components/associationIntention.vue

@@ -233,7 +233,7 @@
         this.$emit("onRadioClick", id, name, apikey,optionApiKey);
       },
       onImageClick(url){
-        this.$emit('onImageClick',url)
+        this.$emit('onImageClick', encodeURI(url))
       },
       msgContent(content){
         console.debug('215',content)
@@ -343,6 +343,12 @@
       display: block;
     }
   }
+  /deep/ img {
+    height: auto;
+    width: calc(100vw - 137px);
+    border-radius: 25px;
+    max-width: 230px;
+  }
 }
 /deep/.el-drawer__body{
   height: 100%;

package/src/components/formTemplate.vue

@@ -63,20 +63,13 @@
                     v-if="item.formField.type==='TEXTAREA'&& item.fieldId!=='workorder_description'"
           ></el-input>
           <div v-else-if="item.fieldId === 'workorder_description'">
-            <!-- <ckeditor
+            <ckeditor
               :editor="ckeditor.editor"
               v-model="item.value"
               :config="{...ckeditor.editorConfig,placeholder:item.formField.extInfo && item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请输入'}"
               @ready="(editor)=>currentEditor=editor"
               @focus="(zh,editor)=>currentEditor=editor"
-            ></ckeditor> -->
-            <MyEditor 
-              v-model="item.value" 
-              :placeholder="item.formField.extInfo && item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请输入'"
-              @fileUploadCallback="desUploadImageAndFile"
-              :havToolbar="mainId !== '8b9bd566e3e64156ab764b19defc9d48' && mainId !== '0b73521f96e4486aaf6be42932bd7b07'">
-            </MyEditor>
-            <!-- @input="(value) =>{item.value = value}" -->
+            ></ckeditor>
             <file-list-view  :attachmentList="attachmentList" @attachDeleteAttch="attachDeleteAttch"></file-list-view>
           </div>
           <el-date-picker
@@ -352,20 +345,13 @@
                 <i class="el-icon-warning-outline"></i>
               </span>
             </div>
-            <!-- <ckeditor
+            <ckeditor
                 :editor="ckeditor.editor"
                 v-model="item.value"
                 @ready="(editor)=>currentEditor=editor"
                 @focus="(zh,editor)=>currentEditor=editor"
                 :config="{...ckeditor.editorConfig,placeholder:item.formField.extInfo && item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请输入'}"
-            ></ckeditor> -->
-            <MyEditor 
-              v-model="item.value" 
-              :placeholder="item.formField.extInfo && item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请输入'"
-              @fileUploadCallback="desUploadImageAndFile"
-              :havToolbar="mainId !== '8b9bd566e3e64156ab764b19defc9d48' && mainId !== '0b73521f96e4486aaf6be42932bd7b07' "
-              >
-            </MyEditor>
+            ></ckeditor>
             <file-list-view :attachmentList="attachmentList" @attachDeleteAttch="attachDeleteAttch"></file-list-view>
           </div>
         </div>
@@ -861,9 +847,14 @@
 <script>
 /* eslint-disable */
 import { forMatTime } from "./utils/format_date";
+
 let that
 import {multipartUpload,ossFileUrl} from "./utils/AliyunIssUtil";
-import MyEditor from './MyEditor'
+import {MyCustomUploadAdapterPlugin} from "./utils/ckeditor";
+// import MyimageUpload from './utils/ckeditorImageUpload/plugin-image'
+import MyFileUpload from './utils/ckeditorfileUpload/plugin_file'
+import CKEDITOR from 'ckeditor'
+
 import myPopup from "./myPopup.vue";
 import Tree from '../components/tree'
 import selectPopup from '../components/popup'
@@ -953,6 +944,21 @@ export default {
       },
       hideUploadEdit:false,
       limitNum:1,
+      ckeditor: {
+        editor: CKEDITOR.ClassicEditor,
+        editorConfig: {
+          extraPlugins: [MyFileUpload,MyCustomUploadAdapterPlugin],
+          toolbar: [
+            'MyFileUpload'
+          ],
+          askPluginListener:[
+            {
+              event: 'UPLOAD',
+              process: this.desUploadImageAndFile,
+            }
+          ]
+        },
+      },
       refShowPicker:false,
       refTemplateList:{},
       refList:{},
@@ -1194,8 +1200,7 @@ export default {
     myPopup,
     Tree,
     selectPopup,
-    fileListView,
-    MyEditor
+    fileListView
   },
   mounted() {
     
@@ -1214,10 +1219,9 @@ export default {
     //       }
     //     })
     // }
-    // if (this.mainId == '8b9bd566e3e64156ab764b19defc9d48' || this.mainId == '0b73521f96e4486aaf6be42932bd7b07'){
-    //   this.ckeditor.editorConfig.toolbar = []
-
-    // }
+    if (this.mainId == '8b9bd566e3e64156ab764b19defc9d48' || this.mainId == '0b73521f96e4486aaf6be42932bd7b07'){
+      this.ckeditor.editorConfig.toolbar = []
+    }
     if (this.mainId == '90df4764122240de939331d372546c28'){
       this.isBaiLi = true;
     }