askbot-dragon 1.5.46-beta → 1.5.46

package/package.json

@@ -1,18 +1,17 @@
 {
   "name": "askbot-dragon",
-  "version": "1.5.46-beta",
+  "version": "1.5.46",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
-    "@ckeditor/ckeditor5-ui": "^10.1.0",
-    "@ckeditor/ckeditor5-vue2": "^3.0.1",
     "ali-oss": "^6.2.1",
     "audio-loader": "^1.0.3",
-    "ckeditor": "^4.12.1",
     "core-js": "^3.6.5",
+    "element-ui": "^2.15.14",
+    "esdk-obs-browserjs": "^3.23.5",
     "install": "^0.13.0",
     "jquery": "^3.5.1",
     "lodash": "^4.17.21",
@@ -30,7 +29,6 @@
     "@vue/cli-plugin-eslint": "~4.5.0",
     "@vue/cli-service": "~4.5.0",
     "babel-eslint": "^10.1.0",
-    "element-ui": "^2.15.10",
     "eslint": "^6.7.2",
     "eslint-plugin-vue": "^6.2.2",
     "less": "^3.12.2",

package/public/index.html

@@ -23,13 +23,12 @@
         });
       }
     </script>
-    <script src="https://guoranopen-zjk.oss-cn-zhangjiakou.aliyuncs.com/ckeditor5-build-classic/0.4.4/ckeditor.js"></script>
+<!--    <script src="https://askbot-uat.obs.cn-east-3.myhuaweicloud.com/npm-static/ckeditor5-build-classic/0.4.4/ckeditor.js"></script>-->
     <!-- 项目图标 -->
     <link rel="stylesheet"  href="//at.alicdn.com/t/font_1566110_3hu6pyd938i.css"/>
     <!-- guoran图标 -->
     <link rel="stylesheet"  href="//at.alicdn.com/t/c/font_2913049_qtm7orae3l.css"/>
     <script src="https://res.wx.qq.com/open/js/jweixin-1.2.0.js"></script>
-    <!-- <script src="https://static.guoranbot.com/ckeditor5-build-classic/0.3.7/build/ckeditor.js"></script> -->
     
     <!-- vue -->
     <!-- <script src="https://static.guoranbot.com/vue/2.6.11/dist/vue.min.js"></script>
@@ -48,12 +47,12 @@
     <script src="https://cdnjs.cloudflare.com/ajax/libs/pdf.js/3.5.141/pdf.worker.min.js" integrity="sha512-6UHd2tcWIvg5hIYHXb3lnNO61tWfriGen6KddwGYTSUUazWGYESTHDDxJFEQkCy1cSL//yXKc1gcL+51/DTLFQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/pdf.js/3.5.141/pdf_viewer.min.js" integrity="sha512-tYEGuMBQkCfSlBKJ3dNgS06wbb/MNE6nO2poZ1Y5brix8NajGcDcfEvuL38wJDOTkq0j5ojASNmrzv/8/wgGHQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/pdf.js/3.5.141/pdf_viewer.min.css" integrity="sha512-Jf9DLkegLgARLR151csVkPvcVt4cOUhslrSZwiTAe9mqFL/BbYRDmxCOioCtbHifEgjsBFbrVhOMQ3mYPDLrqQ==" crossorigin="anonymous" referrerpolicy="no-referrer" /> -->
-    
-    
-    <script src="https://guoranopen-zjk.oss-cn-zhangjiakou.aliyuncs.com/cdn-common/pdfJS2.1.266/pdf.min.js"  referrerpolicy="no-referrer"></script>
-    <script src="https://guoranopen-zjk.oss-cn-zhangjiakou.aliyuncs.com/cdn-common/pdfJS2.1.266/pdf.worker.min.js"  referrerpolicy="no-referrer"></script>
-    <script src="https://guoranopen-zjk.oss-cn-zhangjiakou.aliyuncs.com/cdn-common/pdfJS2.1.266/pdf_viewer.js"  referrerpolicy="no-referrer"></script>
-    <link rel="stylesheet" href="https://guoranopen-zjk.oss-cn-zhangjiakou.aliyuncs.com/cdn-common/pdfJS2.1.266/pdf_viewer_01.css" referrerpolicy="no-referrer" />
+
+
+    <script src="https://askbot-uat.obs.cn-east-3.myhuaweicloud.com/npm-static/pdfJS2.1.266/pdf.min.js"  referrerpolicy="no-referrer"></script>
+    <script src="https://askbot-uat.obs.cn-east-3.myhuaweicloud.com/npm-static/pdfJS2.1.266/pdf.worker.min.js" referrerpolicy="no-referrer"></script>
+    <script src="https://askbot-uat.obs.cn-east-3.myhuaweicloud.com/npm-static/pdfJS2.1.266/pdf_viewer.js"  referrerpolicy="no-referrer"></script>
+    <link rel="stylesheet" href="https://askbot-uat.obs.cn-east-3.myhuaweicloud.com/npm-static/pdfJS2.1.266/pdf_viewer_01.css" referrerpolicy="no-referrer" />
     <!-- hammer.js -->
     <!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/hammer.js/2.0.8/hammer.min.js" integrity="sha512-UXumZrZNiOwnTcZSHLOfcTs0aos2MzBWHXOHOuB0J/R44QB0dwY5JgfbvljXcklVf65Gc4El6RjZ+lnwd2az2g==" crossorigin="anonymous" referrerpolicy="no-referrer"></script> -->
     <style>

