atr-components 0.2.235 → 0.2.237

package/fesm2020/atr-components.mjs

@@ -387,14 +387,18 @@ class ToolsUtil {
         }
         return date.getFullYear() + "-" + month + "-" + strDate + " " + hours + ":" + seconds;
     }
-    static getOssUrl(url) {
+    static getOssUrl(url, needTime = false) {
         if (!url) {
             return "";
         }
+        if (needTime) {
+            url = url + "?v=" + new Date().getTime();
+        }
         if (url.startsWith("http")) {
             return url;
         }
-        return atr_static_datas.OSS_URL + url + "?v=" + new Date().getTime();
+        let result = atr_static_datas.OSS_URL + url;
+        return result;
     }
     static getStaticOssUrl(url) {
         if (!url) {
@@ -403,8 +407,7 @@ class ToolsUtil {
         if (url.startsWith("http")) {
             return url;
         }
-        let v = new Date().getTime();
-        return atr_static_datas.STATIC_OSS_URL + url + "?v=" + v;
+        return atr_static_datas.STATIC_OSS_URL + url;
     }
     static removeHtml(value) {
         if (!value) {
@@ -1909,8 +1912,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.11", ngImpo
         }] });
 
 class OssPipe {
-    transform(value, defaultVal) {
-        return ToolsUtil.getOssUrl(value);
+    transform(value, defaultVal, needTime = false) {
+        return ToolsUtil.getOssUrl(value, needTime);
     }
 }
 OssPipe.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: OssPipe, deps: [], target: i0.ɵɵFactoryTarget.Pipe });
@@ -2002,7 +2005,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();
                         });
@@ -2023,9 +2026,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]);
             }
@@ -2038,7 +2042,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();
                     }