askbot-dragon 1.7.62-beta → 1.7.64-beta

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "askbot-dragon",
-  "version": "1.7.62-beta",
+  "version": "1.7.64-beta",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",

package/src/components/AnswerDocknowledge.vue

@@ -42,11 +42,24 @@
                 </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"
-                    :key="imageItemIndex" alt @click="lookAttach(imageItem.url, imageItem, $event)" />
-            </div>
+            <template v-if="isPC">
+                <div v-if="msg.content.images && msg.content.images.length != 0" class="answer-kn-image-box-pc">
+                    <img v-for="(imageItem, imageItemIndex) in msg.content.images"
+                        style="max-width: 230px;" :src="imageItem.url"
+                        v-show="showImage || imageItemIndex < 2"
+                        :key="imageItemIndex" alt @click="lookAttach(imageItem.url, imageItem, $event)" />
+                    <div  class="img-placeholder" v-if="msg.content.images.length > 2 && !showImage" @click="showImage = true">
+                        +{{ msg.content.images.length - 2 }}
+                    </div>    
+                </div>
+            </template>
+            <template v-else>
+                <div v-if="msg.content.images && msg.content.images.length != 0" class="answer-kn-image-box-mobile">
+                    <img v-for="(imageItem, imageItemIndex) in msg.content.images"
+                        style="max-width: 230px;" :src="imageItem.url"
+                        :key="imageItemIndex" alt @click="lookAttach(imageItem.url, imageItem, $event)" />
+                </div>
+            </template>
         </div>
         <template v-if="!isLiBang">
             <div class="ad-list" :class="msg.content.type == 0 || msg.content.type == 2 ? 'ad-list-recognition' : ''">
@@ -285,7 +298,8 @@ export default {
             folderUrl: '',
             previewKnowledgeId: "",
             previewKnowledge: {},
-            previewOssPath: ""
+            previewOssPath: "",
+            showImage: false
         }
     },
     props: ['msg', 'isAskLightning', 'isMessageRecord', "isApp", "isHasChat", "activeKnowledgeId", "isLiBang","language","isHistory","knowledgeIndex"],
@@ -308,15 +322,16 @@ export default {
         // }
     },
     created () {
-        var system = {};
-        system.pingtai = /(Win32|Win16|WinCE|Mac68K|MacIntel|MacIntel|MacPPC|Linux mips64)/i.test(navigator.platform);
-        if (system.pingtai) {
-            //电脑
-            this.isPC = true;
-        } else {
-            //手机
-            this.isPC = false;
-        }
+        // var system = {};
+        // system.pingtai = /(Win32|Win16|WinCE|Mac68K|MacIntel|MacIntel|MacPPC|Linux mips64)/i.test(navigator.platform);
+        // if (system.pingtai) {
+        //     //电脑
+        //     this.isPC = true;
+        // } else {
+        //     //手机
+        //     this.isPC = false;
+        // }
+        this.isPC = !isMobile() 
         // this.msg.content.list.forEach(element => {
         //   console.log(this.imageObj[element.format],1111);
         //     element.src = 'https://static.guoranbot.com/cdn-office-website/askbot_doc/' + this.imageObj[element.format] + '.png';
@@ -608,8 +623,59 @@ export default {
             }
         }
 
-        .answer-kn-image-box {
+        // .answer-kn-image-box {
+        //     margin-bottom: 10px;
+        // }
+        .answer-kn-image-box-pc {
             margin-bottom: 10px;
+            display: flex;
+            width: 100%;
+            overflow: hidden;
+            overflow-x: auto;
+            img {
+                width: 120px;
+                height: 120px;
+                border-radius: 5px;
+                object-fit: cover;
+                margin-right: 10px;
+                margin-bottom: 10px;
+                cursor: pointer;
+                flex: none;
+            }
+            .img-placeholder {
+                width: 120px;
+                height: 120px;
+                border-radius: 5px;
+                margin-right: 10px;
+                margin-bottom: 10px;
+                cursor: pointer;
+                border: 1px dashed #d9d9d9;
+                color: #366aff;
+                flex: none;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                font-size: 22px;
+            }
+            .img-placeholder:hover {
+                border: 1px dashed #366aff;
+            }
+        }
+        .answer-kn-image-box-mobile {
+            margin-bottom: 10px;
+            display: flex;
+            width: 100%;
+            overflow: hidden;
+            overflow-x: auto;
+            img {
+                width: 35vw;
+                height: 35vw;
+                border-radius: 5px;
+                object-fit: cover;
+                margin-right: 10px;
+                margin-bottom: 10px;
+                flex: none;
+            }
         }
     }
 

package/src/components/ConversationContainer.vue

@@ -37,7 +37,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" :isHasChat="true" :msg="answerDocknowledge4" :isLiBang="false"></answer-docknowledge>
     <welcomeSuggest :msg="welcomeSuggest"></welcomeSuggest>
     <!--    <voice-component @closeVoice="closeVoice">
       <div slot="voiceTip">
@@ -10428,7 +10428,7 @@ export default {
           }
         }
       ],
-      inLoading: true,
+      inLoading: false,
       dataNote: 0,
       timer: null,
       finished: false,
