askbot-dragon 1.7.28-beta → 1.7.31-beta

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "askbot-dragon",
-  "version": "1.7.28-beta",
+  "version": "1.7.31-beta",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
@@ -28,12 +28,10 @@
     "babel-eslint": "^10.1.0",
     "element-ui": "^2.15.10",
     "eslint": "^6.7.2",
-    "vue-markdown": "^2.2.4",
     "eslint-plugin-vue": "^6.2.2",
     "less": "^3.12.2",
     "less-loader": "^7.0.2",
-    "vue-template-compiler": "^2.6.11",
-    "vue-i18n": "^8.26.4"
+    "vue-template-compiler": "^2.6.11"
   },
   "eslintConfig": {
     "root": true,

package/src/assets/js/AliyunlssUtil.js

@@ -4,27 +4,7 @@
 
 const OSS = window.OSS
 
-const getPrivateOssConfig = () =>{
-    let mainSource = sessionStorage.getItem('_mainSource') ? sessionStorage.getItem('_mainSource') : "askbot";
-    switch (mainSource) {
-        case "askbot":
-            return {
-                region: "oss-cn-zhangjiakou",
-                accessKeyId: "LTAI4G3QtdEdwkEbihBngAsK",
-                accessKeySecret: "OwgdVfc5PeCkIgqIdug660xmiSPchn",
-                bucket: "guoranopen-zjk",
-            }
-        case "lishi":
-            return {
-                region: "oss-ap-southeast-1",
-                accessKeyId: "LTAI5tAusPLDNJJwkvUbqi2T",
-                accessKeySecret: "xqPVaunOIbvTe3g9qsXal2IZO6RftK",
-                bucket: "askbotopen-ls",
-            };
-    }
-}
-
-const ossConfig = {
+const ossConfig={
     region: "oss-cn-zhangjiakou",
         //云账号AccessKey有所有API访问权限，建议遵循阿里云安全最佳实践，创建并使用STS方式来进行API访问
         accessKeyId: "LTAI4G3QtdEdwkEbihBngAsK",
@@ -33,8 +13,6 @@ const ossConfig = {
         bucket: "guoranopen-zjk",
 };
 
-
-
 let IDX = 256, HEX = [], SIZE = 256, BUFFER;
 while (IDX--) HEX[IDX] = (IDX + 256).toString(16).substring(1);
 let mainId = sessionStorage.getItem('_mainId') ? sessionStorage.getItem('_mainId') : "";
@@ -70,8 +48,8 @@ function pathGenerate(filename) {
 }
 
 
-async function upload(data) {
-    let ossClient = new OSS(getPrivateOssConfig());
+async function upload(ossConfig, data) {
+    let ossClient = new OSS(ossConfig);
     // object-key可以自定义为文件名（例如file.txt）或目录（例如abc/test/file.txt）的形式，实现将文件上传至当前Bucket或Bucket下的指定目录。
     let objectKey = pathGenerate(data.name);
     let result = await ossClient.put(objectKey, data);
@@ -79,8 +57,8 @@ async function upload(data) {
     return result;
 }
 
-async function multipartUpload(data, callback,extCallback) {
-    let ossClient = new OSS(getPrivateOssConfig());
+async function multipartUpload(ossConfig, data, callback,extCallback) {
+    let ossClient = new OSS(ossConfig);
     // object-key可以自定义为文件名（例如file.txt）或目录（例如abc/test/file.txt）的形式，实现将文件上传至当前Bucket或Bucket下的指定目录。
     let objectKey = pathGenerate(data.name);
     let res = await ossClient.multipartUpload(objectKey, data, {
@@ -95,8 +73,7 @@ async function multipartUpload(data, callback,extCallback) {
     return res;
 }
 
-function ossFileUrl(path, cname) {
-    let ossConfig = getPrivateOssConfig()
+function ossFileUrl(ossConfig, path, cname) {
     if (cname == null) {
         return '//' + ossConfig.bucket + '.' + ossConfig.region + '.aliyuncs.com/' + path;
     } else {
@@ -104,8 +81,8 @@ function ossFileUrl(path, cname) {
     }
 }
 
-function uploadImageByBase64(blob) {
-    let ossClient = new OSS(getPrivateOssConfig());
+function uploadImageByBase64(ossConfig,blob) {
+    let ossClient = new OSS(ossConfig);
 
     // object-key可以自定义为文件名（例如file.txt）或目录（例如abc/test/file.txt）的形 式，实现将文件上传至当前Bucket或Bucket下的指定目录。
     let objectKey = pathGenerate(new Date().getTime());
@@ -114,4 +91,4 @@ function uploadImageByBase64(blob) {
     return result;
 }
 
-export {upload, multipartUpload, ossFileUrl,uploadImageByBase64,ossConfig, getPrivateOssConfig}
+export {upload, multipartUpload, ossFileUrl,uploadImageByBase64,ossConfig}

package/src/components/AnswerDocknowledge.vue

@@ -16,22 +16,18 @@
                 <template v-if="msg.content.renderType == 1">
                     <p v-html="msg.content.text"></p>
                 </template>
-                <template v-if="msg.content.renderType == 2">
-                    <markDownText :chainValues="msg.content.text" :isHistory="isHistory"></markDownText>
-                </template>
                 <template v-else>{{ msg.content.text }}</template>
             </div>
             <div v-if="msg.content.images && msg.content.images.length != 0" class="answer-kn-image-box">
                 <img v-for="(imageItem, imageItemIndex) in msg.content.images"
-                    style="max-width: 230px;border-radius: 25px;margin-bottom: 15px" :src="imageItem.url"
+                    style="max-width: 230px;border-radius: 10px;margin-bottom: 15px" :src="imageItem.url"
                     :key="imageItemIndex" alt @click="lookAttach(imageItem.url, imageItem, $event)" />
             </div>
         </div>
         <template v-if="!isLiBang">
             <div class="ad-list" :class="msg.content.type == 0 ? 'ad-list-recognition' : ''">
                 <template v-if="msg.content.type == 1">
-                    <div v-for="(item, itemIndex) in  msg.content.list" :key="itemIndex"
-                        :style="{ paddingBottom: itemIndex === msg.content.list.length - 1 ? 0 : '10px' }" class="ad-list-cell">
+                    <div v-for="(item, itemIndex) in  msg.content.list" :key="itemIndex" class="ad-list-cell">
                         <div class="alc-title">
                             <div class="alc-box">
                                 <div class="alc-source-left">
@@ -178,10 +174,9 @@
 /* eslint-disable */
 import previewPdf from "./previewPdf";
 import { isMobile } from "../assets/js/common";
-import markDownText from "./markDownText.vue";
 export default {
     name: "answerDocknowledge",
-    components: { previewPdf, markDownText },
+    components: { previewPdf },
     data () {
         return {
             isPC: true,
@@ -268,14 +263,14 @@ export default {
             allKnowledgeList: [],
             loadMoreFlag: false,
             title: '',
-            folderName: '',
-            folderUrl: '',
+            folderName:'',
+            folderUrl:'',
             previewKnowledgeId: "",
             previewKnowledge: {},
             previewOssPath: ""
         }
     },
-    props: ['msg', 'isAskLightning', 'isMessageRecord', "isApp", "isHasChat", "activeKnowledgeId", "isLiBang","isHistory"],
+    props: ['msg', 'isAskLightning', 'isMessageRecord', "isApp", "isHasChat", "activeKnowledgeId", "isLiBang"],
     beforeMounted () {
     },
     watch: {
@@ -337,78 +332,78 @@ export default {
         //预览图片
         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({
-                    data: "bot_preview",
-                    item: JSON.stringify(item),
-                    url: url
-                }, "*");
-            } else {
-                // if (isMobile()) {
-                //   this.$refs.previewPdf.drawer = true;
-                //   this.$refs.previewPdf.previewShowPopup = false;
-                // } else {
-                //   this.$refs.previewPdf.drawer = false;
-                // }
-                this.title = item.from || item.name
-                this.folderName = item.folderName
+          // this.$http.get("/knowledge-api/internal/knowledgeBaseStructure/" + "642ffbccde420e2772f7787b")
+          // debugger
+          event.preventDefault();
+          if (this.isAskLightning == 1 && !this.isApp){
+            window.parent.postMessage({
+              data: "bot_preview",
+              item: JSON.stringify(item),
+              url: url
+            },"*");
+          } else {
+            // if (isMobile()) {
+            //   this.$refs.previewPdf.drawer = true;
+            //   this.$refs.previewPdf.previewShowPopup = false;
+            // } else {
+            //   this.$refs.previewPdf.drawer = false;
+            // }
+            this.title = item.from || item.name
+            this.folderName = item.folderName
                 this.folderUrl = item.folderUrl
                 this.previewKnowledge = item;
-                this.previewKnowledgeId = item.knowledgeId
-                this.$refs.previewPdf.previewShowPopup = false;
-                this.$refs.previewPdf.drawer = false;
-                this.previewOssPath = url;
-                let index = url.lastIndexOf('?')
-                let type = ''
-                let httpUrl = '/knowledge-api/knowledge/getTemporaryCertificate'
-                if (index !== -1) {
-                    url = url.substring(0, index)
-                    type = this.fileType(url)
+            this.previewKnowledgeId = item.knowledgeId
+            this.$refs.previewPdf.previewShowPopup = false;
+            this.$refs.previewPdf.drawer = false;
+            this.previewOssPath = url;
+            let index = url.lastIndexOf('?')
+            let type = ''
+            let httpUrl = '/knowledge-api/knowledge/getTemporaryCertificate'
+            if (index !== -1) {
+              url = url.substring(0, index)
+              type = this.fileType(url)
+            } else {
+              type = this.fileType(url)
+            }
+            if (type === '' || type === 'OTHER') {
+              httpUrl = httpUrl += '?needEncrypt=true'
+            } else {
+              httpUrl = httpUrl += '?needEncrypt=false'
+            }
+            this.$http.post(httpUrl, {
+              "fileInOssPath":url
+            }).then(res =>{
+              if(res.data.code == '0') {
+                this.previewHref = res.data.data;
+                this.sourceFileType = url.substring(url.lastIndexOf('.'))
+                let isOhmPc = sessionStorage.getItem('isOhmPc')
+                if (isMobile() || isOhmPc == 'true'){
+                  this.$refs.previewPdf.drawer = true;
+                  this.$refs.previewPdf.previewShowPopup = true;
                 } else {
-                    type = this.fileType(url)
+                  this.$refs.previewPdf.previewShowPopup = false;
+                  this.$refs.previewPdf.drawer = true;
                 }
-                if (type === '' || type === 'OTHER' || type == 'IMAGE') {
-                    httpUrl = httpUrl += '?needEncrypt=true'
+                //聊一聊按钮的选中状态
+                if (this.activeKnowledgeId == item.knowledgeId){
+                  this.$refs.previewPdf.previewKnowledgeId = this.activeKnowledgeId
                 } else {
-                    httpUrl = httpUrl += '?needEncrypt=false'
+                  this.$refs.previewPdf.previewKnowledgeId = ""
+                }
+                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.$http.post(httpUrl, {
-                    "fileInOssPath": url
-                }).then(res => {
-                    if (res.data.code == '0') {
-                        this.previewHref = res.data.data;
-                        this.sourceFileType = url.substring(url.lastIndexOf('.'))
-                        let isOhmPc = sessionStorage.getItem('isOhmPc')
-                        if (isMobile() || isOhmPc == 'true') {
-                            this.$refs.previewPdf.drawer = true;
-                            this.$refs.previewPdf.previewShowPopup = true;
-                        } else {
-                            this.$refs.previewPdf.previewShowPopup = false;
-                            this.$refs.previewPdf.drawer = true;
-                        }
-                        //聊一聊按钮的选中状态
-                        if (this.activeKnowledgeId == item.knowledgeId) {
-                            this.$refs.previewPdf.previewKnowledgeId = this.activeKnowledgeId
-                        } else {
-                            this.$refs.previewPdf.previewKnowledgeId = ""
-                        }
-                        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 = '';
-                        }
                         if (item.tagIds && item.tagIds.length != 0) {
                             this.$refs.previewPdf.loading = false
                             return
@@ -436,8 +431,6 @@ export default {
                 return 'VIDEO'
             } else if (fileType === '.html') {
                 return 'HTML'
-            } else if (fileType === '.png' || fileType === '.jpg' || fileType === '.jpeg') {
-                return 'IMAGE'
             } else {
                 return 'OTHER'
             }
@@ -498,13 +491,13 @@ export default {
         recommendQues (item, knowledgeId) {
             this.$emit('recommendQues', item, knowledgeId)
         },
-        clickFloder (item) {
+        clickFloder(item) {
             this.$emit('clickFloder', item)
         },
-        previewClickFloder () {
+        previewClickFloder() {
             let item = null
             this.msg.content.list.forEach(element => {
-                if (element.knowledgeId == this.previewKnowledgeId) {
+                if(element.knowledgeId == this.previewKnowledgeId) {
                     item = element
                 }
             });
@@ -648,25 +641,24 @@ export default {
 
                 .alc-box-introduction-previewImage {
                     width: 100%;
-                    display: block;
-                    overflow: hidden;
-                    text-overflow: ellipsis;
-                    display: -webkit-box;
-                    -webkit-line-clamp: 3;
-                    -webkit-box-orient: vertical;
-                    margin-top: 10px;
-                    color: #616161;
-                    // font-size: 12px;
-                    line-height: 24px;
-                    text-align: left;
-
-                    img {
-                        max-width: 300px;
-                        width: 100%;
-                        max-height: 150px;
-                        margin: 10px;
-                        cursor: pointer;
-                    }
+                  display: block;
+                  overflow: hidden;
+                  text-overflow: ellipsis;
+                  display: -webkit-box;
+                  -webkit-line-clamp:3;
+                  -webkit-box-orient:vertical;
+                  margin-top: 10px;
+                  color: #616161;
+                  // font-size: 12px;
+                  line-height: 24px;
+                  text-align: left;
+                  img {
+                    max-width: 300px;
+                    width: 100%;
+                    max-height: 150px;
+                    margin: 10px;
+                    cursor: pointer;
+                  }
                 }
 
                 .alc-updateTime {

package/src/components/ConversationContainer.vue

@@ -1,6 +1,7 @@
 <!-- 消息记录容器 -->
 <template>
   <div id="conversation">
+    <qw-feedback :msg="qwFeedbackObj"></qw-feedback>
     <div v-for="(item, index) in processAction" :key="index">
       <association-intention :msg="item" :msgType="item.type" :isOpen="isOpen"></association-intention>
     </div>
@@ -37,7 +38,7 @@
     </div> -->
 
     <!-- <text-message :text="text" @submitClick="submitClick"></text-message> -->
-    <answer-docknowledge :isAskLightning="2" :isHasChat="true" :msg="answerDocknowledge" :isLiBang="false"></answer-docknowledge>
+    <answer-docknowledge :isAskLightning="2" :msg="answerDocknowledge" :isLiBang="false"></answer-docknowledge>
     <welcomeSuggest :msg="welcomeSuggest"></welcomeSuggest>
     <!--    <voice-component @closeVoice="closeVoice">
       <div slot="voiceTip">
@@ -121,6 +122,7 @@ import AnswerDocknowledge from "./AnswerDocknowledge.vue";
 import WelcomeKnowledgeFile from "./welcomeKnowledgeFile";
 import WelcomeLlmCard from "./welcomeLlmCard";
 import welcomeSuggest from "./welcomeSuggest"
+import QwFeedback from './QwFeedback';
 export default {
   name: 'ConversationContainer',
   components: {
@@ -150,7 +152,8 @@ export default {
     // ChatContent,
     AnswerDocknowledge,
     MyEditor,
-    welcomeSuggest
+    welcomeSuggest,
+    QwFeedback
   },
   props: {
     messages: Array
@@ -240,7 +243,7 @@ export default {
         "content": {
           "images": [{ url: 'https://static.guoranbot.com/images/knowledge/e0f6898c6b0d47fa98e8f71ceab1bde8/安全标志--禁止标志.png' }],
           "actionType": "answer_doc_knowledge",
-          "text": "**票据管理规定**\n\n### 车票报销\n- **注意事项**：\n  - 车票需注意日期与行程相符。\n  - 如所附车票没有标注起止地点的，需自行注明。\n  - 非同一次乘车出现票号相连的，不予报销。\n\n### 不予报销的票据\n- **国内白条及非财政部门监制的收据**：一律不予报销。\n- **预存性质的票据**：如预存话费、预存公交车费、购物卡、油卡等，原则上不予报销。\n  - 确有客观需求并经部门负责人、财务负责人事先同意的，预存时需获取预付款增值税普通发票。\n  - 后续每次实际消费时需取得注明预付卡卡号的消费小票，并在消费完预付卡内余额后及时进行一次性报销。\n  - 无法取得消费小票的，请及时与财务同事沟通与确认解决方案。\n\n### 发票要求\n- **字迹不清或压线错格**：应重新开票。\n- **无法取得发票的费用**：公司不予报销，不允许用其他发票替代报销。\n\n### 报销单整理\n- 报销单影像审批完成进入核票流程后，报销人应将该张报销单的票据按照时间顺序分类整理，平铺、整齐的粘贴在A4纸上，票据与票据之间不能重叠遮挡，与报销单一同交到财务部。\n- 驻外人员邮寄回公司本部门的内勤人员，由部门内勤人员代为转交至财务部。\n- 财务收到单据后在汇联易系统中进行核票，纸质票据影像必须与实物一致，符合标准的单据完成审批流程后，进入待付款流程。\n\n### 出差报销\n- 员工出差必须先填写出差申请单，经审批后才能出行。\n- 若有紧急出差的情况，应填写出差申请单后，联系上级领导人进行加急审批。\n- 未填出差申请单，自行购票出行，公司有权不予报销。",
+          "text": "中国的省份名称有湖北省、广西壮族自治区等。",
           "list": [
             {
               "owner": null,
@@ -319,9 +322,8 @@ export default {
               "previewImage": "https://askbot-pdf-all.oss-cn-zhangjiakou.aliyuncs.com/31623ccfe9dd4957bbd59c5823878bbe/2023/12/27/03/39/08/658b9c477cf604285f7cb81d/pdf-image-1913302477976388839.png"
             }
           ],
-          "renderType": 2,
-          "type": 1,
-          "isHistory": true
+          "renderType": 0,
+          "type": 1
         },
         "type": "answer_doc_knowledge"
       },
@@ -10661,6 +10663,15 @@ export default {
         }
       },
       answerRadios: { "content": { "options": [{ "scope": "KNOWLEDGE", "name": "本文提供了什么内容？", "value": "64915d6e098ec248701da267" }, { "scope": "KNOWLEDGE", "name": "什么是街舞穿搭指南？", "value": "64915d6e098ec248701da267" }, { "scope": "KNOWLEDGE", "name": "为什么街舞爱好者需要关注本文？", "value": "64915d6e098ec248701da267" }], "description": "了解更多", "isKnowledgeSummary": true }, "id": "knowledgeRecdNodeId", "type": "answer_radio", "sessionId": 1687251699065, "keyId": "139480f2-5af1-44fd-a7bd-a73dd7b566b7_________", "isKnowledgeSummary": true },
+      qwFeedbackObj: {
+        "content": {
+          "guideText": "以下问题我已经学会了，感谢您提供的金点子，帮助我更好的成长：",
+          "questionList": [
+            "打印机卡纸怎么办", "打印机打印模糊", "SAP系统输入编码系统显示报错", "合同已经上传影像归档了，但是在CE中还是关联不到合同", "如何查询社保缴费基数", "如何查询公积金缴费基数"
+          ]
+        },
+        "type": "unidentified_feedback"
+      },
       answerRadiosPri: {
         "refAttrId": null,
         "createTime": null,

package/src/components/MyEditor.vue

@@ -42,6 +42,14 @@ 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: ''
         }
@@ -151,12 +159,13 @@ export default {
                 url: '',
             }
             let res = multipartUpload(
+                this.ossConfig,
                 file,
                 null,
                 imgInfo
             );
             res.then(resp => {
-                imgInfo.url = ossFileUrl(resp.name)
+                imgInfo.url = ossFileUrl(this.ossConfig, resp.name)
                 resolve({
                     name: resp.name,
                     default: imgInfo.url