askbot-dragon 88.1.4 → 88.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "askbot-dragon",
-  "version": "88.1.4",
+  "version": "88.1.6",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",

package/src/components/ConversationContainer.vue

@@ -215,7 +215,7 @@ export default {
       answerDocknowledge: {"actionCategory":null,"apiKey":null,"content":{"searchResult":null,"images":null,"llmBotPluginId":null,"srcContentId":null,"list":[{"owner":"15901107866","tagId":"67492d69c3fc616496d7708e","enterprise":null,"tagIds":["67492d69c3fc616496d7708e","67492d69c3fc616496d7708d"],"format":"pdf","srcContentId":"8ae8631d27d5fc9e0d6429c32ce02463","updateTime":"2024-11-29 10:56:41","avatar":"https://guoranopen-zjk.oss-cn-zhangjiakou.aliyuncs.com/ab0f90737c8b4f2d85ba2157e4473110/2024/10/22/15/29/2d00b3ee264f6b588bc39c87cd71ff86/zrx651dojth.jpeg","source":"LOCAL_FILE","srcContent":"\"\",,,,,,,,,,,,,,,,  \"\",境内出差标准(人民币),,,,,,,,,,,,,,,  \"\",,,,,,,,,,,,,,,,  \"\",,职称,,住宿标准,,出差补贴,,,,,,,,,,  \"\",,,,,,,,,,,出差补贴,,,,,  \"\",,,(实报实销),,,,,,,,,,,,,  \"\",职级,职称,,,,,,,,,,,,,,  \"\",,甲类地,,,乙类地,,,丙类地,,,甲类,,,乙丙类,,  \"\",,,,,,,,,,,,,,,,  \"\",,,区,区,区,地区,地区,,,,,,,,,  \"\",24-20,\"总裁/高级副总裁/副总裁/总经理/首 席技术专家/首席幕僚长/总裁资深特 别助理/总监/副总经理/资深技术专家 /专业总监\",无固定限额,无,,,,,,,,,,,,  \"\",19-18,\"副总监/资深研究员/专业副总监/高级 经理/高级研究员/专业高级经理\",700,600,500,100/天,80/天,,,,,,,,,  \"\",17,\"经理/副经理/专业经理/资深专员/研 究员/资深化学师/资深工程师/经理级 销售/资深销售\",500,400,350,,,,,,,,,,,  \"\",16,\"高级主任/高级专员/高级销售/高级工 程师/主任/专员/销售专员/工程师\",400,300,250,,,,,,,,,,,  \"\",15 以下,\"初级专员/初级销售专员/助理工程师/ 文员\",300,250,200,,,,,,,,,,,  ","url":"https://guoranwisdom.oss-cn-zhangjiakou.aliyuncs.com/ab0f90737c8b4f2d85ba2157e4473110/2024/11/29/10/56/bb94d33df583b246fd77034eaafe52cd/753yywz8dh.pdf","knowledgeId":"67492d62ff865b253159dd5d","folderUrl":null,"reRankShowScore":"69.53","knowledgePartId":"6MnZdZMB5ZPhLd1ZZb9J","from":"立邦中国差旅管理办法2023.pdf","folderName":null,"introduction":"\"\",,,,,,,,,,,,,,,,  \"\",境内出差标准(人民币),,,,,,,,,,,,,,,  \"\",,,,,,,,,,,,,,,,  \"\",,职称,,住宿标准,,出差补贴,,,,,,,,,,  \"\",,,,,,,,,,,出差补贴,,,,,  \"\",,,(实报实销),,,,,,,,,,,,,  \"\",职级,职称,,,,,,,,,,,,,,  \"\",,甲类地,,,乙类地,,,丙类地,,,甲类,,,乙丙类,,  \"\",,,,,,,,,,,,,,,,  \"\",,,区,区,区,地区,地区,,,,,,,,,  \"\",24-20,\"总裁/高级副总裁/副总裁/总经理/首 席技术专家/首席幕僚长/总裁资深特 别助理/总监/副总经理/资深技术专家 /专业总监\",无固定限额,无,,,,,,,,,,,,  \"\",19-18,\"副总监/资深研究员/专业副总监/高级 经理/高级研究员/专业高级经理\",700,600,500,100/天,80/天,,,,,,,,,  \"\",17,\"经理/副经理/专业经理/资深专员/研 究员/资深化学师/资深工程师/经理级 销售/资深销售\",500,400,350,,,,,,,,,,,  \"\",16,\"高级主任/高级专员/高级销售/高级工 程师/主任/专员/销售专员/工程师\",400,300,250,,,,,,,,,,,  \"\",15 以下,\"初级专员/初级销售专员/助理工程师/ 文员\",300,250,200,,,,,,,,,,,  ","previewImage":null}],"type":0,"srcContent":null,"whetherRequestStream":null,"knowledgeId":null,"actionType":"answer_doc_knowledge","async":null,"stream":null,"knowledgePartId":null,"recommendItems":["离境出差的标准是什么？","出差审批流程是怎样的？","差旅费报销标准有哪些？"],"text":"### 境内出差标准\n\n| 职级 | 职称 | 甲类地住宿标准 | 乙类地住宿标准 | 丙类地住宿标准 | 出差补贴 |\n| --- | --- | --- | --- | --- | --- |\n| 24-20 | 总裁/高级副总裁/副总裁/总经理/首席技术专家/首席幕僚长/总裁资深特别助理/总监/副总经理/资深技术专家/专业总监 | 无固定限额 | 无固定限额 | 无固定限额 | 无 |\n| 19-18 | 副总监/资深研究员/专业副总监/高级经理/高级研究员/专业高级经理 | 700 | 600 | 500 | 100/天 |\n| 17 | 经理/副经理/专业经理/资深专员/研究员/资深化学师/资深工程师/经理级销售/资深销售 | 500 | 400 | 350 | 无 |\n| 16 | 高级主任/高级专员/高级销售/高级工程师/主任/专员/销售专员/工程师 | 400 | 300 | 250 | 无 |\n| 15 以下 | 初级专员/初级销售专员/助理工程师/文员 | 300 | 250 | 200 | 无 |\n\n**备注**：\n- 甲类地区：指北京、上海、广州、深圳。\n- 乙类地区：地级以上城市。\n- 丙类地区：指甲、乙类地区以外的地区。","renderType":2,"streamRequestUrl":null},"id":null,"intentId":null,"msgId":"67492de6524fbe07a2190b90","nodeId":null,"recordId":24190,"type":"answer_doc_knowledge"},
       answerDocknowledge4: {
         "content":{"images":[
-      {"url":"https://guoranwisdom.oss-cn-zhangjiakou.aliyuncs.com/ab0f90737c8b4f2d85ba2157e4473110/2024/12/25/12/38/58/676b8b26643e014bc160fb76/image1.jpeg"}, 
+      {"url":"https://guoranwisdom.oss-cn-zhangjiakou.aliyuncs.com/ab0f90737c8b4f2d85ba2157e4473110/2024/12/25/12/38/58/676b8b26643e014bc160fb76/image1.jpeg"},
       {"url":"https://itsm.mengniu.cn/o/bk_itsm/api/misc/download_rich_file/?file_path=/data/app/code/USERRES/richText/56389331cd62b3c1a47e22d499cd565e"},
       {"url":"https://guoranopen-zjk.oss-cn-zhangjiakou.aliyuncs.com/front-oss/31623ccfe9dd4957bbd59c5823878bbe/2025/01/07/17/39/3fccf81e21cbcfaf7c0e1a69a848b5c0/1eeb31f8-1d9b-4d70-8cfd-4750f48c95ee.png"},
       {"url":"https://guoranwisdom.oss-cn-zhangjiakou.aliyuncs.com/ab0f90737c8b4f2d85ba2157e4473110/2024/12/25/12/38/58/676b8b26643e014bc160fb76/image1.jpeg"},

package/src/components/askVideo.vue

@@ -2,7 +2,8 @@
     <div
             v-loading="loading"
             :element-loading-text="showProgress"
-            id="dragon-video"
+            class="dragon-video"
+            :id="'dragon-video' + msg.msgId"
     >
         <!-- <video-player
           class="video-player vjs-custom-skin"
@@ -12,16 +13,19 @@
         /> -->
         <video
                 controls="controls"
-                :controlslist="nodownload&&'nodownload'"
+                :controlslist="controlAttributes"
                 :raw-controls="true"
                 x5-video-player-type="h5-page"
                 style="object-fit: contain;width: calc(100vw - 139px);height: 160px;background-color: black;border-radius: 10px;max-width: 230px;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'">
+                :id="msg.msgId+'key'">
           <source :src="videoSrc"/>
         </video>
+      <div v-if="isFullscreen" class="close-fullscreen" @click="closeFullScreen">
+        <i class="iconfont guoran-tongyichicun-guanbi2"></i>
+      </div>
       <div id="output"></div>
     </div>
 </template>
@@ -34,7 +38,9 @@
         data() {
             return {
               videoSrc:'',
-              poster:''
+              poster:'',
+              isFullscreen:false,
+              isAndroid:false
             }
         },
         watch: {
@@ -48,6 +54,13 @@
             },
             src() {
                 return this.url ? this.url : this.localUrl;
+            },
+            controlAttributes(){
+              /* 安卓手机自定义了全屏样式，所以禁掉原生的全屏 */
+              const attributes = []
+              if (this.isAndroid) attributes.push('nofullscreen')
+              if (this.nodownload&&'nodownload') attributes.push('nodownload')
+              return attributes.join(' ')
             }
         },
       mounted() {
@@ -58,6 +71,29 @@
             console.debug('newVideoSrc',this.videoSrc,videoSrc)
             this.poster = this.videoSrc+'?spm=qipa250&x-oss-process=video/snapshot,t_1000,f_jpg,w_0,h_0,m_fast'
             console.debug('poster',this.poster)
+            /* 安卓手机播放视频默认全屏设置  ios默认就是全屏 */
+            let id = this.msg.msgId + 'key'
+            const video = document.getElementById(id);
+            let containerId = 'dragon-video' + this.msg.msgId
+            const videoContainer = document.getElementById(containerId);
+            // 仅在 Android 设备尝试自动全屏
+            const isAndroid = /Android/i.test(navigator.userAgent);
+            this.isAndroid = isAndroid;
+            if (isAndroid){
+              video.addEventListener('play', () => {
+                // 仅在全屏请求由用户触发时有效（如点击播放按钮后）
+                videoContainer.classList.add('force-fullscreen'); // 降级方案
+                this.isFullscreen = true;
+              });
+              // 点击关闭按钮或按 ESC 退出
+              document.addEventListener('fullscreenchange', () => {
+                if (!document.fullscreenElement) {
+                  videoContainer.classList.remove('force-fullscreen');
+                  this.isFullscreen = false;
+                }
+              });
+            }
+
           })
 
       },
@@ -117,6 +153,12 @@
           return new File([u8arr], filename, {type:mime});
           //转换成成blob对象
           /*return new Blob([u8arr],{type:'image/png'});*/
+        },
+        closeFullScreen(){
+          this.isFullscreen = false;
+          let containerId = 'dragon-video' + this.msg.msgId
+          const videoContainer = document.getElementById(containerId);
+          videoContainer.classList.remove('force-fullscreen');
         }
       }
 
