askbot-dragon 1.6.78-beta → 1.6.78

package/src/components/answerRadio.vue

@@ -4,20 +4,23 @@
       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">AI为您推荐了以下内容</div>
-      <div v-for="(option, index) in formatOptions[activeIndex]" class="options-item"
+      <div v-if="msg.content.isKnowledgeSummary" class="tips">{{$t('dragonCommon.AIrecommends')}}</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)">
-
-        <!-- <el-tooltip class="item" effect="dark" :content="option.name" placement="bottom-start" v-if="!isMobile">
-            <span > {{ option.name }}</span>
-          </el-tooltip> -->
-        <span> {{ option.name }}</span>
+        <!-- <el-tooltip :disabled="!isMobile" class="item" effect="dark" :content="$t('dragonCommon.clickme')" placement="top">
+          <span class="options-item-name"> {{ getFilteredName(option.name) }}</span>
+        </el-tooltip> -->
+        <div class="tooltip-wrapper">
+          <span class="tooltip-text options-item-name"> {{ getFilteredName(option.name) }}</span>
+          <span v-if="!isMobile" class="tooltip-content">{{$t('dragonCommon.clickme')}}</span>
+        </div>
         <i class="arsenal_icon arsenalangle-right-solid"></i>
       </div>
     </div>
     <div v-if="showPage" class="switch-page">
-      <span @click="changeActivePage" class="switch-page-btn">换一批</span>
+      <span @click="changeActivePage" class="switch-page-btn">{{$t('dragonCommon.refresh')}}</span>
+      <!-- <span @click="showMore" class="switch-page-btn">查看更多</span> -->
     </div>
   </div>
 </template>
