askbot-dragon 1.6.20-beta → 1.6.22-beta

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "askbot-dragon",
-  "version": "1.6.20-beta",
+  "version": "1.6.22-beta",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
@@ -13,6 +13,8 @@
     "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 +32,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,7 +23,7 @@
         });
       }
     </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图标 -->
@@ -48,12 +48,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/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

@@ -26,7 +26,7 @@
                 class="grzh-iframe"
                 :src="actionAlertIframe.template"
                 width="100%"
-                height="90%"
+                height="95%"
                 :scrolling="actionAlertIframe.scrolling"
                 frameborder="no"
                 border="0"
@@ -87,29 +87,6 @@ export default {
           this.actionAlertIframe.template = this.actionAlertIframe.template  + "&iframeId=" + this.tampId
         }
         this.actionAlertIframe.template = this.actionAlertIframe.template.split("&").join("&")
-
-        // 监听回退事件
-        let _that = this;
-
-        (function () {
-            console.log(95, 'addEventListener window.onpopstate');
-            if (window.history && window.history.pushState) {
-                console.log(97, 'window.history && window.history.pushState');
-                window.onpopstate = function (e) {
-                    console.log(9999, 'window.onpopstate innner', e);
-                    if (_that.showAskFullScreen) {
-                        window.history.go(1);
-                    }
-                    // window.history.pushState('forward', null, '');
-                    // window.history.forward(1);
-                    _that.showAskFullScreen = false;
-                    if ( e && e.stopPropagation ) {
-                        console.log(105, 'e.stopPropagation');
-                        e.stopPropagation();
-                    }
-                };
-            }
-        })();
     },
 };
 </script>

package/src/components/AiGuide.vue

@@ -16,7 +16,7 @@
                 <span v-html="aiGuide.content.description"></span>
             </div>
             <!-- 一级分类 -->
-            <div v-show="aiGuide.content.typesVisible && aiGuide.content.options && aiGuide.content.options.length > 0" class="ig-types-f">
+            <div v-show="aiGuide.content.typesVisible" class="ig-types-f">
                 <span
                     v-for="(fType, fTypeIndex) in aiGuide.content.options"
                     :key="`f_${fTypeIndex}`"
@@ -31,7 +31,9 @@
                 >
             </div>
             <!-- 二级分类 -->
-           <div v-if="aiGuide.content.typesVisible && aiGuide.content.options[activeFirstTypeIndex] && aiGuide.content.options[activeFirstTypeIndex].types && aiGuide.content.options[activeFirstTypeIndex].types.length !== 0" class="ig-types-s">
+            <div v-show="aiGuide.content.typesVisible && aiGuide.content.options[
+                        activeFirstTypeIndex
+                    ].types.length !== 0" class="ig-types-s">
                 <span
                     v-for="(sType, sTypeIndex) in aiGuide.content.options[
                         activeFirstTypeIndex