@@ -124,8 +166,10 @@
 </script>
 <style scoped lang="less">
 video::-webkit-media-controls-mute-button { display: none !important;}
-#dragon-video{
+.dragon-video{
   position: relative;
+  width: calc(100vw - 109px);
+  max-width: 260px;
   #outputVideo{
     position: absolute;
     top: 0px;
@@ -138,5 +182,34 @@ video::-webkit-media-controls-mute-button { display: none !important;}
 
   }
 }
+/* 强制竖屏全屏样式 */
+.force-fullscreen {
+  position: fixed !important;
+  top: 0 !important;
+  left: 0 !important;
+  width: 100vw !important;
+  height: 100vh !important;
+  object-fit: contain !important;
+  background: black !important;
+  z-index: 9999 !important;
+  max-width: 100vw!important;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  video{
+    max-width: 100% !important;
+    width: 100% !important;
+    height: 100% !important;
+  }
+  .close-fullscreen{
+    position: absolute;
+    top: 10px;
+    right: 10px;
+    i{
+      color: #ffffff;
+      font-size: 20px;
+    }
+  }
+}
 
 </style>

package/src/components/associationIntention.vue

@@ -254,20 +254,33 @@
         var reg = /^(?:http(s)?:\/\/)?[\w.-]+(?:\.[\w\.-]+)+[\w\-\._~:/?#[\]@!\$&'\*\+,;=.]+$/;
         /* eslint-enable*/
         if (e.target.localName == 'a'){
-          console.log(252);
-          this.previewHref = e.target.href;
-          console.log(254, this.previewHref);
-          if (this.previewHref.includes('https://www') || this.previewHref.includes('http://www') || (this.previewHref.indexOf('https://static.guoranbot.com') == -1 && this.previewHref.indexOf('https://guoranopen-zjk.oss-cn-zhangjiakou.aliyuncs.com'))){
-            return
-          } else {
-            if (isMobile()){
-              this.previewShowPopup = true
-              e.returnValue = false
+            console.log(252);
+            this.previewHref = e.target.href;
+            console.log(254, this.previewHref);
+            if (this.previewHref.includes('https://www') || this.previewHref.includes('http://www') || (!this.previewHref.includes('https://static.guoranbot.com') && this.previewHref.includes('https://guoranopen-zjk.oss-cn-zhangjiakou.aliyuncs.com'))){
+                return
+            } else if(this.previewHref.includes('/pages/opportunity/index') ||
+                this.previewHref.includes('/pages/webViewTransit/index')
+            ) {
+                uni && uni.postMessage({
+                    data: {
+                        path: this.previewHref,
+                    }
+                })
+                // 很不理解为什么要这样做
+                setTimeout(()=> {
+                    uni && uni.navigateBack()
+                }, 100)
+                e.returnValue = false
             } else {
-              this.drawer = true;
-              e.returnValue = false
+                if (isMobile()){
+                    this.previewShowPopup = true
+                    e.returnValue = false
+                } else {
+                    this.drawer = true;
+                    e.returnValue = false
+                }
             }
-          }
           // let url = ''
           // try {
           //   url = btoa(e.target.href)

package/src/components/interruptComponents/imageSelectionAnswer.vue

@@ -0,0 +1,201 @@
+<template>
+  <div class="imageSelectionAnswer">
+    <div class="imageSelectionText" v-if="msg.content.prompt">
+      {{msg.content.prompt}}
+    </div>
+    <div class="imageList">
+      <div class="imageItem"
+           v-for="(item,index) in msg.content.options"
+           :key="index"
+           :class="disabled || isDisabled ? 'disabledItem' : ''"
+      >
+        <el-image
+            style="width: 120px!important; height: 120px!important;"
+            :src="item.url"
+            @click="onImageClick(item.url)"
+            fit="cover">
+          <template #placeholder>
+            <div class="custom-loading">
+              <i class="el-icon-loading"></i>
+            </div>
+          </template>
+          <template #error>
+            <div class="custom-error">
+              <i class="el-icon-picture-outline"></i>
+            </div>
+          </template>
+        </el-image>
+        <div class="checkIcon"
+             :class="checkImage && checkImage.url === item.url ? 'activeCheckIcon' : 'noCheckIcon'"
+             @click="selectImage(item)"
+        >
+          <div class="centerIcon" v-if="checkImage && checkImage.url === item.url">
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="answerButton" v-if="msg.content.handleSettings && msg.content.handleSettings.length > 0" :class="disabled || isDisabled || !checkImage ? 'disabledButton' : ''">
+      <div class="buttonText"
+           v-for="(item,index) in msg.content.handleSettings"
+           :key="index"
+           @click="imageSelectionConfirm(item)"
+      >
+        {{ item }}
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "imageSelectionAnswer",
+  data(){
+    return{
+      checkImage:"",
+      isDisabled:false
+    }
+  },
+  props:{
+    answer:{
+      type:Object,
+      default(){
+        return{}
+      }
+    },
+    disabled:{
+      type:Boolean,
+      default:false
+    },
+    msg:{
+      type:Object,
+      default(){
+        return{}
+      }
+    },
+  },
+  methods:{
+    previewList(options){
+      let arr = [];
+      arr = options.map(item => item.url)
+      return arr
+    },
+    selectImage(item){
+      if (this.disabled || this.isDisabled){
+        return
+      }
+      this.checkImage = item;
+    },
+    imageSelectionConfirm(item){
+      if (this.disabled || this.isDisabled || !this.checkImage){
+        return
+      }
+      this.isDisabled = true;
+      this.$emit('imageSelectionConfirm',item,this.checkImage,this.msg)
+    },
+    onImageClick(url){
+      this.$emit('onImageClick',url)
+    },
+  }
+};
+</script>
+
+<style scoped lang="less">
+.imageSelectionAnswer{
+  .imageSelectionText{
+    padding-bottom: 10px;
+  }
+  .imageList{
+    display: flex;
+    align-items: center;
+    justify-content: flex-start;
+    flex-wrap: wrap;
+    background-color: #ffffff;
+    .imageItem{
+      position: relative;
+      margin-right: 10px;
+      margin-bottom: 5px;
+      margin-top: 5px;
+      .checkIcon{
+        position: absolute;
+        top: 0;
+        right: 0;
+        width: 15px;
+        height: 15px;
+        border-radius: 8px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        flex: none;
+      }
+      .activeCheckIcon{
+        background: #366AFF;
+        border: 1px solid #366AFF;
+        .centerIcon{
+          width: 6px;
+          height: 6px;
+          background: #FFFFFF;
+          border-radius: 50%;
+          flex: none;
+        }
+      }
+      .noCheckIcon{
+        background: #FFFFFF;
+        border: 1px solid #EBEDF4;
+      }
+    }
+  }
+  .answerButton{
+    padding-top: 10px;
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border-top: 1px solid #EEEEEE;
+    .buttonText{
+      padding: 0 4px;
+      cursor: pointer;
+      color: #366aff;
+    }
+  }
+  .disabledItem{
+    .checkIcon{
+      background-color: #edf2fc!important;
+    }
+    .centerIcon{
+      background: #366aff!important;
+    }
+  }
+  .custom-loading,
+  .custom-error {
+    width: 100%;
+    height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background: #f5f7fa;
+  }
+
+  .custom-loading {
+    color: #366aff;
+  }
+
+  .custom-error {
+    color: red;
+  }
+
+  .el-icon-loading {
+    font-size: 24px;
+    animation: rotating 2s linear infinite;
+  }
+
+  @keyframes rotating {
+    from { transform: rotate(0deg); }
+    to { transform: rotate(360deg); }
+  }
+}
+.disabledButton{
+  .buttonText{
+    color: #A9B3C6!important;
+  }
+}
+</style>

package/src/components/interruptComponents/multipleChoiceAnswer.vue

@@ -0,0 +1,132 @@
+<template>
+  <div class="multipleChoiceAnswer">
+    <div class="multipleText" v-if="msg.content.prompt">
+      {{msg.content.prompt}}
+    </div>
+    <div class="multipleList" :class="msg.content.options && msg.content.options.length == 0 ? 'disabledMultiple' : ''">
+      <el-checkbox-group v-model="checkList">
+        <el-checkbox
+            :label="item._metadata.id"
+            v-for="item in msg.content.options"
+            :key="item._metadata.id"
+            :disabled="disabled || isDisabled"
+        >
+          <el-image
+              style="width: 32px!important; height: 32px!important;margin-right: 4px;flex: none"
+              :src="item.url"
+              v-if="item.url"
+              @click.stop="onImageClick(item.url)"
+              fit="cover"></el-image>
+          {{ item.text }}
+        </el-checkbox>
+      </el-checkbox-group>
+    </div>
+    <div class="answerButton" v-if="msg.content.handleSettings && msg.content.handleSettings.length > 0" :class="disabled || isDisabled || checkList.length === 0 ? 'disabledButton' : ''">
+      <div class="buttonText"
+           v-for="(item,index) in msg.content.handleSettings"
+           :key="index"
+           @click="multipleChoiceConfirm(item)"
+      >
+        {{ item }}
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "multipleChoiceAnswer",
+  data(){
+    return{
+      checkList:[],
+      isDisabled:false
+    }
+  },
+  props:{
+    disabled:{
+      type:Boolean,
+      default:false
+    },
+    msg:{
+      type:Object,
+      default(){
+        return{}
+      }
+    },
+  },
+  methods:{
+    previewList(options){
+      let arr = [];
+      arr = options.map(item => item.url)
+      return arr
+    },
+    multipleChoiceConfirm(item){
+      if (this.disabled || this.isDisabled || this.checkList.length === 0){
+        return
+      }
+      this.isDisabled = true;
+      this.$emit('multipleChoiceConfirm',item,this.checkList,this.msg)
+    },
+    onImageClick(url){
+      this.$emit('onImageClick',url)
+    },
+  }
+};
+</script>
+
+<style scoped lang="less">
+.multipleChoiceAnswer{
+  .multipleText{
+    //margin-bottom: 10px;
+  }
+  .multipleList{
+    display: flex;
+    justify-items: flex-start;
+    padding: 8px 0;
+    background-color: #ffffff;
+    /deep/.el-checkbox-group{
+      //display: flex;
+      //align-items: center;
+      //flex-direction: column;
+      .el-checkbox{
+        margin-right: 0!important;
+        margin-bottom: 10px;
+        display: flex;
+        align-items: center;
+        .el-checkbox__label{
+          display: flex;
+          align-items: center;
+          color: #000000;
+          white-space: pre-line;
+        }
+      }
+    }
+  }
+  .answerButton{
+    padding-top: 10px;
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border-top: 1px solid #EEEEEE;
+    .buttonText{
+      padding: 0 4px;
+      cursor: pointer;
+      color: #366aff;
+    }
+  }
+}
+.disabledMultiple{
+  /deep/.el-checkbox__input{
+    display: none;
+  }
+  /deep/.el-checkbox__label{
+    padding-left: 0;
+  }
+}
+.disabledButton{
+  .buttonText{
+    color: #A9B3C6!important;
+  }
+}
+</style>

package/src/components/interruptComponents/singleChoiceAnswer.vue

@@ -0,0 +1,81 @@
+<template>
+  <div class="singleChoiceAnswer">
+    <div class="singleChoiceText" v-if="msg.content.prompt">
+      {{msg.content.prompt}}
+    </div>
+    <div class="optionsList" :class="isDisabled || disabled ? 'disabledOption' : ''">
+      <div
+          v-for="(option, index) in msg.content.options"
+          class="optionsItem"
+          :key="index"
+          @click="handleClick(option)"
+      >
+        <span> {{ option.text }}</span>
+        <i class="arsenal_icon arsenalangle-right-solid"></i>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "singleChoiceAnswer",
+  data(){
+    return{
+      isDisabled:false
+    }
+  },
+  props:{
+    msg:{
+      type:Object,
+      default(){
+        return{}
+      }
+    },
+    disabled:{
+      type:Boolean,
+      default:false
+    }
+  },
+  methods:{
+    handleClick(item){
+      if (this.disabled || this.isDisabled){
+        return
+      }
+      this.isDisabled = true;
+      this.$emit('singleChoice',item,this.msg)
+    }
+  }
+};
+</script>
+
+<style scoped lang="less">
+.singleChoiceAnswer{
+
+  .singleChoiceText{
+    //padding-bottom: 10px;
+  }
+  .optionsList {
+    padding-top: 4px;
+
+    .optionsItem {
+      line-height: 25px;
+      background-color: #ffffff;
+      color: #366aff;
+      cursor: pointer;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      padding: 8px 0;
+      i {
+        padding-left: 10px;
+      }
+    }
+  }
+  .disabledOption{
+    .optionsItem{
+      color: #A9B3C6!important;
+    }
+  }
+}
+</style>

