askbot-dragon 1.7.28-beta → 1.7.31-beta

package/src/components/previewPdf.vue

@@ -5,33 +5,34 @@
   另外增加了在知识项目中预览当前文件的一些功能
 -->
 <template>
-  <el-drawer title="" :visible.sync="drawer" :with-header="false" :append-to-body="true" :destroy-on-close="true"
+  <el-drawer title="我是标题" :visible.sync="drawer" :with-header="false" :append-to-body="true" :destroy-on-close="true"
     :modal="false" :direction="previewShowPopup ? 'btt' : 'rtl'" :size="previewShowPopup ? '90%' : '65%'"
     custom-class="pdf-preview-drawer" v-if="drawer">
+    <!-- v-else-if="drawer" -->
     <div class="drawer-header" :class="isLiBang ? 'libang_head' : ''" v-if="!isPc">
       <div class="header-btn btn_position">
         <div class="onload_btn" v-if="isDownload" @click="downLoad">
-          {{ $t('dragonCommon.download') }}
+          下载
         </div>
         <div class="summaryBtn" :class="showSummary ? 'summaryActiveBtn' : ''" @click="summaryFun" v-if="isHasChat">
           <i class="iconfont guoran-tongyichicun-write-29-jiqiren"></i>
-          <span>{{ $t('dragonCommon.smartSummary') }}</span>
+          <span>智能摘要</span>
         </div>
         <template v-if="isHasChat">
           <div class="chat" @click="previewToDialog(true)" v-if="!previewKnowledgeId">
             <i class="iconfont guoran-wendapingjia"></i>
-            {{ $t('dragonCommon.chat') }}
+            聊一聊
           </div>
           <div class="chat chat_active" @click="previewToDialog(false)" v-else>
             <i class="iconfont guoran-wendapingjia"></i>
-            {{ $t('dragonCommon.chat') }}
+            聊一聊
           </div>
         </template>
       </div>
       <div class="header_title">
         <div class="header_close">
           <span class="title_left">
-            {{ title ? title : $t('dragonCommon.viewDetails') }}
+            {{ title ? title : "查看详情" }}
           </span>
           <section @click="close">
             <i class="iconfont guoran-shanchu"></i>
@@ -48,25 +49,25 @@
       <div class="header_title">
         <div :class="isLiBang && folderName ? 'header_close' : 'header_top'">
           <span class="title_left">
-            {{ title ? title : $t('dragonCommon.viewDetails') }}
+            {{ title ? title : "查看详情" }}
           </span>
           <div class="header-btn">
-            <div class="onload_btn" v-if="isDownload" @click="downLoad">
-              {{ $t('dragonCommon.download') }}
+            <div class="onload_btn" v-if="isDownload || true" @click="downLoad">
+              下载
             </div>
             <div class="summaryBtn" :class="showSummary ? 'summaryActiveBtn' : ''" @click="summaryFun"
-              v-if="isHasChat">
+              v-if="isHasChat || true">
               <i class="iconfont guoran-tongyichicun-write-29-jiqiren"></i>
-              <span>{{ $t('dragonCommon.smartSummary') }}</span>
+              <span>智能摘要</span>
             </div>
-            <template v-if="isHasChat">
+            <template v-if="isHasChat || true">
               <div class="chat" @click="previewToDialog(true)" v-if="!previewKnowledgeId">
                 <i class="iconfont guoran-wendapingjia"></i>
-                {{ $t('dragonCommon.chat') }}
+                聊一聊
               </div>
               <div class="chat chat_active" @click="previewToDialog(false)" v-else>
                 <i class="iconfont guoran-wendapingjia"></i>
-                {{ $t('dragonCommon.chat') }}
+                聊一聊
               </div>
             </template>
             <section @click="close">
@@ -82,6 +83,7 @@
       </div>
     </div>
     <div id="drawer_content_pre" :class="isLiBang && folderName ? 'libang_content_pre' : ''">
+      <!-- :style="{marginTop:tagIds && tagIds.length != 0 && isPc ? '50px' : ''}" -->
       <intelligent-summary v-show="showSummary && isHasChat" :tagIds="tagIds" :knowledgeId="knowledgeId"
         @closeSummary="closeSummary" @recommendQues="recommendQues"
         @getSummarySuccess="getSummarySuccess"></intelligent-summary>