@@ -10713,9 +10713,9 @@ export default {
       console.debug('this.dataNote', this.dataNote)
     }, 1000)
 
-    setTimeout(() => {
-      this.inLoading = true
-    }, 2000)
+    // setTimeout(() => {
+    //   this.inLoading = true
+    // }, 2000)
     setTimeout(() => {
       this.finished = true
       this.dataNote = 10

package/src/components/formTemplate.vue

@@ -879,7 +879,13 @@ export default {
     language:{
       type:String,
       default:"cn"
-    }
+    },
+    isCustomerService: {
+      type: Boolean,
+      default () {
+        return false;
+      }
+    },
   },
   computed: {
     acceptType: function () {
@@ -2010,6 +2016,10 @@ export default {
     },
     //提交按钮事件
     submitClick () {
+        if(this.isCustomerService) {
+            this.$message.warning('当前为人工客服模式，暂时无法提交')
+            return
+        }
       if (this.uploadImgQueue || this.attachmentList.some(arrach => { return !arrach.url })) {
         this.$message.warning(this.$t('formTemplate.uploading'))
         return

package/src/components/markDownText.vue

@@ -8,7 +8,6 @@
     </div>
   
   </template>
-  
   <script>
   import VueMarkdown from 'vue-markdown';
   import ImgView from "./imgView";
@@ -127,7 +126,7 @@
         let matched = [];
         let recommendItems = [];
         let isfirstStr = false;
-        const backslashOrNRegex = /[\\n]/;
+        const backslashOrNRegex = /\n/;
         eventSource.onmessage = (event) => {
           const data = JSON.parse(event.data);
           if (event.lastEventId === 'finish') { // 不能删除 finish
@@ -181,10 +180,6 @@
                     this.scrollMarkdown();
                   }
                 }, 20);
-                console.log(
-                    "answerDocKnowledgeFn 1"
-                );
-                
                 this.$emit("answerDocKnowledgeFn");
               }
               let repStr = tempString.replace(/\\n/g, '\n');

package/src/locales/cn.json

@@ -58,5 +58,39 @@
     "willServeYou": "将为您服务",
     "check": "查看",
     "clickme": "点我"
+  },
+  "common": {
+    "submit": "提交",
+    "inputPlaceholder": "请输入",
+    "selectDate": "选择日期",
+    "selectTime": "选择时间",
+    "selectDateTime": "选择日期时间",
+    "selectPlaceholder": "请选择",
+    "loadMore": "加载更多",
+    "submited": "已提交"
+  },
+  "formTemplate": {
+    "report": "报单人",
+    "feedbackDes": "反馈描述",
+    "orderDes": "工单描述",
+    "uploadType": "只能上传图片格式",
+    "uploadImageSize": "上传图片大小不能超过 8MB!",
+    "uploadVideoType": "只能上传视频格式",
+    "uploadVideoSize": "上传视频大小不能超过100MB!",
+    "uploadFileSize": "上传附件大小不能超过100MB!",
+    "onlyUpload": "仅支持上传",
+    "number": "个",
+    "textFlag": "必须要有文字",
+    "imageOrAttachment": "必须要有图片或附件",
+    "imageFlag": "必须要有图片",
+    "attachmentFlag": "必须要有附件",
+    "image": "图片",
+    "file": "附件",
+    "and": "和",
+    "required": "是必填的",
+    "uploading": "文件正在上传，请稍后",
+    "pleaseImprove": "请完善",
+    "feedbackDesRequired": "反馈描述是必填的",
+    "orderDesRequired": "问题描述是必填的"
   }
 }

package/src/locales/en.json

@@ -58,5 +58,39 @@
     "willServeYou": "will serve you",
     "check": "Check",
     "clickme": "Click me"
+  },
+  "common": {
+    "submit": "Submit",
+    "inputPlaceholder": "Please enter",
+    "selectDate": "Select Date",
+    "selectTime": "Select Time",
+    "selectDateTime": "Select Date Time",
+    "selectPlaceholder": "Please select",
+    "loadMore": "Load More",
+    "submited": "Submited"
+  },
+  "formTemplate": {
+    "report": "Reporter",
+    "feedbackDes": "Feedback Description",
+    "orderDes": "Work Order Description",
+    "uploadType": "Only upload image format",
+    "uploadImageSize": "Uploaded image size cannot exceed 8MB!",
+    "uploadVideoType": "Only upload video format",
+    "uploadVideoSize": "Uploaded video size cannot exceed 100MB!",
+    "uploadFileSize": "Uploaded attachment size cannot exceed 100MB!",
+    "onlyUpload": "Only support upload",
+    "number": "",
+    "textFlag": "must have text",
+    "imageOrAttachment": "must have image or attachment",
+    "imageFlag": "must have image",
+    "attachmentFlag": "must have attachment",
+    "image": "Image",
+    "file": "Attachment",
+    "and": "and",
+    "required": "is required",
+    "uploading": "File is uploading, please wait",
+    "pleaseImprove": "Please improve",
+    "feedbackDesRequired": "Feedback description is required",
+    "orderDesRequired": "Problem description is required"
   }
 }