askbot-dragon 1.7.25-beta → 1.7.28-beta

package/src/components/ConversationContainer.vue

@@ -1,9 +1,9 @@
 <!-- 消息记录容器 -->
 <template>
   <div id="conversation">
-    <!-- <div v-for="(item, index) in processAction" :key="index">
+    <div v-for="(item, index) in processAction" :key="index">
       <association-intention :msg="item" :msgType="item.type" :isOpen="isOpen"></association-intention>
-    </div> -->
+    </div>
     <!-- <answer-radio :msg="answerRadiosPri"></answer-radio> -->
     <answer-radio :msg="answerRadiosPri"></answer-radio>
     <!-- <msg-loading v-if="inLoading"></msg-loading>
@@ -17,7 +17,7 @@
       </div>
     </div> -->
     <!-- <MyEditor></MyEditor> -->
-    <form-template
+    <!-- <form-template
          :formList="formList2"
          @submitClick="submitClick"
      ></form-template> -->
@@ -31,14 +31,14 @@
      <form-template
          :formList="formList4"
          @submitClick="submitClick"
-     ></form-template>
+     ></form-template> -->
     <!-- <div style="max-width: 450px;overflow-x: auto;">
       <action-alert :actionAlertIframe="actionAlertIframeObj" :phoneWidth100="true"></action-alert>
     </div> -->
 
     <!-- <text-message :text="text" @submitClick="submitClick"></text-message> -->
-    <answer-docknowledge :isAskLightning="2" :msg="answerDocknowledge" :language="'cn'" :isLiBang="false"></answer-docknowledge>
-    <welcomeSuggest :msg="welcomeSuggest" :language="'cn'"></welcomeSuggest>
+    <answer-docknowledge :isAskLightning="2" :isHasChat="true" :msg="answerDocknowledge" :isLiBang="false"></answer-docknowledge>
+    <welcomeSuggest :msg="welcomeSuggest"></welcomeSuggest>
     <!--    <voice-component @closeVoice="closeVoice">
       <div slot="voiceTip">
         松开发送
@@ -46,10 +46,10 @@
     </voice-component>-->
     <!--  点选  -->
     <!-- <div v-html="htmlContainer"></div> -->
-    <answer-radio :msg="answerRadios" :language="'cn'"></answer-radio>
-    <ticket-message :content="updateTicetmessageObj"></ticket-message>
-    <ticket-message :content="contents"></ticket-message>
-    <!--
+    <answer-radio :msg="answerRadios"></answer-radio>
+    <!-- <ticket-message :content="updateTicetmessageObj"></ticket-message> -->
+    <!-- <ticket-message :content="contents"></ticket-message> -->
+    <!-- 
     <action-send-to-bot :msg="answerRadios"></action-send-to-bot>
     <text-message :text="text" @submitClick="submitClick"></text-message>
     <div v-for="(item,index) in processAction" :key="index">
@@ -240,7 +240,7 @@ export default {
         "content": {
           "images": [{ url: 'https://static.guoranbot.com/images/knowledge/e0f6898c6b0d47fa98e8f71ceab1bde8/安全标志--禁止标志.png' }],
           "actionType": "answer_doc_knowledge",
-          "text": "中国的省份名称有湖北省、广西壮族自治区等。",
+          "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- 未填出差申请单，自行购票出行，公司有权不予报销。",
           "list": [
             {
               "owner": null,
@@ -258,7 +258,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"
             },
             {
@@ -319,8 +319,9 @@ 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": 0,
-          "type": 1
+          "renderType": 2,
+          "type": 1,
+          "isHistory": true
         },
         "type": "answer_doc_knowledge"
       },
@@ -578,6 +579,202 @@ export default {
               ]
             }
           },