@@ -32,13 +35,17 @@ export default {
       activeIndex: 0,
       pageSize: 5,
       showPage: false,
+      showOptions: [],
     }
   },
   props: ['msg'],
   mounted() {
+    console.log("askbot-dragon: systemLanguage", sessionStorage.getItem("systemLanguage"));
+    this.$i18n.locale = sessionStorage.getItem("systemLanguage") || 'cn';
     console.log(this.msg, 'msg');
     // 关键词推荐 前端分页
-    if (this.msg.id == "recdNodeId" && this.msg.content.options.length > this.pageSize) {
+    if ((this.msg.id == "recdNodeId" || this.msg.content.groupVisible) && this.msg.content.options.length > this.pageSize) {
+      this.pageSize = this.msg.content.groupNumber || 5;
       this.formatOptions = this.chunkArray(this.msg.content.options, this.pageSize);
       this.activeIndex = 0;
       this.showPage = true;
@@ -46,15 +53,33 @@ export default {
       this.formatOptions = [this.msg.content.options];
       this.activeIndex = 0;
     }
+    this.showOptions = this.formatOptions[0];
     this.judgeIsMobile();
   },
   methods: {
+    getFilteredName(name) {
+      if (typeof name === 'string') {
+        return name.replace(/<\/?p>/g, '');
+      } else {
+        return name;
+      }
+    },
+    showMore(){
+      if (this.activeIndex == this.formatOptions.length - 2) {
+        this.activeIndex++;
+        this.showPage = false;
+      } else {
+        this.activeIndex++;
+      }
+      this.showOptions = [...this.showOptions.concat(this.formatOptions[this.activeIndex])]
+    },
     changeActivePage(){
       if (this.activeIndex >= this.formatOptions.length - 1) {
         this.activeIndex = 0;
       } else {
         this.activeIndex++;
       }
+      this.showOptions = this.formatOptions[this.activeIndex]
     },
     chunkArray(array, size) {
       let chunks = [];
@@ -83,8 +108,52 @@ export default {
 
 }
 </script>
-
+<style  lang="less">
+  /* 包裹元素，相对定位，用于定位提示框 */
+  .tooltip-wrapper {
+    position: relative;
+    display: inline-block;
+  }
+  /* 实际要显示的文本内容 */
+  /* 提示框样式 */
+  .tooltip-content {
+    visibility: hidden;
+    background-color: #333;
+    color: white;
+    text-align: center;
+    border-radius: 6px;
+    padding: 5px 10px;
+    position: absolute;
+    z-index: 1;
+    bottom: 100%;
+    left: 50%;
+    transform: translateX(-50%);
+    white-space: nowrap;
+    opacity: 0;
+    transition: opacity 0.3s;
+  }
+  /* 提示框下方的小三角样式（使用伪元素实现） */
+  .tooltip-content::after {
+    content: "";
+    position: absolute;
+    top: 100%;
+    left: 50%;
+    margin-left: -5px;
+    border-width: 5px;
+    border-style: solid;
+    border-color: #333 transparent transparent transparent;
+  }
+  /* 鼠标悬浮在包裹元素上时，显示提示框 */
+  .tooltip-wrapper:hover{
+    .tooltip-content {
+      visibility: visible !important;
+      opacity: 0.8;
+    }
+ }
+</style>
 <style scoped lang="less">
+@import "../assets/less/variables.less";
+
 #answer-radio {
   .switch-page {
     margin-top: 10px;
@@ -93,13 +162,14 @@ export default {
     align-items: center;
     .switch-page-btn {
       width: 80px;
-      height: 30px;
+      height: 24px;
       border-radius: 15px;
-      border: solid 1px #366AFF;
-      color: #366AFF;
-      line-height: 30px;
+      border: solid 1px @border-color-primary;
+      color: @font-primary-accent-color;
+      line-height: 24px;
       text-align: center;
       cursor: pointer;
+      font-size: 12px;
     }
   }
   .radio-description {
@@ -114,7 +184,7 @@ export default {
 
   .bottom-link {
     height: 1px;
-    background-color: #EEEEEE;
+    background-color: @background-color-link;
   }
 
   .options-list {
@@ -125,15 +195,20 @@ export default {
     .options-item {
       // height: 25px;
       line-height: 25px;
-      background-color: #ffffff;
-      color: #366aff;
+      background-color: @background-color-light;
+      color: @font-primary-accent-color;
       cursor: pointer;
       display: flex;
       align-items: center;
       justify-content: space-between;
 
+      .options-item-name {
+        flex: auto;
+      }
 
       i {
+        width: 16px;
+        flex: none;
         padding-left: 10px;
       }
 
@@ -150,23 +225,23 @@ export default {
     }
 
     &.isKnowledgeSummary {
-      background: #EEF1FF;
+      background: @background-color-summary;
       border-radius: 10px;
       padding: 10px;
 
       .options-item {
-        background: #EEF1FF;
+        background: @background-color-summary;
       }
     }
 
     .tips {
       width: 131px;
       height: 22px;
-      background: #366AFF;
+      background: @primary-color;
       border-radius: 5px;
       text-align: center;
       line-height: 22px;
-      color: #fff;
+      color: @font-primary-light-color;
       font-size: 12px;
     }
 

package/src/components/ask-components/DissatisfactionOptions.vue

@@ -27,6 +27,7 @@ export default {
 }
 </script>
 <style lang='less'>
+@import "../../assets/less/variables.less";
 .other {
     font-size: 14px;
     word-wrap: break-word;
@@ -38,8 +39,8 @@ export default {
 .ps {
     padding: 8px 20px 8px 15px;
     height: auto;
-    border-top: 1px solid #F4F8FC;
-    background-color: #ffffff;
+    border-top: 1px solid @border-color-r2;
+    background-color: @background-color-light;
     color: var(--color);
     cursor: pointer;
     font-size: 14px;
@@ -51,7 +52,7 @@ export default {
     }
 }
 .end {
-    border: 1px solid #F4F8FC;
+    border: 1px solid @border-color-r2;
     border-bottom-left-radius: 32px !important;
     border-bottom-right-radius: 32px !important;
 }

package/src/components/ask-components/Msgloading.vue

@@ -20,9 +20,10 @@ export default {
 </script>
 
 <style lang="less">
+@import "../../assets/less/variables.less";
 .media-body-loading {
-	background-color: #f4f8fc;
-	border: 1px solid #f4f8fc;
+	background-color: @border-color-r2;
+	border: 1px solid @border-color-r2;
 	word-break: break-word;
 	box-shadow: 0px 0px 5px 0px rgba(76, 97, 255, 0.38);
 	flex: 1;

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,24 +13,24 @@
         /> -->
         <video
                 controls="controls"
-                :controlslist="nodownload&&'nodownload'"
+                :controlslist="controlAttributes"
                 :raw-controls="true"
                 x5-video-player-type="h5-page"
-                style="object-fit: contain;width: calc(100vw - 169px);height: 160px;background-color: black;border-radius: 25px;max-width: 200px;padding-left: 10px"
+                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-show="!nodownload" class="dragon-video-download">
-          <a :href="msg.content.url" download><span class="el-icon-download"></span></a>
-        </div>
+      <div v-if="isFullscreen" class="close-fullscreen" @click="closeFullScreen">
+        <i class="iconfont guoran-tongyichicun-guanbi2"></i>
+      </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",
@@ -37,7 +38,9 @@
         data() {
             return {
               videoSrc:'',
-              poster:''
+              poster:'',
+              isFullscreen:false,
+              isAndroid:false
             }
         },
         watch: {
@@ -51,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() {
@@ -61,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;
+                }
+              });
+            }
+
           })
 
       },
@@ -89,7 +122,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){
@@ -117,14 +150,22 @@
           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');
         }
       }
 
     }
 </script>
 <style scoped lang="less">
+@import "../assets/less/variables.less";
+
 video::-webkit-media-controls-mute-button { display: none !important;}
-#dragon-video{
+.dragon-video{
   position: relative;
   width: calc(100vw - 109px);
   max-width: 260px;
@@ -139,22 +180,33 @@ video::-webkit-media-controls-mute-button { display: none !important;}
     }
 
   }
-  .dragon-video-download{
+}
+/* 强制竖屏全屏样式 */
+.force-fullscreen {
+  position: fixed !important;
+  top: 0 !important;
+  left: 0 !important;
+  width: 100vw !important;
+  height: 100vh !important;
+  object-fit: contain !important;
+  background: @background-color-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;
-    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;
-      }
+    top: 10px;
+    right: 10px;
+    i{
+      color: @font-primary-light-color;
+      font-size: 20px;
     }
   }
 }

package/src/components/assetDetails.vue

@@ -2,7 +2,7 @@
   <div class="asset">
     <div class="asset-details">
       <section class="details-title">
-        <p>您正在咨询</p>
+        <p>{{$t('dragonCommon.youareconsulting')}}</p>
         <span @click="rotateClick" class="rotate">
           <i class="arsenal_icon arsenalangle-up-solid"></i>
         </span>
@@ -222,6 +222,7 @@ export default {
 </script>
 
 <style lang="less" scoped>
+@import "../assets/less/variables.less";
 @import url("../assets/less/iconfont.css");
 .asset {
   width: 100%;
@@ -232,7 +233,7 @@ export default {
   width: 100%;
   //   height: 130px;
   box-sizing: border-box;
-  background: #ffffff;
+  background: @background-color-light;
   box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.03);
   border-radius: 13px;
   .details-title {
@@ -240,13 +241,13 @@ export default {
     height: 45px;
     justify-content: space-between;
     align-items: center;
-    border-bottom: 1px solid #eeeeee;
+    border-bottom: 1px solid @border-color-r3;
     box-sizing: border-box;
     padding: 10px;
     p {
       font-size: 17px;
       font-weight: bold;
-      color: #000000;
+      color: @font-primary-color;
     }
     span {
       width: 25px;
@@ -254,9 +255,9 @@ export default {
       line-height: 25px;
       text-align: center;
       border-radius: 25px;
-      border: 1px solid #366aff;
+      border: 1px solid @border-color-primary;
       i {
-        color: #366aff;
+        color: @font-primary-accent-color;
       }
     }
     .rotate {
@@ -278,12 +279,12 @@ export default {
     .background-null {
       width: 51px;
       min-height: 51px;
-      background: #366aff;
+      background: @primary-color;
       border-radius: 51px;
       line-height: 51px;
       text-align: center;
       font-size: 24px;
-      color: #ffffff;
+      color: @font-primary-light-color;
       margin-right: 15px;
     }
     .content-text {
@@ -295,7 +296,7 @@ export default {
       .text-title {
         width: 100%;
         font-weight: bold;
-        color: #000000;
+        color: @font-primary-color;
         font-size: 15px;
         text-overflow: hidden;
         margin-bottom: 5px;
@@ -314,29 +315,29 @@ export default {
           }
         }
         .text-type {
-          background: #e1faf9;
+          background: @background-color-asset-text-r1;
           box-sizing: border-box;
           padding: 3px 5px;
           margin-bottom: 5px;
           border-radius: 5px;
           i {
-            color: #00c2bb;
+            color: @font-alc-color;
           }
           span {
-            color: #00c2bb;
+            color: @font-alc-color;
           }
         }
         .text-SN {
-          background: #edf2ff;
+          background: @background-color-asset-text-r2;
           box-sizing: border-box;
           padding: 3px 5px;
           margin-bottom: 5px;
           border-radius: 5px;
           i {
-            color: #366aff;
+            color: @font-primary-accent-color;
           }
           span {
-            color: #366aff;
+            color: @font-primary-accent-color;
             margin-bottom: 0 !important;
           }
         }
@@ -348,14 +349,14 @@ export default {
     min-height: 140px;
     box-sizing: border-box;
     padding: 10px 15px;
-    border-top: 1px solid #eeeeee;
+    border-top: 1px solid @border-color-r3;
     p {
       margin-bottom: 5px;
       display: flex;
       align-items: center;
       i {
         margin-right: 10px;
-        color: #366aff;
+        color: @font-primary-accent-color;
       }
     }
     .description {