@@ -232,11 +234,11 @@ export default {
     beforeMount() {},
     mounted() {
         this.isMobile();
-        if (this.aiGuide.content.options[0] && this.aiGuide.content.options[0] && this.aiGuide.content.options[0].types && this.aiGuide.content.options[0].types.length === 0) {
+        if (this.aiGuide.content.options[0].types.length === 0) {
             this.activeOtherObj = this.aiGuide.content.options[0];
         } else {
             this.activeSecondTypeIndex = 0;
-            this.activeOtherObj = this.aiGuide.content.options[0] && this.aiGuide.content.options[0].types && this.aiGuide.content.options[0].types[0] ? this.aiGuide.content.options[0].types[0] : [];
+            this.activeOtherObj = this.aiGuide.content.options[0].types[0];
         }
     },
     methods: {

package/src/components/AnswerDocknowledge.vue

@@ -69,8 +69,11 @@
                     </div>
                 </div>
             </div>
+            <div class="ad-loadmore" v-if="loadMoreFlag" @click="lazyLoadKnowledegList">
+              查看更多
+            </div>
         </div>
-        <previewPdf ref="previewPdf" :url="previewHref" :watermark="watermark" :sourceFileType="sourceFileType" officePreviewType="pdf"></previewPdf>
+        <previewPdf ref="previewPdf" :url="previewHref" :sourceFileType="sourceFileType" officePreviewType="pdf"></previewPdf>
     </div>
 </template>
   
@@ -155,32 +158,28 @@ export default {
               yqhtml: "yqhtml",
               feishuhtml:"feishuhtml"
             },
-            watermark: {
-              textWatermarkValue:'',
-              visitorWatermarkValue:'',
-              source:""
-            }
+            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 = {};
@@ -201,14 +200,21 @@ 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: {
         //预览图片
         lookAttach(url, item, event) {
-          // console.log(item.knowledgeId);
-          // this.$http.get("/knowledge-api/internal/knowledgeBaseStructure/" + "642ffbccde420e2772f7787b")
-          // debugger
           event.preventDefault();
           if (this.isAskLightning == 1 && !this.isApp){
             window.parent.postMessage({
@@ -241,10 +247,8 @@ export default {
             }
             this.$http.post(httpUrl, {
               "fileInOssPath":url
-            }).then(async res =>{
+            }).then(res =>{
               if(res.data.code == '0') {
-                this.watermark = await this.getknowledgeBaseStructure(item.knowledgeId);
-                this.watermark.source = item.source;
                 this.previewHref = res.data.data;
                 this.sourceFileType = url.substring(url.lastIndexOf('.'))
                 let isOhmPc = sessionStorage.getItem('isOhmPc')
@@ -257,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'|| fileName === '.html'){
-                  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
@@ -320,23 +313,20 @@ export default {
             })
           // return imgurl
         },
-        async getknowledgeBaseStructure(knowledgeId) {
-          let watermark = {
-            textWatermarkValue:'',
-            visitorWatermarkValue:''
-          }
-          await this.$http.get("/knowledge-api/internal/knowledgeBaseStructure/" + knowledgeId).then( async res =>{
-            if(res.data) {
-              watermark.textWatermarkValue = await res.data.textWatermarkValue
-              if(res.data.visitorWatermark) {
-                let userInfo = sessionStorage.getItem('userInfo') || localStorage.getItem('userInfo')
-                if(userInfo && userInfo !== 'null') {
-                  watermark.visitorWatermarkValue = JSON.parse(userInfo).realName
-                }
-              }
+        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
             }
-          })
-          return watermark
+            if(this.allKnowledgeList.length == 0) {
+              this.loadMoreFlag = false
+            }
+            this.msg.content.list = [...this.msg.content.list, ...arr]
+            return
+          }
         }
     }
 }
@@ -447,8 +437,6 @@ export default {
                   }
                 }
                 .alc-box-introduction-previewImage {
-                  width: 100%;
-                  display: block;
                   overflow: hidden;
                   text-overflow: ellipsis;
                   display: -webkit-box;
@@ -552,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>

package/src/components/ConversationContainer.vue

@@ -211,7 +211,7 @@ export default {
                             "knowledgeId": "658a93de63d378228271913a",
                             "knowledgePartId": "ypZaqYwBD3jzLtPbz5K8",
                             "from": "ppt_preview",
-                            "introduction": "Spark是什么Spark 是一个开源的大数据处理引擎，它提供了一整套开发 API，。",
+                            "introduction": "Spark是什么Spark 是一个开源的大数据处理引擎，它提供了一整套开发 API，包括流计算和机器学习。它支持批处理和流处理。Spark 的一个显著特点是它能够在内存中进行迭代计算，从而加快数据处理速度。尽管 Spark 是用 Scala 开发的，但它也为 Java、Scala、Python 和 R 等高级编程语言提供了开发接口。",
                             "previewImage": "https://askbot-pdf-all.oss-cn-zhangjiakou.aliyuncs.com/31623ccfe9dd4957bbd59c5823878bbe/2023/12/27/03/39/08/658b9c477cf604285f7cb81d/pdf-image-1913302477976388839.png"
                         }
                     ],
@@ -4652,7 +4652,6 @@ export default {
             url:
               'https://guoranopen-zjk.oss-cn-zhangjiakou.aliyuncs.com/2021/08/24/07/35/41221223-c180-4f3f-bdc8-94875b693965/WeChat_20210719215122.mp4',
             videoFlag: false,
-            nodownload: false,
             videoUploadPercent: 0,
             isShowUploadVideo: true,
             recommend: {

package/src/components/askVideo.vue

@@ -15,21 +15,18 @@
                 :controlslist="nodownload&&'nodownload'"
                 :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: 25px;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'">
           <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 id="output"></div>
     </div>
 </template>
 <script>
-    import {ossConfig,uploadImageByBase64} from "../assets/js/AliyunlssUtil";
+    import { putObject } from "../assets/js/obsBrowser";
 
     export default {
         name: "ask_video",
@@ -89,7 +86,10 @@
             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(ossConfig,blob);
+            const file = new File([blob], 'name', { type: 'text/plain', lastModified: Date.now() });
+            console.debug('file',file)
+            let promise = putObject(file);
             promise.then((res)=>{
               console.debug("upload base64 reslut",res);
               if (res&&res.url){
@@ -126,8 +126,6 @@
 video::-webkit-media-controls-mute-button { display: none !important;}
 #dragon-video{
   position: relative;
-  width: calc(100vw - 109px);
-  max-width: 260px;
   #outputVideo{
     position: absolute;
     top: 0px;
@@ -139,24 +137,6 @@ video::-webkit-media-controls-mute-button { display: none !important;}
     }
 
   }
-  .dragon-video-download{
-    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;
-      }
-    }
-  }
 }
 
 </style>

package/src/components/associationIntention.vue

@@ -233,7 +233,7 @@
         this.$emit("onRadioClick", id, name, apikey,optionApiKey);
       },
       onImageClick(url){
-        this.$emit('onImageClick', encodeURI(url))
+        this.$emit('onImageClick',url)
       },
       msgContent(content){
         console.debug('215',content)
@@ -343,12 +343,6 @@
       display: block;
     }
   }
-  /deep/ img {
-    height: auto;
-    width: calc(100vw - 137px);
-    border-radius: 25px;
-    max-width: 230px;
-  }
 }
 /deep/.el-drawer__body{
   height: 100%;

package/src/components/formTemplate.vue

@@ -860,6 +860,7 @@ import Tree from '../components/tree'
 import selectPopup from '../components/popup'
 import fileListView from './fielListView.vue'
 import { uniqueData } from './utils/math_utils'
+import { putObject } from "../assets/js/obsBrowser";
 export default {
   name: "formTemplate",
   data() {
@@ -1649,21 +1650,24 @@ export default {
         status:'',
         url:''
       }
-      let res = multipartUpload(
-              this.ossConfig,
-              file,
-              null,
-              imageInfo
-      );
-      res.then((res) => {
+      // let res = multipartUpload(
+      //         this.ossConfig,
+      //         file,
+      //         null,
+      //         imageInfo
+      // );
+      let resp = putObject(file);
+      resp.then((res) => {
         console.log("upload result:", res);
         // let filePath = res.name;
-        imageData.urls.push({
+        let obj = {
           name:file.name,
-          url:ossFileUrl(this.ossConfig, res.name),
+          url:res.url,
           status:'success'
-        })
-        imageInfo.url = ossFileUrl(this.ossConfig, res.name)
+        }
+        imageData.urls.push(obj)
+        // imageInfo.url = ossFileUrl(this.ossConfig, res.name)
+        imageInfo.url = res.url;
         imageInfo.status='success'
         imageInfo.name=file.name
         for (let j=0;j<this.extInfoFieldValue[this.filedId].length;j++){
@@ -2575,13 +2579,14 @@ export default {
            progress: 0,
          },
        };*/
-      let res = multipartUpload(
-              this.ossConfig,
-              file,
-              null,
-              imgInfo
-      );
-      res.then((res) => {
+      // let res = multipartUpload(
+      //         this.ossConfig,
+      //         file,
+      //         null,
+      //         imgInfo
+      // );
+      let ress = putObject(file)
+      ress.then((res) => {
         console.debug("upload result:", res);
         // let filePath = res.name;
         /* imageData.content.progress = 1;
@@ -2589,7 +2594,7 @@ export default {
                  ossFileUrl(this.ossConfig, res.name)
          );
          console.log('imageData',imageData)*/
-        imgInfo.url = ossFileUrl(this.ossConfig, res.name)
+        imgInfo.url = res.url
         imgInfo.status='success'
         if (data.file){
           imgInfo.name = data.file.name