package/src/assets/js/common.js

@@ -9,4 +9,68 @@ export function isMobile() {
         bool = false
     }
     return bool
+}
+
+let imageTypeObj = {
+    PDF: 'pdf1',
+    pdf: 'pdf1',
+    TXT: 'txt1',
+    txt: 'txt1',
+    selfadd: 'selfadd1',
+    md: "md2",
+    html: 'selfadd1',
+    mode: "mode",
+    general: 'general',
+    word: "word1",
+    Word: "word1",
+    docx: "word1",
+    doc: "word1",
+    docm: "word1",
+    dotm: "word1",
+    dotx: "word1",
+    wpt: "word1",
+    wps: "word1",
+    WORD: "word1",
+    Excel: 'excel1',
+    EXCEL: 'excel1',
+    excel: 'excel1',
+    PPT: 'ppt1',
+    ppt: 'ppt1',
+    pptx: 'ppt1',
+    img: "image1",
+    image: "image1",
+    video: "video",
+    audio: 'audio',
+    link: "link",
+    wechat: "wechat",
+    mp4: "video",
+    MP4: "video",
+    xlsx: "excel1",
+    xls: "excel1",
+    csv: "excel1",
+    jpg: "image1",
+    JPG: "image1",
+    jpeg: "image1",
+    JPEG: "image1",
+    png: "image1",
+    PNG: "image1",
+    webp: "image1",
+    WEBP: "image1",
+    gif: "image1",
+    GIF: "image1",
+    svg: "image1",
+    bmp: "image1",
+    avi: "video",
+    mov: "video",
+    rmvb: "video",
+    wav: "audio",
+    mp3: "audio",
+    MOV: "video",
+    AIV: "video",
+    aiv: "video",
+    news:"news"
+}
+
+export {
+    imageTypeObj
 }

package/src/assets/js/hammer.js

@@ -3,15 +3,6 @@ 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;
@@ -76,15 +67,13 @@ export function zoomElement (el) {
 				newScale = 3;
 			}
 			// 最小缩放比例限制
