askbot-dragon 1.6.15-beta → 1.6.16-beta

package/package.json

@@ -1,17 +1,14 @@
 {
   "name": "askbot-dragon",
-  "version": "1.6.15-beta",
+  "version": "1.6.16-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,7 +23,7 @@
         });
       }
     </script>
-    <script src="https://guoranopen-zjk.oss-cn-zhangjiakou.aliyuncs.com/ckeditor5-build-classic/0.4.4/ckeditor.js"></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图标 -->

package/src/assets/js/hammer.js

@@ -3,15 +3,6 @@ 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;
@@ -76,15 +67,13 @@ export function zoomElement (el) {
 				newScale = 3;
 			}
 			// 最小缩放比例限制
-			if(newScale < scale) {
-				newScale = scale;
+			if(newScale < 1) {
+				newScale = 1;
 			}
 			// 记住使用的缩放值
 			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,13 +35,6 @@
     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="90%"
+                height="95%"
                 :scrolling="actionAlertIframe.scrolling"
                 frameborder="no"
                 border="0"
@@ -87,29 +87,6 @@ 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 && aiGuide.content.options && aiGuide.content.options.length > 0" class="ig-types-f">
+            <div v-show="aiGuide.content.typesVisible" class="ig-types-f">
                 <span
                     v-for="(fType, fTypeIndex) in aiGuide.content.options"
                     :key="`f_${fTypeIndex}`"
@@ -31,7 +31,9 @@
                 >
             </div>
             <!-- 二级分类 -->
-           <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">
+            <div v-show="aiGuide.content.typesVisible && aiGuide.content.options[
+                        activeFirstTypeIndex
+                    ].types.length !== 0" class="ig-types-s">
                 <span
                     v-for="(sType, sTypeIndex) in aiGuide.content.options[
                         activeFirstTypeIndex
@@ -232,11 +234,11 @@ export default {
     beforeMount() {},
     mounted() {
         this.isMobile();
-        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) {
+        if (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] && this.aiGuide.content.options[0].types && this.aiGuide.content.options[0].types[0] ? this.aiGuide.content.options[0].types[0] : [];
+            this.activeOtherObj = 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" :watermark="watermark" :sourceFileType="sourceFileType" officePreviewType="pdf"></previewPdf>
+        <previewPdf ref="previewPdf" :url="previewHref" :sourceFileType="sourceFileType" officePreviewType="pdf"></previewPdf>
     </div>
 </template>
   
@@ -154,11 +154,6 @@ export default {
               MP3: "audio",
               yqhtml: "yqhtml",
               feishuhtml:"feishuhtml"
-            },
-            watermark: {
-              textWatermarkValue:'',
-              visitorWatermarkValue:'',
-              source:""
             }
         }
     },
@@ -206,9 +201,6 @@ 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({
@@ -241,10 +233,8 @@ export default {
             }
             this.$http.post(httpUrl, {
               "fileInOssPath":url
-            }).then(async res =>{
+            }).then(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')
@@ -257,18 +247,7 @@ export default {
                 }
                 this.$refs.previewPdf.fileType = type
                 this.$refs.previewPdf.tagIds = item.tagIds
-                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 = '';
-                }
+                this.$refs.previewPdf.isMessageRecord = this.isMessageRecord ? true : false 
                 if(item.tagIds && item.tagIds.length != 0) {
                   this.$refs.previewPdf.loading = false
                   return
@@ -319,24 +298,6 @@ 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
         }
     }
 }
