atr-components 0.2.234 → 0.2.236

package/fesm2020/atr-components.mjs

@@ -394,7 +394,7 @@ class ToolsUtil {
         if (url.startsWith("http")) {
             return url;
         }
-        return atr_static_datas.OSS_URL + url;
+        return atr_static_datas.OSS_URL + url + "?v=" + new Date().getTime();
     }
     static getStaticOssUrl(url) {
         if (!url) {
@@ -403,7 +403,8 @@ class ToolsUtil {
         if (url.startsWith("http")) {
             return url;
         }
-        return atr_static_datas.STATIC_OSS_URL + url + "?v=" + new Date().getTime();
+        let v = new Date().getTime();
+        return atr_static_datas.STATIC_OSS_URL + url + "?v=" + v;
     }
     static removeHtml(value) {
         if (!value) {
@@ -2001,7 +2002,7 @@ class UploadOssService {
                 const success = (result) => {
                     if (result.status === 200) {
                         this.uploadData = result.data;
-                        this.customReq(file, fullUrl).subscribe((url) => {
+                        this.customReq(file, fullUrl, result.data).subscribe((url) => {
                             observe.next(url);
                             observe.unsubscribe();
                         });
@@ -2022,9 +2023,10 @@ class UploadOssService {
                 }, ToolsUtil.getHttpOptions()).subscribe(success, error);
             });
         };
-        this.customReq = (file, fullUrl = true) => {
+        this.customReq = (file, fullUrl = true, uploadData = null) => {
             const formData = new FormData();
-            for (let key in this.uploadData) {
+            uploadData = uploadData ? uploadData : this.uploadData;
+            for (let key in uploadData) {
                 if (key != 'host')
                     formData.append(key, this.uploadData[key]);
             }
@@ -2037,7 +2039,7 @@ class UploadOssService {
                     if (event.type === HttpEventType.UploadProgress) {
                     }
                     else if (event instanceof HttpResponse) {
-                        const url = fullUrl ? (event.url + this.uploadData.key) : this.uploadData.key;
+                        const url = fullUrl ? (event.url + uploadData.key) : uploadData.key;
                         observe.next(url);
                         observe.unsubscribe();
                     }