-			if(newScale < scale) {
-				newScale = scale;
+			if(newScale < 1) {
+				newScale = 1;
 			}
 			// 记住使用的缩放值
 			store.scale = newScale;
 			// 图像应用缩放效果
 			el.style.transform = 'scale(' + newScale + ')';
-			el.style.transformOrigin = 'top left'
-
 		}
 	});
 	document.addEventListener('touchend', function () {

package/src/assets/js/obsBrowser.js

@@ -0,0 +1,63 @@
+// 创建ObsClient实例
+import ObsClient from 'esdk-obs-browserjs';
+const obsClient = new ObsClient({
+    access_key_id: "EE4MAFWH4YLQSQF7NNIP",
+    secret_access_key: "Dq9giqqwZoX77dqSIzhA1Yhhe9tarA3LRBGBF4eO",
+    server : 'https://obs.cn-east-3.myhuaweicloud.com',
+    timeout : 1000
+});
+let mainId = sessionStorage.getItem('_mainId') ? sessionStorage.getItem('_mainId') : "";
+let IDX = 256, HEX = [], SIZE = 256, BUFFER;
+while (IDX--) HEX[IDX] = (IDX + 256).toString(16).substring(1);
+function uid(len) {
+    let i = 0, tmp = (len || 11);
+    if (!BUFFER || ((IDX + tmp) > SIZE * 2)) {
+        for (BUFFER = '', IDX = 0; i < SIZE; i++) {
+            BUFFER += HEX[Math.random() * 256 | 0];
+        }
+    }
+
+    return BUFFER.substring(IDX, IDX++ + tmp);
+}
+
+function dataFormat(fmt, date = new Date()) {
+    const o = {
+        "M+": date.getMonth() + 1, //月份
+        "d+": date.getDate(), //日
+        "h+": date.getHours(), //小时
+        "m+": date.getMinutes(), //分
+        "s+": date.getSeconds(), //秒
+        "q+": Math.floor((date.getMonth() + 3) / 3), //季度
+        "S": date.getMilliseconds() //毫秒
+    };
+    if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (date.getFullYear() + "").substr(4 - RegExp.$1.length));
+    for (const k in o)
+        if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+    return fmt;
+}
+async function putObject(file,callback){
+    let fileUrl = ''
+    let objName = (process.env.VUE_APP_ENV === 'development' ? 'dev_' : 'pro_') + file.name;
+    let fileName = "front-oss/" + mainId + '/' + dataFormat("yyyy/MM/dd/hh/mm/") + uid(32) + "/" + objName;
+    await obsClient.putObject({
+        Bucket: 'askbot-uat',
+        Key : fileName,
+        SourceFile : file,
+        ACL : obsClient.enums.AclPublicRead,
+        ProgressCallback: callback
+    }).then(function(result) {
+        if(result.CommonMsg.Status < 300){
+            console.log('Create object:' + JSON.stringify(result) + ' successfully!\n',process.env.VUE_APP_ENV);
+            let domain = process.env.VUE_APP_ENV ==='development' ? 'https://askbot-uat.obs.cn-east-3.myhuaweicloud.com/' : ''
+            fileUrl = {
+                url: domain + fileName,
+                name:file.name
+            }
+        }
+    });
+    return fileUrl
+}
+
+export {
+    putObject
+}

package/src/assets/less/converSationContainer/common.less

@@ -35,13 +35,6 @@
     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/ActionAlertIframe.vue

@@ -1,17 +1,39 @@
 <template>
     <div id="action_alert_iframe">
+        <div class="iframe-full-screen">
+                <span @click="showAskFullScreen = true" class="el-icon-full-screen"></span>
+            </div>
         <iframe
             class="grzh-iframe"
             :id="tampId"
             :data-name="tampId"
             :src="actionAlertIframe.template"
             :width="(actionAlertIframe.version == 1 && !phoneWidth100)?actionAlertIframe.width:'100%'"
-            :height="actionAlertIframe.height"
+            :height="showAskFullScreen?'90%':actionAlertIframe.height"
             :scrolling="actionAlertIframe.scrolling"
             frameborder="no"
             border="0"
         ></iframe>
+        
+        <div v-if="showAskFullScreen" class="ask-full-screen">
+            <div class="iframe-full-screen">
+                <br>
+                <span @click="showAskFullScreen = false" style="cursor: pointer;">
+                    <svg t="1702295921525" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="39588" width="20" height="20"><path d="M257.706667 376.32H128c-11.946667 0-21.333333-9.386667-21.333333-21.333333s9.386667-21.333333 21.333333-21.333334h129.706667c35.413333 0 64-28.586667 64-64V128c0-11.946667 9.386667-21.333333 21.333333-21.333333s21.333333 9.386667 21.333333 21.333333v141.653333a106.666667 106.666667 0 0 1-106.666666 106.666667zM896 376.32h-129.706667a106.666667 106.666667 0 0 1-106.666666-106.666667V128c0-11.946667 9.386667-21.333333 21.333333-21.333333s21.333333 9.386667 21.333333 21.333333v141.653333c0 35.413333 28.586667 64 64 64H896c11.946667 0 21.333333 9.386667 21.333333 21.333334s-9.386667 21.333333-21.333333 21.333333z" fill="#666666" p-id="39589"></path><path d="M896 376.32h-129.706667a106.666667 106.666667 0 0 1-106.666666-106.666667V128c0-11.946667 9.386667-21.333333 21.333333-21.333333s21.333333 9.386667 21.333333 21.333333v141.653333c0 35.413333 28.586667 64 64 64H896c11.946667 0 21.333333 9.386667 21.333333 21.333334s-9.386667 21.333333-21.333333 21.333333zM257.706667 376.32H128c-11.946667 0-21.333333-9.386667-21.333333-21.333333s9.386667-21.333333 21.333333-21.333334h129.706667c35.413333 0 64-28.586667 64-64V128c0-11.946667 9.386667-21.333333 21.333333-21.333333s21.333333 9.386667 21.333333 21.333333v141.653333a106.666667 106.666667 0 0 1-106.666666 106.666667zM680.96 917.333333c-11.946667 0-21.333333-9.386667-21.333333-21.333333v-141.653333a106.666667 106.666667 0 0 1 106.666666-106.666667H896c11.946667 0 21.333333 9.386667 21.333333 21.333333s-9.386667 21.333333-21.333333 21.333334h-129.706667c-35.413333 0-64 28.586667-64 64V896c0 11.946667-9.386667 21.333333-21.333333 21.333333zM343.04 917.333333c-11.946667 0-21.333333-9.386667-21.333333-21.333333v-141.653333c0-35.413333-28.586667-64-64-64H128c-11.946667 0-21.333333-9.386667-21.333333-21.333334s9.386667-21.333333 21.333333-21.333333h129.706667a106.666667 106.666667 0 0 1 106.666666 106.666667V896c0 11.946667-9.813333 21.333333-21.333333 21.333333z" fill="#666666" p-id="39590"></path><path d="M343.04 917.333333c-11.946667 0-21.333333-9.386667-21.333333-21.333333v-141.653333c0-35.413333-28.586667-64-64-64H128c-11.946667 0-21.333333-9.386667-21.333333-21.333334s9.386667-21.333333 21.333333-21.333333h129.706667a106.666667 106.666667 0 0 1 106.666666 106.666667V896c0 11.946667-9.813333 21.333333-21.333333 21.333333zM680.96 917.333333c-11.946667 0-21.333333-9.386667-21.333333-21.333333v-141.653333a106.666667 106.666667 0 0 1 106.666666-106.666667H896c11.946667 0 21.333333 9.386667 21.333333 21.333333s-9.386667 21.333333-21.333333 21.333334h-129.706667c-35.413333 0-64 28.586667-64 64V896c0 11.946667-9.386667 21.333333-21.333333 21.333333z" fill="#666666" p-id="39591"></path></svg>
+                </span>
+            </div>
+            <iframe
+                class="grzh-iframe"
+                :src="actionAlertIframe.template"
+                width="100%"
+                height="95%"
+                :scrolling="actionAlertIframe.scrolling"
+                frameborder="no"
+                border="0"
+            ></iframe>
+        </div>
     </div>
+    <!-- https://blog.csdn.net/qq_16992475/article/details/130633117 -->
 </template>
 <script>
 export default {
@@ -38,6 +60,7 @@ export default {
                 displayStyle:
                     "iframe 样式(点击弹出/嵌入iframe 字符串类型后端未做限制)",
             },
+            showAskFullScreen: false,
         };
     },
     methods: {},