+          {
+            version: 1,
+            content: {
+              htmlList: [
+                {
+                  "src": null,
+                  "dynamic": null,
+                  "style": [
+                    {
+                      "col": 1,
+                      "colums": 3
+                    },
+                    {
+                      "col": 2,
+                      "colums": 3
+                    }
+                  ],
+                  "markdownList": null,
+                  "list": [
+                    "<p>1</p>",
+                    "<p>2</p>"
+                  ],
+                  "type": "DOUBLE"
+                },
+                {
+                  "src": null,
+                  "dynamic": null,
+                  "style": [
+                    {
+                      "col": 1,
+                      "colums": 4
+                    },
+                    {
+                      "col": 1,
+                      "colums": 4
+                    },
+                    {
+                      "col": 1,
+                      "colums": 4
+                    },
+                    {
+                      "col": 1,
+                      "colums": 4
+                    }
+                  ],
+                  "markdownList": null,
+                  "list": [
+                    "<p>1</p>",
+                    "<p>2</p>",
+                    "<p>3</p>",
+                    "<p>4</p>"
+                  ],
+                  "type": "QUADRUPLE"
+                },
+                {
+                  "src": null,
+                  "dynamic": null,
+                  "style": [
+                    {
+                      "col": 1,
+                      "colums": 4
+                    },
+                    {
+                      "col": 3,
+                      "colums": 4
+                    }
+                  ],
+                  "markdownList": null,
+                  "list": [
+                    "<p>1</p>",
+                    "<p>3</p>"
+                  ],
+                  "type": "DOUBLE"
+                },
+                {
+                  "src": null,
+                  "dynamic": null,
+                  "style": [
+                    {
+                      "col": 2,
+                      "colums": 3
+                    },
+                    {
+                      "col": 1,
+                      "colums": 3
+                    }
+                  ],
+                  "markdownList": null,
+                  "list": [
+                    "<p>2</p>",
+                    "<p>1</p>"
+                  ],
+                  "type": "DOUBLE"
+                }
+              ],
+              buttonList: [{ name: '我是标签1', scope: '', test: '' }]
+            }
+          },
+          {
+            version: 1,
+            content: {
+              htmlList: [
+                {
+                  "src": null,
+                  "dynamic": null,
+                  "style": [
+                    {
+                      "col": 1,
+                      "colums": 3
+                    },
+                    {
+                      "col": 2,
+                      "colums": 3
+                    }
+                  ],
+                  "markdownList": null,
+                  "list": [
+                    "<p>1</p>",
+                    "<p>2</p>"
+                  ],
+                  "type": "DOUBLE"
+                },
+                {
+                  "src": null,
+                  "dynamic": null,
+                  "style": [
+                    {
+                      "col": 1,
+                      "colums": 4
+                    },
+                    {
+                      "col": 1,
+                      "colums": 4
+                    },
+                    {
+                      "col": 1,
+                      "colums": 4
+                    },
+                    {
+                      "col": 1,
+                      "colums": 4
+                    }
+                  ],
+                  "markdownList": null,
+                  "list": [
+                    "<p>1</p>",
+                    "<p>2</p>",
+                    "<p>3</p>",
+                    "<p>4</p>"
+                  ],
+                  "type": "QUADRUPLE"
+                },
+                {
+                  "src": null,
+                  "dynamic": null,
+                  "style": [
+                    {
+                      "col": 1,
+                      "colums": 4
+                    },
+                    {
+                      "col": 3,
+                      "colums": 4
+                    }
+                  ],
+                  "markdownList": null,
+                  "list": [
+                    "<p>1</p>",
+                    "<p>3</p>"
+                  ],
+                  "type": "DOUBLE"
+                },
+                {
+                  "src": null,
+                  "dynamic": null,
+                  "style": [
+                    {
+                      "col": 2,
+                      "colums": 3
+                    },
+                    {
+                      "col": 1,
+                      "colums": 3
+                    }
+                  ],
+                  "markdownList": null,
+                  "list": [
+                    "<p>2</p>",
+                    "<p>1</p>"
+                  ],
+                  "type": "DOUBLE"
+                }
+              ],
+              buttonList: [{ name: '我是标签1' }]
+            }
+          }
         ],
         apiKey: '123456789'
       },
@@ -10370,7 +10567,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

@@ -36,20 +36,12 @@
 
 <script>
 import { v4 as uuidv4 } from "uuid";
-import { multipartUpload, ossFileUrl } from "../assets/js/AliyunlssUtil";
+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: ''
         }