@@ -447,8 +408,6 @@ 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,11 +130,12 @@ export default {
     // VoiceCompontent,
     AiGuide,
     AnswerVoice,
-    //  FormTemplate,
+    FormTemplate,
     // FormTemplate,
     // FileType,
     // ChatContent,
     AnswerDocknowledge,
+    MyEditor
   },
   props: {
     messages: Array
@@ -211,7 +212,7 @@ export default {
                             "knowledgeId": "658a93de63d378228271913a",
                             "knowledgePartId": "ypZaqYwBD3jzLtPbz5K8",
                             "from": "ppt_preview",
-                            "introduction": "Spark是什么Spark 是一个开源的大数据处理引擎，它提供了一整套开发 API，。",
+                            "introduction": "Spark是什么Spark 是一个开源的大数据处理引擎，它提供了一整套开发 API，包括流计算和机器学习。它支持批处理和流处理。Spark 的一个显著特点是它能够在内存中进行迭代计算，从而加快数据处理速度。尽管 Spark 是用 Scala 开发的，但它也为 Java、Scala、Python 和 R 等高级编程语言提供了开发接口。",
                             "previewImage": "https://askbot-pdf-all.oss-cn-zhangjiakou.aliyuncs.com/31623ccfe9dd4957bbd59c5823878bbe/2023/12/27/03/39/08/658b9c477cf604285f7cb81d/pdf-image-1913302477976388839.png"
                         }
                     ],
@@ -4652,7 +4653,6 @@ 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/MyEditor.vue

