askbot-dragon 1.5.46-beta → 1.5.48-beta

package/src/components/previewPdf.vue

@@ -54,7 +54,7 @@
     </div>
     <div id="drawer_content_pre">
       <template v-if="tagIds && tagIds.length != 0 && drawer">
-        <pdfPosition :tagIds="tagIds" :isMessageRecord="isMessageRecord" :fileName="fileName" ref="pdfPosition"></pdfPosition>
+        <pdfPosition :tagIds="tagIds" :isMessageRecord="isMessageRecord"></pdfPosition>
       </template>
       <template v-else>
         <div v-if="fileType == 'VIDEO'" style="width: 100%;">
@@ -97,7 +97,6 @@ export default {
             tagIds: [],
             // '6454aa1a70573a6ead6f0f7d', '6454aa1a70573a6ead6f0f81',
             loading:true,
-          fileName:''
         }
     },
     mounted() {
@@ -127,20 +126,9 @@ export default {
       drawer(value) {
         if(value) {
           this.$nextTick(() =>{
-            if (this.tagIds && this.tagIds.length != 0){
-              zoomElement(document.getElementById('pdf_container_view'))
-            }
+            zoomElement(document.getElementById('drawer_content_pre'))
           })
         }
-        setTimeout(() => {
-          let previewIframe = document.getElementsByClassName('preview_iframe')
-          Array.from(previewIframe).forEach(item =>{
-            item.onload = () =>{
-              console.debug('previewIframe 106',previewIframe,this.drawer)
-              item.style.backgroundImage = 'none'
-            }
-          })
-        })
       }
     },
     computed:{
@@ -294,6 +282,10 @@ export default {
     overflow: auto;
     height: calc(100% - 50px);
     background: #FFF;
+    background-image: url('https://guoranopen-zjk.oss-cn-zhangjiakou.aliyuncs.com/cdn-common/images/loading.gif');
+    background-position: center;
+    background-size: 50px;
+    background-repeat: no-repeat;
   }
 }
 @media screen and (min-width: 768px) {

package/src/components/utils/ckeditor.js

@@ -1,6 +1,7 @@
 /* eslint-disable */
 import {multipartUpload, ossFileUrl} from "./AliyunIssUtil";
 import { v4 as uuidv4 } from "uuid";
+import { putObject } from "../../assets/js/obsBrowser";
 const ossConfig = {
         region: "oss-cn-zhangjiakou",
         //云账号AccessKey有所有API访问权限，建议遵循阿里云安全最佳实践，创建并使用STS方式来进行API访问
@@ -55,14 +56,16 @@ class MyUploadAdapter {
         let imgInfo = {
             url:'',
         }
-        let res = multipartUpload(
-            ossConfig,
-            file,
-            null,
-            imgInfo
-        );
+        // let res = multipartUpload(
+        //     ossConfig,
+        //     file,
+        //     null,
+        //     imgInfo
+        // );
+        let res = putObject(file);
         res.then(resp=>{
-            imgInfo.url = ossFileUrl(ossConfig, resp.name)
+            // imgInfo.url = ossFileUrl(ossConfig, resp.name)
+            imgInfo.url = resp.url;
             let root =  this.editor.model.document.getRoot()
             let children = root.getChildren()
             for(let child of children){

package/src/components/utils/ckeditorImageUpload/command.js

@@ -1,5 +1,6 @@
 import Command from "@ckeditor/ckeditor5-core/src/command";
 import { multipartUpload, ossFileUrl } from "../AliyunIssUtil";
+import { putObject } from "../../../assets/js/obsBrowser";
 const ossConfig = {
     region: "oss-cn-zhangjiakou",
     //云账号AccessKey有所有API访问权限，建议遵循阿里云安全最佳实践，创建并使用STS方式来进行API访问
@@ -91,15 +92,16 @@ export default class ImageCommand extends Command {
         let imgInfo = {
             url: '',
         }
-        let res = multipartUpload(
-            ossConfig,
-            file,
-            null,
-            imgInfo
-        );
+        // let res = multipartUpload(
+        //     ossConfig,
+        //     file,
+        //     null,
+        //     imgInfo
+        // );
+        let res = putObject(file)
         console.log(res,'resprespresp');
         res.then(resp => {
-            imgInfo.url = ossFileUrl(ossConfig, resp.name)
+            imgInfo.url = resp.url;
             console.log(resp,'resprespresp');
             console.log(imgInfo)
             resolve({

package/src/components/utils/ckeditorfileUpload/common.js

@@ -1,15 +1,6 @@
 import Command from "@ckeditor/ckeditor5-core/src/command";
-import { multipartUpload, ossFileUrl } from "../AliyunIssUtil";
 import { v4 as uuidv4 } from "uuid";
-
-const ossConfig = {
-    region: "oss-cn-zhangjiakou",
-    //云账号AccessKey有所有API访问权限，建议遵循阿里云安全最佳实践，创建并使用STS方式来进行API访问
-    accessKeyId: "LTAI4G3QtdEdwkEbihBngAsK",
-    accessKeySecret: "OwgdVfc5PeCkIgqIdug660xmiSPchn",
-    // stsToken: '<Your securityToken(STS)>',
-    bucket: "guoranopen-zjk",
-}
+import { putObject } from "../../../assets/js/obsBrowser";
 
 function findListener(askPluginListeners, type) {
     for (let i = 0, len = askPluginListeners.length; i < len; i++) {
@@ -164,14 +155,16 @@ export default class FileCommand extends Command {
         let imgInfo = {
             url: '',
         }
-        let res = multipartUpload(
-            ossConfig,
-            file,
-            null,
-            imgInfo
-        );
+        // let res = multipartUpload(
+        //     ossConfig,
+        //     file,
+        //     null,
+        //     imgInfo
+        // );
+        let res = putObject(file);
         res.then(resp => {
-            imgInfo.url = ossFileUrl(ossConfig, resp.name)
+            // imgInfo.url = ossFileUrl(ossConfig, resp.name)
+            imgInfo.url = resp.url;
             resolve({
                 name: resp.name,
                 default: imgInfo.url