@@ -80,7 +72,6 @@ export default {
             inputObj.setAttribute('id', '_ef');
             inputObj.setAttribute('type', 'file');
             inputObj.setAttribute('accept', '*')
-            inputObj.setAttribute('capture', 'camcorder')
             inputObj.setAttribute('multiple', true)
             inputObj.setAttribute("style", 'visibility:hidden');
             document.body.appendChild(inputObj);
@@ -160,13 +151,12 @@ export default {
                 url: '',
             }
             let res = multipartUpload(
-                this.ossConfig,
                 file,
                 null,
                 imgInfo
             );
             res.then(resp => {
-                imgInfo.url = ossFileUrl(this.ossConfig, resp.name)
+                imgInfo.url = ossFileUrl(resp.name)
                 resolve({
                     name: resp.name,
                     default: imgInfo.url

package/src/components/actionSatisfaction.vue

@@ -17,7 +17,7 @@
                   )
                 "
       >
-        {{$t('actionSatisfaction.satisfaction')}}
+        满意
       </div>
       <div
           class="statisfaction-item"
@@ -32,7 +32,7 @@
                   )
                 "
       >
-        {{$t('actionSatisfaction.notSatisfied')}}
+        不满意
       </div>
     </div>
 
@@ -42,7 +42,7 @@
 <script>
 export default {
   name: "actionSatisfaction",
-  props:['msg',"language"],
+  props:['msg'],
   data(){
     return{
       isCheckSatis:false,

package/src/components/answerRadio.vue

@@ -4,7 +4,7 @@
       v-if="msg.content.description && !msg.content.isKnowledgeSummary"></p>
     <div class="bottom-link" v-if="msg.content.description && !msg.content.isKnowledgeSummary"></div>
     <div :class="['options-list', msg.content.isKnowledgeSummary ? 'isKnowledgeSummary' : '']">
-      <div v-if="msg.content.isKnowledgeSummary" class="tips">{{$t('answerRadio.tip')}}</div>
+      <div v-if="msg.content.isKnowledgeSummary" class="tips">AI为您推荐了以下内容</div>
       <div v-for="(option, index) in showOptions" class="options-item"
         :class="index !== msg.content.options.length - 1 ? 'recommend-item' : 'last-item'" :key="msg.nodeId + '_' + index"
         @click="radioClick(msg, option, index)">
@@ -13,7 +13,7 @@
       </div>
     </div>
     <div v-if="showPage" class="switch-page">
-      <span @click="changeActivePage" class="switch-page-btn">{{$t('answerRadio.loadMore')}}</span>
+      <span @click="changeActivePage" class="switch-page-btn">换一批</span>
       <!-- <span @click="showMore" class="switch-page-btn">查看更多</span> -->
     </div>
   </div>
@@ -32,7 +32,7 @@ export default {
       showOptions: [],
     }
   },
-  props: ['msg','language'],
+  props: ['msg'],
   mounted() {
     console.log(this.msg, 'msg');
     // 关键词推荐 前端分页

package/src/components/askVideo.vue

@@ -22,14 +22,11 @@
                 :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>
 <script>
-    import {ossConfig,uploadImageByBase64} from "../assets/js/AliyunlssUtil";
+    import {uploadImageByBase64} from "../assets/js/AliyunlssUtil";
 
     export default {
         name: "ask_video",
@@ -89,7 +86,7 @@
             console.debug('img.src',output)
             let base64 = canvas.toDataURL("image/png")
             let blob = that.dataURLtoFile(base64,'name')
-            let promise = uploadImageByBase64(ossConfig,blob);
+            let promise = uploadImageByBase64(blob);
             promise.then((res)=>{
               console.debug("upload base64 reslut",res);
               if (res&&res.url){
@@ -126,8 +123,6 @@
 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;
@@ -139,24 +134,6 @@ 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

@@ -68,10 +68,10 @@
         <span class="model-switch-handle-name">{{msg.footerStyleValue}}</span>
     </div>
     <van-popup v-model="previewShowPopup" position="bottom" v-if="previewShowPopup" :style="{ height: '90%', background:'#FFFFFF'}">
-      <previewDoc ref="previewDoc" :url="previewHref" :language="language" @close="close" v-if="previewShowPopup"></previewDoc>
+      <previewDoc ref="previewDoc" :url="previewHref" @close="close" v-if="previewShowPopup"></previewDoc>
     </van-popup>
     <el-drawer
-      :title="$t('common.drawerTitle')"
+      title="我是标题"
       :append-to-body="true"
       :model="false"
       :visible.sync="drawer"
@@ -79,7 +79,7 @@
       size="65%"
       v-if="drawer"
     >
-      <previewDoc ref="previewDoc" :url="previewHref" :language="language" @close="close" v-if="drawer"></previewDoc>
+      <previewDoc ref="previewDoc" :url="previewHref" @close="close" v-if="drawer"></previewDoc>
     </el-drawer>
   </div>
 </template>
@@ -92,7 +92,7 @@
   export default {
     name: "associationIntention",
     components: {Recommend, askVideo, previewDoc},
-    props: ["msg",'msgType','isOpen','sourceOhm','isOhmPc', 'nodownload', 'hiddenHeaderFooter','language'],
+    props: ["msg",'msgType','isOpen','sourceOhm','isOhmPc', 'nodownload', 'hiddenHeaderFooter'],
     filters: {
       imageStyle: function (html) {
         //富文本内图片自适应高度宽度
@@ -115,6 +115,8 @@
         drawer:false
       }
     },
+    mounted() {
+    },
     methods:{
       // 将匹配结果替换表情图片
       emotion(res) {
@@ -235,7 +237,7 @@
         this.$emit("onRadioClick", id, name, apikey,optionApiKey);
       },
       onImageClick(url){
-        this.$emit('onImageClick', encodeURI(url))
+        this.$emit('onImageClick',url)
       },
       msgContent(content){
         console.debug('215',content)
@@ -366,12 +368,6 @@
       display: block;
     }
   }
-  /deep/ img {
-    height: auto;
-    width: calc(100vw - 137px);
-    border-radius: 25px;
-    max-width: 230px;
-  }
 }
 /deep/.el-drawer__body{
   height: 100%;