@@ -94,7 +96,7 @@
           <video :src="url" controls width="100%;" height="98%"></video>
         </div>
         <div v-else-if="fileType == 'HTML'" style="width: 100%;">
-          <div class="preview_iframe_html" style="text-align:left" v-html="fileText"></div>
+          <div class="preview_iframe_html" style="text-algin:left" v-html="fileText"></div>
         </div>
         <template v-else-if="url.includes('https://www') || url.includes('http://www')">
           <iframe class="preview_iframe" :src="url" width="100%" height="100%" scrolling="100%" frameborder="no"
@@ -105,6 +107,9 @@
             :style="{ height: iframeHeight }"></iframe>
         </template>
       </template>
+      <!-- <div class="mobile_onload_btn" v-if="isDownload && !isPc" @click="downLoad">
+        下载
+      </div> -->
     </div>
     <div class="loading_img" v-show="loading">
       <img src="https://guoranopen-zjk.oss-cn-zhangjiakou.aliyuncs.com/cdn-common/images/loading.gif" alt="">
@@ -392,7 +397,7 @@ export default {
                 selection.addRange(range);
                 document.execCommand('copy');
                 selection.removeAllRanges()
-                Toast(this.$t('dragonCommon.Safaridownload'));
+                Toast('下载地址已复制，请前往Safari浏览器访问下载');
                 this.close()
               },100)
             } else {

package/src/components/utils/AliyunIssUtil.js

@@ -1,26 +1,6 @@
 // const OSS = require('ali-oss');
 const OSS = window.OSS
 
-const getPrivateOssConfig = () => {
-  let mainSource = sessionStorage.getItem('_mainSource') ? sessionStorage.getItem('_mainSource') : "askbot";
-  switch (mainSource) {
-    case "askbot":
-      return {
-        region: "oss-cn-zhangjiakou",
-        accessKeyId: "LTAI4G3QtdEdwkEbihBngAsK",
-        accessKeySecret: "OwgdVfc5PeCkIgqIdug660xmiSPchn",
-        bucket: "guoranopen-zjk",
-      }
-    case "lishi":
-      return {
-        region: "oss-ap-southeast-1",
-        accessKeyId: "LTAI5tAusPLDNJJwkvUbqi2T",
-        accessKeySecret: "xqPVaunOIbvTe3g9qsXal2IZO6RftK",
-        bucket: "askbotopen-ls",
-      };
-  }
-}
-
 let IDX = 256, HEX = [], SIZE = 256, BUFFER;
 while (IDX--) HEX[IDX] = (IDX + 256).toString(16).substring(1);
 let mainId = sessionStorage.getItem('_mainId') ? sessionStorage.getItem('_mainId') : "";
@@ -56,12 +36,12 @@ function pathGenerate(filename) {
 }
 
 
-function upload(data) {
-  let ossClient = new OSS(getPrivateOssConfig());
+ function upload(ossConfig, data) {
+  let ossClient = new OSS(ossConfig);
   // object-key可以自定义为文件名（例如file.txt）或目录（例如abc/test/file.txt）的形式，实现将文件上传至当前Bucket或Bucket下的指定目录。
   let objectKey = pathGenerate(data.name);
-  let result = ossClient.put(objectKey, data, {
-    headers: {
+  let result =  ossClient.put(objectKey, data,  {
+    headers:{
       // 通过文件URL访问文件时，指定以附件形式下载文件，下载后的文件名称定义为example.jpg。
       'Content-Disposition': `attachment; filename="${encodeURIComponent(data.name)}"`
     },
@@ -70,13 +50,13 @@ function upload(data) {
   return result;
 }
 
-function multipartUpload(data, callback, extCallback) {
-  let ossClient = new OSS(getPrivateOssConfig());
+ function multipartUpload(ossConfig, data, callback,extCallback) {
+  let ossClient = new OSS(ossConfig);
   // object-key可以自定义为文件名（例如file.txt）或目录（例如abc/test/file.txt）的形式，实现将文件上传至当前Bucket或Bucket下的指定目录。
   let objectKey = pathGenerate(data.name);
 
-  let res = ossClient.multipartUpload(objectKey, data, {
-    headers: {
+  let res =  ossClient.multipartUpload(objectKey, data,  {
+    headers:{
       // 通过文件URL访问文件时，指定以附件形式下载文件，下载后的文件名称定义为example.jpg。
       'Content-Disposition': `attachment; filename="${encodeURIComponent(data.name)}"`
     },
@@ -84,15 +64,14 @@ function multipartUpload(data, callback, extCallback) {
       console.debug('progress callback', p, checkpoint);
       // 断点记录点。浏览器重启后无法直接继续上传，您需要手动触发上传操作。
       if (callback && callback instanceof Function) {
-        callback(p, checkpoint, data, extCallback);
+        callback(p, checkpoint,data,extCallback);
       }
     }
   })
-  return res;
+   return res;
 }
 
-function ossFileUrl(path, cname) {
-  let ossConfig = getPrivateOssConfig();
+function ossFileUrl(ossConfig, path, cname) {
   if (cname == null) {
     return 'https://' + ossConfig.bucket + '.' + ossConfig.region + '.aliyuncs.com/' + path;
   } else {
@@ -100,4 +79,4 @@ function ossFileUrl(path, cname) {
   }
 }
 
-export { upload, multipartUpload, ossFileUrl }
+export {upload, multipartUpload, ossFileUrl}

package/src/components/utils/ckeditor.js

@@ -1,28 +1,16 @@
 /* eslint-disable */
-import { multipartUpload, ossFileUrl } from "./AliyunIssUtil";
+import {multipartUpload, ossFileUrl} from "./AliyunIssUtil";
 import { v4 as uuidv4 } from "uuid";
-
-const getPrivateOssConfig = () => {
-    let mainSource = sessionStorage.getItem('_mainSource') ? sessionStorage.getItem('_mainSource') : "askbot";
-    switch (mainSource) {
-        case "askbot":
-            return {
-                region: "oss-cn-zhangjiakou",
-                accessKeyId: "LTAI4G3QtdEdwkEbihBngAsK",
-                accessKeySecret: "OwgdVfc5PeCkIgqIdug660xmiSPchn",
-                bucket: "guoranopen-zjk",
-            }
-        case "lishi":
-            return {
-                region: "oss-ap-southeast-1",
-                accessKeyId: "LTAI5tAusPLDNJJwkvUbqi2T",
-                accessKeySecret: "xqPVaunOIbvTe3g9qsXal2IZO6RftK",
-                bucket: "askbotopen-ls",
-            };
+const ossConfig = {
+        region: "oss-cn-zhangjiakou",
+        //云账号AccessKey有所有API访问权限，建议遵循阿里云安全最佳实践，创建并使用STS方式来进行API访问
+        accessKeyId: "LTAI4G3QtdEdwkEbihBngAsK",
+        accessKeySecret: "OwgdVfc5PeCkIgqIdug660xmiSPchn",
+        // stsToken: '<Your securityToken(STS)>',
+        bucket: "guoranopen-zjk",
     }
-}
 class MyUploadAdapter {
-    constructor(loader, editor) {
+    constructor( loader , editor ) {
         // 要在上载期间使用的文件加载器实例
         this.loader = loader;
         this.editor = editor
@@ -31,7 +19,7 @@ class MyUploadAdapter {
     // 启动上载过程
     upload() {
         return this.loader.file
-            .then(file => new Promise(() => {
+            .then( file => new Promise(() => {
                 /* this._initRequest();
                 this._initListeners( resolve, reject, file );
                 this._sendRequest( file );*/
@@ -49,8 +37,8 @@ class MyUploadAdapter {
                     options: {
                         name: file.name + '正在上传...',
                         data: uid,
-                        editable: false,
-                        type: 'upload'
+                        editable:false,
+                        type:'upload'
                     }
                 })
                 this.uploadFile(file)
@@ -59,32 +47,33 @@ class MyUploadAdapter {
 
     // 中止上载过程
     abort() {
-        if (this.xhr) {
+        if ( this.xhr ) {
             this.xhr.abort();
         }
     }
-    uploadFile(file) {
+    uploadFile(file){
         let imgInfo = {
-            url: '',
+            url:'',
         }
         let res = multipartUpload(
+            ossConfig,
             file,
             null,
             imgInfo
         );
-        res.then(resp => {
-            imgInfo.url = ossFileUrl(resp.name)
-            let root = this.editor.model.document.getRoot()
+        res.then(resp=>{
+            imgInfo.url = ossFileUrl(ossConfig, resp.name)
+            let root =  this.editor.model.document.getRoot()
             let children = root.getChildren()
-            for (let child of children) {
+            for(let child of children){
                 for (let index = 0; index < child._children._nodes.length; index++) {
-                    if (child._children._nodes[index].name == 'askComponentPlaceholderContainer') {
-                        if (child._children._nodes[index]._children._nodes[0]) {
+                    if(child._children._nodes[index].name == 'askComponentPlaceholderContainer'){
+                        if(child._children._nodes[index]._children._nodes[0]) {
                             let attrs = child._children._nodes[index]._children._nodes[0]._attrs
-                            if (attrs) {
+                            if(attrs) {
                                 let attrsList = [...attrs.keys()]
                                 for (let j = 0; j < attrsList.length; j++) {
-                                    if (attrsList[j] == 'data') {
+                                    if(attrsList[j] == 'data') {
                                         // this.editor.uploadImg = this.editor.uploadImg.filter(id =>{return id != attrs.get(attrsList[j])})
                                         this.editor.model.change(writer => {
                                             writer.remove(child._children._nodes[index]);
@@ -100,7 +89,7 @@ class MyUploadAdapter {
             command.execute({
                 tag: "img",
                 options: {
-                    width: '100%',
+                    width:'100%',
                     alt: resp.name + 0,
                     src: imgInfo.url
                 },
@@ -114,68 +103,68 @@ class MyUploadAdapter {
     _initRequest() {
         const xhr = this.xhr = new XMLHttpRequest();
         console.log(xhr)
-        xhr.open('POST', '/open-api/oss/public?token=8c98087dfd2d48f856d8c95c09115def', true);
+        xhr.open( 'POST', '/open-api/oss/public?token=8c98087dfd2d48f856d8c95c09115def', true );
         xhr.responseType = '';
     }
 
     // 初始化 XMLHttpRequest 监听.
-    _initListeners(resolve, reject, file) {
+    _initListeners( resolve, reject, file ) {
         const xhr = this.xhr;
         const loader = this.loader;
         console.log(this.loader)
-        const genericErrorText = `无法上传文件: ${file.name}.`;
+        const genericErrorText = `无法上传文件: ${ file.name }.`;
 
-        xhr.addEventListener('error', () => reject(genericErrorText));
-        xhr.addEventListener('abort', () => reject());
-        xhr.addEventListener('load', () => {
+        xhr.addEventListener( 'error', () => reject( genericErrorText ) );
+        xhr.addEventListener( 'abort', () => reject() );
+        xhr.addEventListener( 'load', () => {
             const response = xhr.response;
             // 当code＝＝200说明上传成功，可以增加弹框提示；
             // 当上传失败时，必须调用reject()函数。
 
             console.log('response', xhr)
 
-            if (!response || response.error) {
-                return reject(response && response.error ? response.error.message : genericErrorText);
+            if ( !response || response.error ) {
+                return reject( response && response.error ? response.error.message : genericErrorText );
             }
             //上传成功，从后台获取图片的url地址
-            resolve({
+            resolve( {
                 default: response
-            });
-        });
+            } ); 
+        } );
 
         // 支持时上传进度。文件加载器有#uploadTotal和#upload属性，用于在编辑器用户界面中显示上载进度栏。
-        if (xhr.upload) {
-            xhr.upload.addEventListener('progress', evt => {
-                if (evt.lengthComputable) {
+        if ( xhr.upload ) {
+            xhr.upload.addEventListener( 'progress', evt => {
+                if ( evt.lengthComputable ) {
                     loader.uploadTotal = evt.total;
                     loader.uploaded = evt.loaded;
                 }
-            });
+            } );
         }
     }
 
     // 准备数据并发送请求
-    _sendRequest(file) {
+    _sendRequest( file ) {
         //通过FormData构造函数创建一个空对象
         const data = new FormData();
         //通过append()方法在末尾追加key为files值为file的数据
 
-        console.log('file', file)
-        data.append('file', file);//上传的参数data
+        console.log('file',file)
+        data.append( 'file', file );//上传的参数data
         // data.append( 'memberId', "666" );
         /**
          * 重要提示:这是实现诸如身份验证和CSRF保护等安全机制的正确位置。
          * 例如，可以使用XMLHttpRequest.setRequestHeader()设置包含应用程序先前生成的CSRF令牌的请求头。
          */
-        this.xhr.send(data);
+        this.xhr.send( data );
     }
 }
 
-function MyCustomUploadAdapterPlugin(editor) {
-    editor.plugins.get('FileRepository').createUploadAdapter = (loader) => {
+function MyCustomUploadAdapterPlugin( editor ) {
+    editor.plugins.get( 'FileRepository' ).createUploadAdapter = ( loader ) => {
         // 在这里将URL配置为后端上载脚本
-        console.log(loader, 'loader');
-        return new MyUploadAdapter(loader, editor);
+        console.log(loader,'loader');
+        return new MyUploadAdapter( loader,editor );
     }
 }
 

package/src/main.js

@@ -47,27 +47,11 @@ Viewer.setDefaults({
   Options: { "inline": true, "button": true, "navbar": true, "title": true, "toolbar": true, "tooltip": true, "movable": true, "zoomable": true, "rotatable": true, "scalable": true, "transition": true, "fullscreen": true, "keyboard": true, "url": "data-source" }
 })
 
-import VueI18n from 'vue-i18n'; //多语言
 
-// 导入多语言的 JSON 文件
-import enLocale from './locales/en.json';
-import cnLocale from './locales/cn.json';
-
-Vue.use(VueI18n);
-// 创建 VueI18n 实例，并设置默认语言和多语言内容
-const i18n = new VueI18n({
-    locale: 'en', // 默认语言
-    messages: {
-        en: enLocale, // 英文
-        cn: cnLocale, // 中文
-        // 其他语言...
-    }
-});
 
 Vue.prototype.requestUrl = requestUrl;
 Vue.prototype.utils = utils;
 
 new Vue({
   render: h => h(App),
-  i18n,
 }).$mount('#app')

package/src/components/imgView.vue

@@ -1,32 +0,0 @@
-<template>
-    <div>
-        <el-image-viewer :zIndex="999999" :on-close="closeViewer" :url-list="urlList" />
-    </div>
-</template>
-
-<script>
-import ElementUI from 'element-ui';
-// import ElImageViewer from ElementUI.Image.components.ImageViewer;
-
-export default {
-    name: "imgView",
-    components: {
-        ElImageViewer: ElementUI.Image.components.ImageViewer
-    },
-    data () {
-        return {};
-    },
-    props: ["urlList"],
-    methods: {
-        closeViewer () {
-            // 关闭组件后从父级dom销毁这个挂载
-            if (this.$el.parentNode) {
-                this.$el.parentNode.removeChild(this.$el);
-            }
-            this.$emit("closeViewer");
-        },
-    },
-};
-</script>
-
-<style scoped></style>

package/src/components/markDownText.vue

@@ -1,164 +0,0 @@
-<template>
-    <div @click="lookImage">
-        <vue-markdown class="mark_down" :source="typedContent" :ref="'markdown' + msgId">
-        </vue-markdown>
-        <div v-if="showPreview">
-            <img-view :url-list="imgList" @closeViewer="closeViewer"></img-view>
-        </div>
-    </div>
-</template>
-
-<script>
-import VueMarkdown from "vue-markdown";
-import ImgView from "./imgView.vue";
-
-export default {
-    name: "markDownText",
-    data() {
-        return {
-            typedContent: "",
-            typingSpeed: 15,
-            showPreview: false,
-            imgList: [],
-        };
-    },
-    props: {
-        chainValues: {
-            type: String,
-            default: "",
-        },
-        msgId: {
-            type: String,
-            default: "",
-        },
-        isHistory: {
-            type: Boolean,
-            default: false,
-        },
-    },
-    components: {
-        ImgView,
-        VueMarkdown,
-    },
-    mounted() {
-        this.$nextTick(() => {
-            // let ref = 'markdown' + this.msgId
-            // const el = this.$refs[ref].$el;
-            // if (this.isHistory){
-            //   el.innerHTML = this.chainValues;
-            // } else {
-            //   new Typed(el, {
-            //     strings: [this.chainValues],
-            //     typeSpeed: 30,
-            //     showCursor: false
-            //   })
-            // }
-            this.typedContent = this.chainValues;
-            // if (this.isHistory) {
-            //     this.typedContent = this.chainValues;
-            // } else {
-            //     this.startTypingEffect();
-            // }
-        });
-    },
-    methods: {
-        startTypingEffect() {
-            let i = 0;
-            const interval = setInterval(() => {
-                if (i < this.chainValues.length) {
-                    this.typedContent += this.chainValues.charAt(i);
-                    i++;
-                } else {
-                    clearInterval(interval);
-                }
-            }, this.typingSpeed);
-        },
-        lookImage(e) {
-            let previewImageUrl = "";
-            console.log("e.target", e.target);
-            if (e.target.localName == "img") {
-                previewImageUrl = e.target.currentSrc;
-                this.showPreview = true;
-            }
-            let richtext = JSON.parse(JSON.stringify(this.typedContent));
-            this.imgList = [];
-            richtext.replace(
-                /<img [^>]*src=['"]([^'"]+)[^>]*>/g,
-                (match, capture) => {
-                    this.imgList.push(capture);
-                }
-            );
-            /*当前点击的图片作为第一个图片*/
-            let index = this.imgList.indexOf(previewImageUrl);
-            this.imgList.splice(index, 1);
-            this.imgList.unshift(previewImageUrl);
-        },
-        closeViewer() {
-            this.showPreview = false;
-        },
-    },
-};
-</script>
-
-<style scoped lang="less">
-.mark_down {
-    line-height: 24px;
-
-    /deep/p {
-        margin-bottom: 14px;
-        font-size: 16px;
-    }
-
-    /deep/p:only-child {
-        margin: 0 !important;
-    }
-
-    /deep/p:last-child {
-        margin-bottom: 0 !important;
-    }
-
-    /deep/ul {
-        margin-bottom: 16px ;
-        li {
-            margin: 7px 0 !important;
-            font-size: 16px;
-
-        }
-    }
-
-    /deep/ ol {
-        li {
-            margin: 7px 0 !important;
-            font-size: 16px;
-        }
-    }
-
-    /deep/img {
-        max-width: 400px;
-    }
-
-    /deep/h3,
-    /deep/h2,
-    /deep/h1,
-    /deep/h4,
-    /deep/h5,
-    /deep/h6 {
-        color: #000000;
-        font-weight: 500;
-        line-height: 26px;
-    }
-
-    /deep/h3 {
-        font-size: 20px;
-    }
-    /deep/h2 {
-        font-size: 22px;
-    }
-    /deep/h1 {
-        font-size: 24px;
-    }
-    /deep/h3 {
-        font-size: 20px;
-    }
-}
-</style>

package/src/locales/cn.json

@@ -1,26 +0,0 @@
-{
-    "dragonCommon": {
-        "download": "下载",
-        "smartSummary": "智能摘要",
-        "chat": "聊一聊",
-        "viewDetails": "查看详情",
-        "folderName": "文件夹名称",
-        "loading": "加载中...",
-        "Safaridownload": "下载地址已复制，请前往Safari浏览器访问下载",
-        "reduce": "缩小",
-        "zoom": "放大",
-        "selectScale": "请选择",
-        "previous": "上一段",
-        "next": "下一段",
-        "answersGeneratedByPre": "答案由",
-        "answersGeneratedByAfter": "段内容生成",
-        "scaleAuto": "自动缩放",
-        "scaleReality": "实际比例",
-        "firstParagraph": "当前已经是第一段了",
-        "lastParagraph": "当前已经是最后一段了",
-        "fileloadException": "文件加载异常",
-        "regenerate": "重新生成",
-        "generating": "生成中",
-        "close": "关闭"
-    }
-}