package/src/components/markDownText.vue

@@ -14,16 +14,16 @@
             <div class="think_content" :class="showThink ? '' : 'hide_think'" v-html="parseThinkVal">
             </div>
         </div>
-        <!-- <vue-markdown 
-            class="mark_down" 
-            :source="typedContent" 
-            :ref="'markdown' + msgId" 
+        <!-- <vue-markdown
+            class="mark_down"
+            :source="typedContent"
+            :ref="'markdown' + msgId"
             @click.native="clickMarkDown"
             :plugins="plugins"
         >
         </vue-markdown> -->
         <!-- v-show="hasContent"  -->
-        <div 
+        <div
             class="mark_down"
             v-html="markParseText"
             ref="markDown"
@@ -39,8 +39,8 @@
 
 <script>
 /* eslint-disable */
-import VueMarkdown from 'vue-markdown';
-import ImgView from "./imgView";
+// import VueMarkdown from 'vue-markdown';
+import ImgView from "./imgView.vue";
 // import Typed from "typed.js";
 import hljs from 'highlight.js';
 import 'highlight.js/styles/default.css';
@@ -128,8 +128,7 @@ export default {
         }
     },
     components: {
-        ImgView,
-        VueMarkdown
+        ImgView
     },
     mounted() {
         this.$nextTick(() => {
@@ -182,7 +181,9 @@ export default {
                 clearInterval(this.thinkTimer)
                 this.thinkTimer = null
                 this.thinkEnd = true
-                this.removeLoadingNode()
+                setTimeout(() => {
+                    this.removeLoadingNode()
+                }, 200)
                 this.$emit("streamCallback", this.typedContent)
                 this.$emit("sseOtherInfo", this.msgId, "start", "");
             }, 200);
@@ -282,7 +283,7 @@ export default {
             this.$emit("answerDocKnowledgeFn");
             this.eventSource = new EventSource(url);
             this.$emit("streamStatus", true, this.msgId);
-            this.$set(this, 'showThink', true);
+            // this.$set(this, 'showThink', true);
             this.signSetFlag = false;
             this.thinkEnd = false
             let tempString = "";
@@ -343,7 +344,9 @@ export default {
                             this.$emit("streamCallback", this.typedContent)
                             this.$emit("streamStatus", false, this.msgId);
                             this.appendCopyBtn()
-                            this.removeLoadingNode()
+                            setTimeout(() => {
+                                this.removeLoadingNode()
+                            }, 200);
                             this.$emit("sseOtherInfo", this.msgId, "start", "");
                         }
 
@@ -366,6 +369,22 @@ export default {
                     recommendItems = data;
                 } else if (event.lastEventId === 'retry') {
                     this.retryUrl = data.content;
+                } else if (event.lastEventId === 'generated_image') {
+                    let imgs = JSON.parse(data.content);
+                    let imgsStr = "";
+                    for (let i = 0; i < imgs.length; i++) {
+                        imgsStr += `![](${imgs[i].oss_url})`;
+                    }
+                    this.$set(this, "typedContent", this.typedContent + imgsStr);
+
+                    // 模拟图片推送
+                    // let imgs = JSON.parse('[{"oss_url":"https://guoranopen-zjk.oss-cn-zhangjiakou.aliyuncs.com/generated-img/generated_img_865652a94b374337b2ac703466cdea94.png"}]');
+                    // let imgsStr = "";
+                    // for (let i = 0; i < imgs.length; i++) {
+                    //     imgsStr += `![](${imgs[i].oss_url})`;
+                    // }
+                    // this.$set(this, "typedContent", this.typedContent + imgsStr);
+
                 }  else if (event.lastEventId === 'source') {
                     this.$emit("changedHeadStatusValue", this.msgId, data);
                 }  else {
@@ -534,7 +553,7 @@ export default {
                 this.imgList.splice(index, 1);
                 this.imgList.unshift(previewImageUrl);
             }
-           
+
         },
         closeViewer() {
             this.showPreview = false;
@@ -591,7 +610,7 @@ export default {
             let codeList = doc.querySelectorAll('pre code')
             codeList.forEach(ele =>{
                 let list = ele.getElementsByClassName("code_copy_btn")
-                if(list.length == 0 && ele.classList.contains("hljs")) {
+                if(list.length == 0 && ele.classList.contains("hljs") && !ele.classList.contains("hljs-undefined")) {
                     let text = ele.innerText
                     let btnId = uuidv4();
                     let copy = document.createElement('div')

package/src/components/outputComponents/outputCom.vue

@@ -0,0 +1,149 @@
+<template>
+  <div class="outputComponents">
+    <div class="outputText" v-if="msg.content.prompt">
+      {{ msg.content.prompt }}
+    </div>
+    <el-table
+        :data="tableData"
+        style="width: 100%"
+        height="250"
+        @selection-change="handleSelectionChange"
+        v-if="msg.content.tableTemplate &&
+        (msg.content.tableTemplate == 1 || msg.content.tableTemplate == 2 || msg.content.tableTemplate == 3)"
+        :header-cell-style="{ backgroundColor: '#F6F8FD', height: '40px', color: '#000000', fontWeight: 400 }"
+        :row-style="{ height: '40px', color: '#000000' }"
+    >
+      <el-table-column
+          type="selection"
+          v-if="msg.content.tableTemplate == 2 || msg.content.tableTemplate == 3"
+          align="center"
+          :selectable="checkSelectable"
+          width="55">
+      </el-table-column>
+      <el-table-column
+          fixed
+          prop="name"
+          label="产品名称"
+          width="150">
+      </el-table-column>
+      <el-table-column
+          prop="number"
+          label="产品编号"
+          align="center"
+          width="120"
+      >
+      </el-table-column>
+      <el-table-column
+          prop="inventory"
+          label="产品库存"
+          align="center"
+          width="80">
+      </el-table-column>
+      <el-table-column
+          prop="consumption"
+          label="今日平均消耗量"
+          align="center"
+          width="120">
+      </el-table-column>
+    </el-table>
+    <div class="handleButton" v-if="msg.content.handleSettings && msg.content.handleSettings.length > 0" :class="disabled || isDisabled || selection.length === 0 ? 'disabledButton' : ''">
+      <div class="buttonText"
+           v-for="(item,index) in msg.content.handleSettings"
+           :key="index"
+           @click="confirmFun(item)"
+      >
+        {{ item }}
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "outputCom",
+  data(){
+    return{
+      isDisabled:false,
+      selection:[],
+      tableData:[
+        {
+          name:"正新香辣大鸡排",
+          number:"ZX78OIJ867",
+          inventory:"88",
+          consumption:"24"
+        },
+        {
+          name:"正新香辣大鸡排",
+          number:"ZX78OIJ867",
+          inventory:"88",
+          consumption:"24"
+        },{
+          name:"正新香辣大鸡排",
+          number:"ZX78OIJ867",
+          inventory:"88",
+          consumption:"24"
+        }
+        ,{
+          name:"正新香辣大鸡排",
+          number:"ZX78OIJ867",
+          inventory:"88",
+          consumption:"24"
+        }
+      ]
+    }
+  },
+  props:{
+    msg:{
+      type:Object,
+      default(){
+        return {}
+      }
+    },
+    disabled:{
+      type:Boolean,
+      default:false
+    }
+  },
+  methods:{
+    checkSelectable(){
+      return !this.disabled && !this.isDisabled
+    },
+    handleSelectionChange(val){
+      this.selection = val;
+    },
+    confirmFun(item){
+      if (this.disabled || this.isDisabled || this.selection.length == 0){
+        return
+      }
+      this.isDisabled = true;
+      this.$emit('confirmFun',item,this.selection,this.msg)
+    }
+  }
+};
+</script>
+
+<style scoped lang="less">
+.outputComponents{
+  .outputText{
+    padding-bottom: 10px;
+  }
+  .handleButton{
+    padding-top: 10px;
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border-top: 1px solid #EEEEEE;
+    .buttonText{
+      padding: 0 4px;
+      cursor: pointer;
+      color: #366aff;
+    }
+  }
+  .disabledButton {
+    .buttonText {
+      color: #A9B3C6 !important;
+    }
+  }
+}
+</style>