@@ -63,6 +86,7 @@ export default {
         } else {
           this.actionAlertIframe.template = this.actionAlertIframe.template  + "&iframeId=" + this.tampId
         }
+        this.actionAlertIframe.template = this.actionAlertIframe.template.split("&amp;").join("&")
     },
 };
 </script>
@@ -73,6 +97,24 @@ export default {
     width: 100%;
     margin: 0 auto;
     overflow-x: auto;
+
+    .iframe-full-screen{
+        text-align: right;
+        padding-right: 12px;
+        .el-icon-full-screen{
+            cursor: pointer;
+        }
+    }
+
+    .ask-full-screen{
+        background-color: white;
+        position: fixed;
+        top: 0;
+        left: 0;
+        width: 100vw;
+        height: 100vh;
+        z-index: 9999999999999999999;
+    }
     .grzh-iframe {
         scrollbar-face-color: #9aa1c4;
         /* 滚动条滑块按钮的颜色 */

package/src/components/AiGuide.vue

@@ -13,7 +13,7 @@
                 v-show="aiGuide.content.descriptionVisible && aiGuide.content.description !== ''"
                 class="ig-types-des"
             >
-                {{ aiGuide.content.description }}
+                <span v-html="aiGuide.content.description"></span>
             </div>
             <!-- 一级分类 -->
             <div v-show="aiGuide.content.typesVisible" class="ig-types-f">
@@ -441,6 +441,7 @@ export default {
             color: #366aff;
             cursor: pointer;
             align-items: center;
+            text-align: left;
             span {
                 display: flex;
                 align-items: center;

package/src/components/AnswerDocknowledge.vue

@@ -38,6 +38,9 @@
                   <div  v-else class="alc-box-introduction">
                     <img :src="item.expiredUrl" alt="" @click="lookAttach(item.url, item, $event)">
                   </div>
+                  <div  v-if="item.previewImage" class="alc-box-introduction-previewImage">
+                    <img :src="item.previewImage" alt="" @click="lookAttach(item.previewImage, {url: item.previewImage}, $event)">
+                  </div>
                   <div class="alc-updateTime">
                     <div v-show="docSource[item.source]" class="upload-source">
                       {{docSource[item.source]}}
@@ -66,6 +69,9 @@
                     </div>
                 </div>
             </div>
+            <div class="ad-loadmore" v-if="loadMoreFlag" @click="lazyLoadKnowledegList">
+              查看更多
+            </div>
         </div>
         <previewPdf ref="previewPdf" :url="previewHref" :sourceFileType="sourceFileType" officePreviewType="pdf"></previewPdf>
     </div>
@@ -151,28 +157,29 @@ export default {
               MP3: "audio",
               yqhtml: "yqhtml",
               feishuhtml:"feishuhtml"
-            }
+            },
+            allKnowledgeList:[],
+            loadMoreFlag:false
         }
     },
     props: ['msg','isAskLightning', 'isMessageRecord',"isApp"],
     beforeMounted() {
-
     },
     watch:{
-		msg:{
-			handler(n){
-        console.log(n,'answerDocknowledge');
-				n.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';
-					if ((element.format === "txt" || element.format === "html") && element.source === "WECHAT") {
-						element.src = 'https://static.guoranbot.com/cdn-office-website/askbot_doc/wechat.png';
-					}
-				});
-			},
-			deep:true,
-			immediate:true
-		}
+      msg:{
+        handler(n){
+          console.log(n,'answerDocknowledge');
+          n.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';
+            if ((element.format === "txt" || element.format === "html") && element.source === "WECHAT") {
+              element.src = 'https://static.guoranbot.com/cdn-office-website/askbot_doc/wechat.png';
+            }
+          });
+        },
+        deep:true,
+        immediate:true
+      }
     },
     created() {
         var system = {};
@@ -193,7 +200,17 @@ export default {
         // });
     },
     mounted() {
-
+      console.log(this.msg.content,'this.msg.content');
+      // if(this.msg.content.type == 1) {
+        
+      // }
+      if(this.msg.content.list && this.msg.content.list.length > 0) {
+        this.loadMoreFlag = true
+        this.allKnowledgeList = JSON.parse(JSON.stringify(this.msg.content.list))
+        // console.log(this.allKnowledgeList.length, 'this.allKnowledgeList');
+        this.msg.content.list = []
+        this.lazyLoadKnowledegList()
+      }
     },
     methods: {
         //预览图片
@@ -244,18 +261,7 @@ export default {
                 }
                 this.$refs.previewPdf.fileType = type
                 this.$refs.previewPdf.tagIds = item.tagIds
-                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'){
-                  this.$refs.previewPdf.fileName = fileName;
-                } else {
-                  this.$refs.previewPdf.fileName = '';
-                }
+                this.$refs.previewPdf.isMessageRecord = this.isMessageRecord ? true : false 
                 if(item.tagIds && item.tagIds.length != 0) {
                   this.$refs.previewPdf.loading = false
                   return
@@ -306,6 +312,21 @@ export default {
               // return res.data
             })
           // return imgurl
+        },
+        lazyLoadKnowledegList() {
+          if(this.allKnowledgeList.length !== 0) {
+            let arr = this.allKnowledgeList.splice(0, 5)
+            if(arr.length < 5) {
+              this.loadMoreFlag = false
+              this.msg.content.list = [...this.msg.content.list, ...arr]
+              return
+            }
+            if(this.allKnowledgeList.length == 0) {
+              this.loadMoreFlag = false
+            }
+            this.msg.content.list = [...this.msg.content.list, ...arr]
+            return
+          }
         }
     }
 }
@@ -415,6 +436,25 @@ export default {
                     cursor: pointer;
                   }
                 }
+                .alc-box-introduction-previewImage {
+                  overflow: hidden;
+                  text-overflow: ellipsis;
+                  display: -webkit-box;
+                  -webkit-line-clamp:3;
+                  -webkit-box-orient:vertical;
+                  margin-top: 10px;
+                  color: #616161;
+                  // font-size: 12px;
+                  line-height: 24px;
+                  text-align: left;
+                  img {
+                    max-width: 300px;
+                    width: 100%;
+                    max-height: 150px;
+                    margin: 10px;
+                    cursor: pointer;
+                  }
+                }
                 .alc-updateTime{
                   display: flex;
                   align-items: center;
@@ -500,6 +540,18 @@ export default {
                 }
             }
         }
+        .ad-loadmore {
+          width: 100%;
+          height: 40px;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          // background: #FFFFFF;
+          color: #366AFF;
+          font-size: 14px;
+          margin-top: 8px;
+          cursor: pointer;
+        }
     }
 }
 </style>