@@ -0,0 +1,345 @@
+<template>
+    <div class="my_editor">
+        <div class="editor_head" v-if="havToolbar">
+            <button class="button" @click="handleUpdate">
+                <svg
+                    t="1703581982515"
+                    class="icon"
+                    viewBox="0 0 1024 1024"
+                    version="1.1"
+                    xmlns="http://www.w3.org/2000/svg"
+                    p-id="74840"
+                    width="200"
+                    height="200"
+                >
+                    <path
+                        d="M566.839921 866.857572V983.050833c0 22.522042-7.677969 33.271198-29.688146 37.877979-18.427125 4.094917-37.366115 3.583052-55.281375-2.047458-17.403396-5.63051-24.057636-15.867802-24.057636-33.271198v-410.003534c0-7.166104-1.535594-9.213563-9.213562-9.213562-80.36274 0.511865-330.152658 0-410.515399 0-19.450854 0-29.688146-7.166104-34.294927-26.105094-5.118646-19.450854-5.118646-39.925438 0.511865-58.864427 5.118646-16.891531 15.355938-23.545771 32.759333-23.545771h412.562857c7.166104 0 8.189833-1.535594 8.189833-8.189834V41.219994c0-25.081365 7.166104-34.806792 32.247469-38.901708 18.93899-3.583052 38.389844-3.583052 56.305105 4.094917 13.820344 5.63051 20.474583 15.867802 20.474583 30.711875v412.562856c0 6.65424 1.535594 8.189833 8.189833 8.189834h406.932346c23.545771 0 33.783063 7.677969 38.901709 30.711875 4.094917 18.427125 4.094917 37.366115-2.047458 55.281375-5.118646 16.379667-15.355938 23.033906-32.247469 23.033907h-410.515398c-7.166104 0-10.237292 1.023729-9.725428 9.725427 0.511865 40.437302 0.511865 249.789918 0.511865 290.22722z"
+                        p-id="74841"
+                    />
+                </svg>
+                上传图片或附件
+            </button>
+        </div>
+        <div
+            class="editor_content"
+            id="my_editor_content"
+            v-html="text"
+            contenteditable
+            ref="editorContent"
+            @focus="ischecked = true"
+            @blur="blurFn"
+            @input="changeInput"
+            :data-placeholder="placeholder"
+        ></div>
+    </div>
+</template>
+
+<script>
+import { v4 as uuidv4 } from "uuid";
+import { multipartUpload, ossFileUrl } from "./utils/AliyunIssUtil";
+
+export default {
+    props: ["value", "placeholder", "havToolbar"],
+    data () {
+        return {
+            ossConfig: {
+                region: "oss-cn-zhangjiakou",
+                //云账号AccessKey有所有API访问权限，建议遵循阿里云安全最佳实践，创建并使用STS方式来进行API访问
+                accessKeyId: "LTAI4G3QtdEdwkEbihBngAsK",
+                accessKeySecret: "OwgdVfc5PeCkIgqIdug660xmiSPchn",
+                // stsToken: '<Your securityToken(STS)>',
+                bucket: "guoranopen-zjk",
+            },
+            ischecked: false,
+            text: ''
+        }
+    },
+    watch: {
+        value () {
+            // 解决光标跳动BUG
+            if (!this.ischecked) {
+                this.text = this.value
+            }
+        }
+    },
+    methods: {
+        blurFn (e) {
+            this.ischecked = false
+            this.text = this.value
+            e.view.blur()
+        },
+        changeInput (e) {
+            this.$emit("input", e.target.innerHTML)
+        },
+        handleUpdate () {
+            let inputObj = document.createElement('input')
+            inputObj.setAttribute('id', '_ef');
+            inputObj.setAttribute('type', 'file');
+            inputObj.setAttribute('accept', '*')
+            inputObj.setAttribute('multiple', true)
+            inputObj.setAttribute("style", 'visibility:hidden');
+            document.body.appendChild(inputObj);
+            inputObj.click();
+            inputObj.onchange = () => {
+                // 循环上传文件
+                let files = inputObj.files;
+                for (let index = 0; index < files.length; index++) {
+                    const file = files[index];
+                    let uid = uuidv4()
+                    // let command = this.editor.commands.get("insertAskComponent");
+                    // const listeners = this.editor.config.get('askPluginListener');
+                    // let beforeButtonInsert = findListener(listeners, "UPLOAD");
+                    if (file.type.includes('image')) {
+                        // if (this.editor.uploadImg) {
+                        //     this.editor.uploadImg.push(uid)
+                        // } else {
+                        //     this.editor.uploadImg = []
+                        //     this.editor.uploadImg.push(uid)
+                        // }
+                        this.imgUploadCallback(file, uid, index)
+                    } else {
+                        this.fileUploadCallback(file, uid)
+                    }
+                }
+            }
+        },
+        appenNode (type, uid, value) {
+            let node = document.createElement(type)
+            node.setAttribute("uid", uid)
+            if (type == 'img') {
+                node.setAttribute("src", value)
+                node.setAttribute("class", 'image')
+                setTimeout(() => {
+                    this.appenNode('div', '', '')
+                })
+            }
+            if (type == 'div' && uid) {
+                node.innerText = value
+                node.setAttribute("class", 'loading')
+                setTimeout(() => {
+                    this.appenNode('div', '', '')
+                })
+            }
+            if (type == 'div' && !uid) {
+                node.setAttribute("class", 'wrap')
+            }
+            this.$refs.editorContent.appendChild(node)
+        },
+        deleteNode (uid) {
+            console.log(uid);
+            try {
+                let node = document.querySelector("[uid=" + uid + ']')
+                if (node) {
+                    this.$refs.editorContent.removeChild(node)
+                }
+            } catch {
+                console.error("未找到该节点");
+            }
+        },
+        imgUploadCallback (file, uid, index) {
+            console.log(file, uid, index);
+            this.appenNode("div", "div" + index + uid, file.name + "正在上传，请稍后...")
+            this.upload(file).then(res => {
+                this.appenNode('img', "img" + index + uid, res.default)
+                this.deleteNode("div" + index + uid)
+            })
+        },
+        upload (file) {
+            return new Promise((resolve) => {
+                this.uploadFile(file, resolve)
+            })
+        },
+        uploadFile (file, resolve) {
+            let imgInfo = {
+                url: '',
+            }
+            let res = multipartUpload(
+                this.ossConfig,
+                file,
+                null,
+                imgInfo
+            );
+            res.then(resp => {
+                imgInfo.url = ossFileUrl(this.ossConfig, resp.name)
+                resolve({
+                    name: resp.name,
+                    default: imgInfo.url
+                })
+            })
+        },
+        fileUploadCallback (file, uid) {
+            this.$emit("fileUploadCallback", {
+                param: {
+                    uid: uid,
+                    type: 'pending',
+                    name: file.name
+                }
+            })
+            this.upload(file).then(res => {
+                this.$emit("fileUploadCallback", {
+                    param: {
+                        uid: uid,
+                        name: file.name,
+                        type: 'success',
+                        url: res.default
+                    }
+                })
+            })
+        },
+
+    },
+    mounted () {
+        this.$nextTick(() => {
+            let myEditorContent = this.$refs.editorContent
+            console.log(myEditorContent, 'myEditorContent');
+            myEditorContent.addEventListener("paste", (e) => {
+                let { files } = e.clipboardData
+                console.log(files, e.clipboardData, 'filesfilesfilesfiles');
+                if (files.length > 0) {
+                    for (let index = 0; index < files.length; index++) {
+                        let uid = uuidv4()
+                        if (files[index].type.indexOf('image') != -1) {
+                            this.imgUploadCallback(files[index], uid, index)
+                            e.preventDefault();
+                        } else {
+                            this.fileUploadCallback(files[index], uid)
+                            e.preventDefault();
+                        }
+                    }
+                }
+            })
+            myEditorContent.addEventListener("dragenter", function () {
+            });
+            myEditorContent.addEventListener("dragover", function (e) {
+                e.preventDefault();
+            });
+            myEditorContent.addEventListener("drop", (e) => {
+                e.preventDefault();
+                let files = e.dataTransfer.files; // 这个就相当于文件上传组件
+                if (files.length > 0) {
+                    for (let index = 0; index < files.length; index++) {
+                        let uid = uuidv4()
+                        if (files[index].type.indexOf('image') != -1) {
+                            this.imgUploadCallback(files[index], uid, index)
+                            e.preventDefault();
+                        } else {
+                            this.fileUploadCallback(files[index], uid)
+                            e.preventDefault();
+                        }
+                    }
+                }
+            }, false);
+        })
+
+    }
+}
+</script>
+
+<style lang="less" scoped>
+.my_editor {
+    width: 100%;
+    border: 1px solid #e0e6f7;
+    border-radius: 9px !important;
+    background: #ffffff;
+    /deep/.editor_content {
+        border-bottom-left-radius: 9px !important;
+        border-bottom-right-radius: 9px !important;
+        padding: 10px;
+        box-sizing: border-box;
+        min-height: 150px !important;
+        font-size: 14px !important;
+        outline: none;
+        div {
+            margin-bottom: 8px;
+            white-space: pre-wrap;
+        }
+        .image {
+            height: 140px;
+            object-fit: contain;
+        }
+        // .image{
+        //     outline: 3px solid #366aff;
+        // }
+        .loading {
+            background: rgba(0, 89, 255, 0.2);
+            display: inline-block;
+            padding: 2px 5px;
+            border-radius: 3px;
+            padding-left: 20px;
+            position: relative;
+            font-size: 12px;
+            -webkit-user-modify: read-only;
+            -moz-user-modify: read-only;
+        }
+        .loading::after {
+            content: '';
+            background-image: url(../assets/image/building.png);
+            background-size: 100%;
+            width: 15px;
+            height: 15px;
+            position: absolute;
+            top: 3px;
+            left: 2px;
+            color: #366aff;
+            -webkit-animation: rotate 1.5s linear infinite;
+            animation: rotate 1.5s linear infinite;
+        }
+        .wrap {
+            height: 1px;
+            width: 100%;
+        }
+    }
+    .editor_content:focus {
+        box-shadow: 2px 2px 3px rgba(0, 0, 0, 0.1) inset, 0, 0;
+    }
+    .editor_content:empty::before {
+        content: attr(data-placeholder);
+        color: #b3b3b3;
+        font-size: 14px;
+    }
+    .editor_head {
+        display: flex;
+        align-items: center;
+        width: 100%;
+        height: 38px;
+        padding: 0 10px;
+        padding-left: 3px;
+        box-sizing: border-box;
+        color: #366aff;
+        font-size: 14px;
+        border-bottom: 1px solid #e0e6f7;
+
+        .button {
+            padding: 5px 8px;
+            background: #ffffff;
+            border: none;
+            border-radius: 2px;
+            svg {
+                fill: #366aff;
+                width: 12px !important;
+                height: 12px !important;
+            }
+        }
+        .button:focus {
+            // box-shadow: var(--ck-focus-outer-shadow),0 0;
+            outline: none;
+            background: #f0f0f0;
+            transition: box-shadow 0.2s ease-in-out, border 0.2s ease-in-ou;
+        }
+        .button:active {
+            border: 1px solid #366aff;
+        }
+    }
+}
+@keyframes rotate {
+    0% {
+        -webkit-transform: rotate(0deg);
+        transform: rotate(0deg);
+    }
+
+    100% {
+        -webkit-transform: rotate(360deg);
+        transform: rotate(360deg);
+    }
+}
+</style>