askbot-dragon 1.5.58-beta → 1.5.59-beta

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "askbot-dragon",
-  "version": "1.5.58-beta",
+  "version": "1.5.59-beta",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
@@ -13,7 +13,6 @@
     "audio-loader": "^1.0.3",
     "ckeditor": "^4.12.1",
     "core-js": "^3.6.5",
-    "esdk-obs-browserjs": "^3.23.5",
     "install": "^0.13.0",
     "jquery": "^3.5.1",
     "lodash": "^4.17.21",

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/AnswerDocknowledge.vue

@@ -234,7 +234,8 @@ export default {
               if(res.data.code == '0') {
                 this.previewHref = res.data.data;
                 this.sourceFileType = url.substring(url.lastIndexOf('.'))
-                if (isMobile()){
+                let isOhmPc = sessionStorage.getItem('isOhmPc')
+                if (isMobile() || isOhmPc == 'true'){
                   this.$refs.previewPdf.drawer = true;
                   this.$refs.previewPdf.previewShowPopup = true;
                 } else {
@@ -243,7 +244,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

package/src/components/ConversationContainer.vue

@@ -34,7 +34,7 @@
     </div> -->
 
     <text-message :text="text" @submitClick="submitClick"></text-message>
-    <!-- <answer-docknowledge :isAskLightning="2" :msg="answerDocknowledge"></answer-docknowledge> -->
+     <answer-docknowledge :isAskLightning="2" :msg="answerDocknowledge"></answer-docknowledge>
     <!--    <voice-component @closeVoice="closeVoice">
       <div slot="voiceTip">
         松开发送
@@ -105,7 +105,7 @@ import AnswerVoice from "@/components/AnswerVoice";
 // import ChatContent from "./chatContent";
 // import FeedBack from '@/components/feedBack'
 // 知识类型
-// import AnswerDocknowledge from "./AnswerDocknowledge.vue";
+import AnswerDocknowledge from "./AnswerDocknowledge.vue";
 export default {
   name: 'ConversationContainer',
   components: {
@@ -131,7 +131,7 @@ export default {
     // FormTemplate,
     // FileType,
     // ChatContent,
-    // AnswerDocknowledge,
+    AnswerDocknowledge,
   },
   props: {
     messages: Array
@@ -188,17 +188,48 @@ export default {
       answerDocknowledge:
       // {"content":{"knowledgeId":"64915d6e098ec248701da267","actionType":"answer_doc_knowledge","text":"跳舞不仅要有实力，还要有好的穿搭，本文针对街舞爱好者提供了穿搭指南，给你带来灵感和帮助！","list":[{"tagIds":[],"format":"html","updateTime":"2023-06-20 16:03:58","source":"WECHAT","url":"https://guoranwisdom.oss-cn-zhangjiakou.aliyuncs.com/137993c6d830416696bbd771fc61d423/1937/2023/06/20/16/03/微信同步/52720/501775e41a724d7da06e66b3b4686407.html","knowledgeId":"64915d6e098ec248701da267","from":"跳舞要有范儿，穿搭占一半！快来get你的街舞穿搭指南~"}],"renderType":0,"type":0,"isKnowledgeSummary":true},"type":"answer_doc_knowledge","sessionId":1687251699065,"keyId":"1a079f48-ace3-4064-89b4-8a292c6a8a93_________","isKnowledgeSummary":true},
 
-      {
-        "content": {
-          "images": [{ url: 'https://static.guoranbot.com/images/knowledge/e0f6898c6b0d47fa98e8f71ceab1bde8/安全标志--禁止标志.png' }],
-          "actionType": "answer_doc_knowledge",
-          "text": "中国的省份名称有湖北省、广西壮族自治区等。",
-          "list": [{ "tagIds": [], "format": "yqhtml", "srcContentId": "8ee0fa9bb5a89ea01f588843589bf931", "updateTime": "2023-04-14 20:15:50", "source": "YUQUE", "srcContent": "功能概述分院科室的建立。分院科室医生关联。分院科室建立时，科室编码需要与集团提供的科室编码保持一致。科室维护进入扁鹊基础配置模块，如图进入科室维护界面进行科室新增输入科室信息进行科室增加。", "url": "https://guoranwisdom.oss-cn-zhangjiakou.aliyuncs.com/yuque/7faaefde11374c7992c377731ea4dddc/dinga77cc098b0b5e113ee0f45d8e4f7c288/2023/4/14/19/54/31/acc2421dcfd04db39eba0c37e7d3b580.html", "knowledgeId": "643940bb6cbe816b83ebbaaf", "knowledgePartId": "lPexf4cBYkmDoUE2eSUt", "from": "2.3 科室", "introduction": "功能概述分院科室的建立。分院科室医生关联。分院科室建立时，科室编码需要与集团提供的科室编码保持一致。科室维护进入扁鹊基础配置模块，如图进入科室维护界面进行科室新增输入科室信息进行科室增加。" }, { "tagIds": [], "format": "feishuhtml", "srcContentId": "8ee0fa9bb5a89ea01f588843589bf931", "updateTime": "2023-04-13 23:19:48", "source": "YUQUE", "srcContent": "功能概述分院科室的建立。分院科室医生关联。分院科室建立时，科室编码需要与集团提供的科室编码保持一致。科室维护进入扁鹊基础配置模块，如图进入科室维护界面进行科室新增输入科室信息进行科室增加。", "url": "https://guoranwisdom.oss-cn-zhangjiakou.aliyuncs.com/yuque/7faaefde11374c7992c377731ea4dddc/dinga77cc098b0b5e113ee0f45d8e4f7c288/2023/4/13/22/20/40/0e48cc7b15b34d2f84fe49fd1a89d606.html", "knowledgeId": "643817509ab4545bef50db64", "knowledgePartId": "NeYze4cBh77-s6lwjWOl", "from": "2.12 重要异常科室对照", "introduction": "功能概述分院科室的建立。分院科室医生关联。分院科室建立时，科室编码需要与集团提供的科室编码保持一致。科室维护进入扁鹊基础配置模块，如图进入科室维护界面进行科室新增输入科室信息进行科室增加。" }, { "tagIds": ['12312313123'], "format": "yqhtml", "srcContentId": "8ee0fa9bb5a89ea01f588843589bf931", "updateTime": "2023-04-13 23:19:02", "source": "YUQUE", "srcContent": "功能概述分院科室的建立。分院科室医生关联。分院科室建立时，科室编码需要与集团提供的科室编码保持一致。科室维护进入扁鹊基础配置模块，如图进入科室维护界面进行科室新增输入科室信息进行科室增加。", "url": "https://guoranwisdom.oss-cn-zhangjiakou.aliyuncs.com/yuque/7faaefde11374c7992c377731ea4dddc/dinga77cc098b0b5e113ee0f45d8e4f7c288/2023/4/13/22/20/18/5cdf1295ec1649f6ab73948aa82ea810.html", "knowledgeId": "643817509ab4545bef50db58", "knowledgePartId": "Hvcye4cBYkmDoUE21h6V", "from": "2.3 科室", "introduction": "功能概述分院科室的建立。分院科室医生关联。分院科室建立时，科室编码需要与集团提供的科室编码保持一致。科室维护进入扁鹊基础配置模块，如图进入科室维护界面进行科室新增输入科室信息进行科室增加。" }, { "tagId": "6475eab868110215ab821a7c", "tagIds": ["6475eab868110215ab821a7c"], "format": "xlsx", "srcContentId": "0bf639060655ff3ec217484a2fc7827d", "updateTime": "2023-05-30 20:28:21", "source": "CORP_LOCAL_FILE", "srcContent": "产品:外观,解释:VX50有两种套餐可下单： 套餐一：只购买VX50终端设备，不包含摄像头、麦克风 套餐二：除购买VX50终端设备外，可选购SC701云台摄像头及MC30/MC31麦克风", "url": "https://guoranwisdom.oss-cn-zhangjiakou.aliyuncs.com/5ecf2fcd704541149201ab9c1c31162d/2023/05/30/20/11/85b7b2a5f61e2b060387656e88c02d50/VX30与VX50对比表.xlsx", "knowledgeId": "6475e7eac724c54c46cbfa2d", "knowledgePartId": "T_uhbIgB3v-0X8BLeDAh", "from": "VX30与VX50对比表", "introduction": "产品:外观,解释:VX50有两种套餐可下单： 套餐一：只购买VX50终端设备，不包含摄像头、麦克风 套餐二：除购买VX50终端设备外，可选购SC701云台摄像头及MC30/MC31麦克风" },],
-          "renderType": 0,
-          "type": 0
-        },
-        "type": "answer_doc_knowledge"
-      },
+          {
+            "conditionList": null,
+            "apiKey": null,
+            "effectiveTime": null,
+            "intentId": null,
+            "msgId": null,
+            "actionCategory": null,
+            "id": null,
+            "type": "answer_doc_knowledge",
+            "nodeId": null,
+            "content": {
+              "knowledgeId": null,
+              "actionType": "answer_doc_knowledge",
+              "images": null,
+              "knowledgePartId": null,
+              "srcContentId": null,
+              "text": "新能源车是指采用新型能源的轿车、客车、货车等机动车辆，包括纯电动汽车、插电式混合动力汽车和燃料电池汽车。根据数据显示，2020年我国新能源汽车销售量达到139万辆，同比增长10.9%。预计2021年新能源车市场将继续保持高速增长，销售量有望超过200万辆。政府对新能源汽车实行补贴政策，同时逐步放松对新能源车的限购和限行政策。此外，中国汽车企业在新能源车领域的技术研发能力也不断提升，各大品牌纷纷推出新能源车型，采用更优秀的动力电池和电控系统，提高了车辆的续航里程。因此，新能源车市场发展前景广阔。",
+              "list": [
+                {
+                  "owner": null,
+                  "tagId": "6525183560177f6223d52a14",
+                  "enterprise": null,
+                  "tagIds": [
+                    "6525183560177f6223d52a14"
+                  ],
+                  "format": "docx",
+                  "srcContentId": "99cada54a02161f979acc28c5b8b913e",
+                  "updateTime": "2023-10-10 17:24:05",
+                  "source": "CORP_LOCAL_FILE",
+                  "srcContent": "新能源车指的是采用新型能源的轿车、客车、货车等机动车辆。目前主要的新能源车包括纯电动汽车、插电式混合动力汽车、燃料电池汽车等。以下是对新能源车的分析报告：市场发展趋势：随着环保和能源安全意识的增强，新能源车市场呈现快速发展态势。数据显示，2020年我国新能源汽车销售量达到139万辆，同比增长10.9%。预计2021年新能源车市场仍将保持高速增长，销售量有望达到200万辆以上。政策扶持力度加大：我国政府对新能源汽车实行补贴政策，以鼓励消费者选择绿色出行方式。此外，对新能源车限购、限行等政策也逐步放松。政策扶持的加大将进一步促进新能",
+                  "url": "http://guoranwisdom.oss-cn-zhangjiakou.aliyuncs.com/43aadcaac45f4be19b63fd18ca68f2e6/2023/10/10/17/23/a27c5c1dd534d180c5512c907d5c9888/新能源车分析报告 (1).docx?uploadId=0921CB01AB5847E8BEF44730EE5DACF7",
+                  "knowledgeId": "6525182f002ff5198983a90c",
+                  "knowledgePartId": "YfHmGIsBvcIPGxbfkvwK",
+                  "from": "新能源车分析报告 (1)",
+                  "introduction": "新能源车指的是采用新型能源的轿车、客车、货车等机动车辆。目前主要的新能源车包括纯电动汽车、插电式混合动力汽车、燃料电池汽车等。以下是对新能源车的分析报告：市场发展趋势：随着环保和能源安全意识的增强，新能源车市场呈现快速发展态势。数据显示，2020年我国新能源汽车销售量达到139万辆，同比增长10.9%。预计2021年新能源车市场仍将保持高速增长，销售量有望达到200万辆以上。政策扶持力度加大：我国政府对新能源汽车实行补贴政策，以鼓励消费者选择绿色出行方式。此外，对新能源车限购、限行等政策也逐步放松。政策扶持的加大将进一步促进新能"
+                }
+              ],
+              "renderType": 0,
+              "type": 0,
+              "srcContent": null
+            }
+          },
       ActionAiGuideObj: {
         // 智能引导
         type: "answer_intellect_guide",

package/src/components/answerRadio.vue

@@ -9,10 +9,7 @@
           class="options-item"
           :class="index!==msg.content.options.length -1?'recommend-item':'last-item'"
           :key="msg.nodeId + '_' + index"
-          @click="
-                  $emit(
-                    'onRadioClick',msg.id +'_' + index + '_' + option.value + '_' + option.name,option.name, msg.apiKey,msg.actionCategory, msg.msgId?msg.msgId:''
-                  )">
+          @click="radioClick(msg,option,index)">
        
           <!-- <el-tooltip class="item" effect="dark" :content="option.name" placement="bottom-start" v-if="!isMobile">
             <span > {{ option.name }}</span>
@@ -26,30 +23,34 @@
 
 <script>
 export default {
-  name: "answerRadio",
-  data(){
-    return{
-      isMobile:false,
-    }
-  },
-  props:['msg'],
-  mounted(){
-    console.log(this.msg,'msg');
-    this.judgeIsMobile();
-  },
-  methods:{
-    judgeIsMobile() {
-          let flag = navigator.userAgent.match(
-              /(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i
-          );
-          if (flag) {
-              this.isMobile = true;
-          } else {
-              this.isMobile = false;
-          }
-          console.log(this.isMobile,'this.isMobile');
-      }
-  }
+	name: "answerRadio",
+	data(){
+		return{
+		isMobile:false,
+		}
+	},
+	props:['msg'],
+	mounted(){
+		console.log(this.msg,'msg');
+		this.judgeIsMobile();
+	},
+	methods:{
+		judgeIsMobile() {
+			let flag = navigator.userAgent.match(
+				/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i
+			);
+			if (flag) {
+				this.isMobile = true;
+			} else {
+				this.isMobile = false;
+			}
+			console.log(this.isMobile,'this.isMobile');
+		},
+		radioClick(msg,option,index){
+      let value = option.answerId ? msg.id +'_' + index + '_' + option.value + '_' + option.name + '_' + option.answerId : msg.id +'_' + index + '_' + option.value + '_' + option.name
+			this.$emit('onRadioClick',value,option.name, msg.apiKey,msg.actionCategory, msg.msgId?msg.msgId:'',option.apiKey)
+		}
+	}
 
 }
 </script>

package/src/components/askVideo.vue

@@ -25,7 +25,7 @@
     </div>
 </template>
 <script>
-    import { putObject } from "../assets/js/obsBrowser";
+    import {ossConfig,uploadImageByBase64} from "../assets/js/AliyunlssUtil";
 
     export default {
         name: "ask_video",
@@ -85,10 +85,7 @@
             console.debug('img.src',output)
             let base64 = canvas.toDataURL("image/png")
             let blob = that.dataURLtoFile(base64,'name')
-            // let promise = uploadImageByBase64(ossConfig,blob);
-            const file = new File([blob], 'name', { type: 'text/plain', lastModified: Date.now() });
-            console.debug('file',file)
-            let promise = putObject(file);
+            let promise = uploadImageByBase64(ossConfig,blob);
             promise.then((res)=>{
               console.debug("upload base64 reslut",res);
               if (res&&res.url){

package/src/components/associationIntention.vue

@@ -229,11 +229,11 @@
               index + 1
           }.png" align="middle">`;
       },
-      onRadioClickReco(id, name, apikey) {
-        this.$emit("onRadioClick", id, name, apikey);
+      onRadioClickReco(id, name, apikey,optionApiKey) {
+        this.$emit("onRadioClick", id, name, apikey,optionApiKey);
       },
       onImageClick(url){
-        this.$emit('onImageClick',url)
+        this.$emit('onImageClick', encodeURI(url))
       },
       msgContent(content){
         console.debug('215',content)

package/src/components/formTemplate.vue

@@ -833,7 +833,6 @@ import Tree from '../components/tree'
 import selectPopup from '../components/popup'
 import fileListView from './fielListView.vue'
 import { uniqueData } from './utils/math_utils'
-import { putObject } from "../assets/js/obsBrowser";
 export default {
   name: "formTemplate",
   data() {
@@ -1599,24 +1598,21 @@ export default {
         status:'',
         url:''
       }
-      // let res = multipartUpload(
-      //         this.ossConfig,
-      //         file,
-      //         null,
-      //         imageInfo
-      // );
-      let resp = putObject(file);
-      resp.then((res) => {
+      let res = multipartUpload(
+              this.ossConfig,
+              file,
+              null,
+              imageInfo
+      );
+      res.then((res) => {
         console.log("upload result:", res);
         // let filePath = res.name;
-        let obj = {
+        imageData.urls.push({
           name:file.name,
-          url:res.url,
+          url:ossFileUrl(this.ossConfig, res.name),
           status:'success'
-        }
-        imageData.urls.push(obj)
-        // imageInfo.url = ossFileUrl(this.ossConfig, res.name)
-        imageInfo.url = res.url;
+        })
+        imageInfo.url = ossFileUrl(this.ossConfig, res.name)
         imageInfo.status='success'
         imageInfo.name=file.name
         for (let j=0;j<this.extInfoFieldValue[this.filedId].length;j++){
@@ -2502,14 +2498,13 @@ export default {
            progress: 0,
          },
        };*/
-      // let res = multipartUpload(
-      //         this.ossConfig,
-      //         file,
-      //         null,
-      //         imgInfo
-      // );
-      let ress = putObject(file)
-      ress.then((res) => {
+      let res = multipartUpload(
+              this.ossConfig,
+              file,
+              null,
+              imgInfo
+      );
+      res.then((res) => {
         console.debug("upload result:", res);
         // let filePath = res.name;
         /* imageData.content.progress = 1;
@@ -2517,7 +2512,7 @@ export default {
                  ossFileUrl(this.ossConfig, res.name)
          );
          console.log('imageData',imageData)*/
-        imgInfo.url = res.url
+        imgInfo.url = ossFileUrl(this.ossConfig, res.name)
         imgInfo.status='success'
         if (data.file){
           imgInfo.name = data.file.name

package/src/components/message/TicketMessage.vue

@@ -125,7 +125,7 @@ export default {
         if (element.version == 1) {
           element.content.htmlList.forEach((item) => {
             item.tampList = [];
-            item.list.forEach((cell, cellIndex) => {
+            item.list && item.list.forEach((cell, cellIndex) => {
               let tampCell = {
                 html: cell,
                 style: item.style[cellIndex]