atr-components 0.2.235 → 0.2.236
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/core/services/upload-oss.service.d.ts +1 -1
- package/esm2020/core/services/upload-oss.service.mjs +6 -5
- package/fesm2015/atr-components.mjs +5 -4
- package/fesm2015/atr-components.mjs.map +1 -1
- package/fesm2020/atr-components.mjs +5 -4
- package/fesm2020/atr-components.mjs.map +1 -1
- package/package.json +1 -1
|
@@ -8,7 +8,7 @@ export declare class UploadOssService {
|
|
|
8
8
|
uploadData: any;
|
|
9
9
|
constructor(httpService: HttpService, httpClient: HttpClient);
|
|
10
10
|
uploadOss: (file: any, dir?: string, fullUrl?: boolean) => Observable<any>;
|
|
11
|
-
customReq: (file: File, fullUrl?: boolean) => Observable<any>;
|
|
11
|
+
customReq: (file: File, fullUrl?: boolean, uploadData?: any) => Observable<any>;
|
|
12
12
|
static ɵfac: i0.ɵɵFactoryDeclaration<UploadOssService, never>;
|
|
13
13
|
static ɵprov: i0.ɵɵInjectableDeclaration<UploadOssService>;
|
|
14
14
|
}
|
|
@@ -15,7 +15,7 @@ export class UploadOssService {
|
|
|
15
15
|
const success = (result) => {
|
|
16
16
|
if (result.status === 200) {
|
|
17
17
|
this.uploadData = result.data;
|
|
18
|
-
this.customReq(file, fullUrl).subscribe((url) => {
|
|
18
|
+
this.customReq(file, fullUrl, result.data).subscribe((url) => {
|
|
19
19
|
observe.next(url);
|
|
20
20
|
observe.unsubscribe();
|
|
21
21
|
});
|
|
@@ -36,9 +36,10 @@ export class UploadOssService {
|
|
|
36
36
|
}, ToolsUtil.getHttpOptions()).subscribe(success, error);
|
|
37
37
|
});
|
|
38
38
|
};
|
|
39
|
-
this.customReq = (file, fullUrl = true) => {
|
|
39
|
+
this.customReq = (file, fullUrl = true, uploadData = null) => {
|
|
40
40
|
const formData = new FormData();
|
|
41
|
-
|
|
41
|
+
uploadData = uploadData ? uploadData : this.uploadData;
|
|
42
|
+
for (let key in uploadData) {
|
|
42
43
|
if (key != 'host')
|
|
43
44
|
formData.append(key, this.uploadData[key]);
|
|
44
45
|
}
|
|
@@ -51,7 +52,7 @@ export class UploadOssService {
|
|
|
51
52
|
if (event.type === HttpEventType.UploadProgress) {
|
|
52
53
|
}
|
|
53
54
|
else if (event instanceof HttpResponse) {
|
|
54
|
-
const url = fullUrl ? (event.url +
|
|
55
|
+
const url = fullUrl ? (event.url + uploadData.key) : uploadData.key;
|
|
55
56
|
observe.next(url);
|
|
56
57
|
observe.unsubscribe();
|
|
57
58
|
}
|
|
@@ -70,4 +71,4 @@ UploadOssService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", ver
|
|
|
70
71
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: UploadOssService, decorators: [{
|
|
71
72
|
type: Injectable
|
|
72
73
|
}], ctorParameters: function () { return [{ type: i1.HttpService }, { type: i2.HttpClient }]; } });
|
|
73
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
74
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXBsb2FkLW9zcy5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvY29tcG9uZW50cy9zcmMvY29yZS9zZXJ2aWNlcy91cGxvYWQtb3NzLnNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFDLFVBQVUsRUFBQyxNQUFNLGVBQWUsQ0FBQztBQUV6QyxPQUFPLEVBQUMsVUFBVSxFQUFDLE1BQU0sTUFBTSxDQUFDO0FBQ2hDLE9BQU8sRUFBQyxTQUFTLEVBQUMsTUFBTSxvQkFBb0IsQ0FBQztBQUM3QyxPQUFPLEVBQUMsV0FBVyxFQUF5QixZQUFZLEVBQUUsYUFBYSxFQUFDLE1BQU0sc0JBQXNCLENBQUM7QUFDckcsT0FBTyxFQUFDLGdCQUFnQixFQUFDLE1BQU0sb0JBQW9CLENBQUM7Ozs7QUFHcEQsTUFBTSxPQUFPLGdCQUFnQjtJQUczQixZQUFvQixXQUF3QixFQUFVLFVBQXNCO1FBQXhELGdCQUFXLEdBQVgsV0FBVyxDQUFhO1FBQVUsZUFBVSxHQUFWLFVBQVUsQ0FBWTtRQUk1RSxjQUFTLEdBQUcsQ0FBQyxJQUFTLEVBQUUsR0FBRyxHQUFHLFNBQVMsRUFBRSxPQUFPLEdBQUcsSUFBSSxFQUFFLEVBQUU7WUFDekQsT0FBTyxJQUFJLFVBQVUsQ0FBTSxPQUFPLENBQUMsRUFBRTtnQkFDbkMsTUFBTSxPQUFPLEdBQUcsQ0FBQyxNQUFXLEVBQUUsRUFBRTtvQkFDOUIsSUFBSSxNQUFNLENBQUMsTUFBTSxLQUFLLEdBQUcsRUFBRTt3QkFDekIsSUFBSSxDQUFDLFVBQVUsR0FBRyxNQUFNLENBQUMsSUFBSSxDQUFDO3dCQUM5QixJQUFJLENBQUMsU0FBUyxDQUFDLElBQUksRUFBRSxPQUFPLEVBQUUsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDLFNBQVMsQ0FBQyxDQUFDLEdBQUcsRUFBRSxFQUFFOzRCQUMzRCxPQUFPLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxD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QUFoQixnQkFBZ0I7a0JBRDVCLFVBQVUiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQge0luamVjdGFibGV9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xyXG5pbXBvcnQge0h0dHBTZXJ2aWNlfSBmcm9tICcuL2h0dHAuc2VydmljZSc7XHJcbmltcG9ydCB7T2JzZXJ2YWJsZX0gZnJvbSAncnhqcyc7XHJcbmltcG9ydCB7VG9vbHNVdGlsfSBmcm9tICcuLi91dGlscy9Ub29sc1V0aWwnO1xyXG5pbXBvcnQge0h0dHBSZXF1ZXN0LCBIdHRwQ2xpZW50LCBIdHRwRXZlbnQsIEh0dHBSZXNwb25zZSwgSHR0cEV2ZW50VHlwZX0gZnJvbSAnQGFuZ3VsYXIvY29tbW9uL2h0dHAnO1xyXG5pbXBvcnQge2F0cl9zdGF0aWNfZGF0YXN9IGZyb20gXCIuLi9iYXNlL2F0ci1jb21tb25cIjtcclxuXHJcbkBJbmplY3RhYmxlKClcclxuZXhwb3J0IGNsYXNzIFVwbG9hZE9zc1NlcnZpY2Uge1xyXG4gIHVwbG9hZERhdGE6IGFueTtcclxuXHJcbiAgY29uc3RydWN0b3IocHJpdmF0ZSBodHRwU2VydmljZTogSHR0cFNlcnZpY2UsIHByaXZhdGUgaHR0cENsaWVudDogSHR0cENsaWVudCkge1xyXG4gIH1cclxuXHJcblxyXG4gIHVwbG9hZE9zcyA9IChmaWxlOiBhbnksIGRpciA9ICd1ZWRpdG9yJywgZnVsbFVybCA9IHRydWUpID0+IHtcclxuICAgIHJldHVybiBuZXcgT2JzZXJ2YWJsZTxhbnk+KG9ic2VydmUgPT4ge1xyXG4gICAgICBjb25zdCBzdWNjZXNzID0gKHJlc3VsdDogYW55KSA9PiB7XHJcbiAgICAgICAgaWYgKHJlc3VsdC5zdGF0dXMgPT09IDIwMCkge1xyXG4gICAgICAgICAgdGhpcy51cGxvYWREYXRhID0gcmVzdWx0LmRhdGE7XHJcbiAgICAgICAgICB0aGlzLmN1c3RvbVJlcShmaWxlLCBmdWxsVXJsLCByZXN1bHQuZGF0YSkuc3Vic2NyaWJlKCh1cmwpID0+IHtcclxuICAgICAgICAgICAgb2JzZXJ2ZS5uZXh0KHVybCk7XHJcbiAgICAgICAgICAgIG9ic2VydmUudW5zdWJzY3JpYmUoKTtcclxuICAgICAgICAgIH0pO1xyXG5cclxuICAgICAgICB9IGVsc2Uge1xyXG4gICAgICAgICAgb2JzZXJ2ZS5uZXh0KGZhbHNlKTtcclxuICAgICAgICAgIG9ic2VydmUudW5zdWJzY3JpYmUoKTtcclxuICAgICAgICB9XHJcbiAgICAgIH07XHJcblxyXG4gICAgICBjb25zdCBlcnJvciA9IChlcnI6IGFueSkgPT4ge1xyXG4gICAgICAgIG9ic2VydmUubmV4dChmYWxzZSk7XHJcbiAgICAgICAgb2JzZXJ2ZS51bnN1YnNjcmliZSgpO1xyXG4gICAgICB9O1xyXG4gICAgICBsZXQgZmlsZU5hbWUgPSBUb29sc1V0aWwuZ2V0UmFuZG9tRmlsZU5hbWUoKSArIFwiLlwiICsgVG9vbHNVdGlsLmdldEZpbGVFeHQoZmlsZS5uYW1lKTtcclxuICAgICAgdGhpcy5odHRwU2VydmljZS5wb3N0KGF0cl9zdGF0aWNfZGF0YXMuT1NTX1BPTElDWSwge1xyXG4gICAgICAgIGRpcjogZGlyLFxyXG4gICAgICAgIGZpbGVOYW1lOiBmaWxlTmFtZVxyXG4gICAgICB9LCBUb29sc1V0aWwuZ2V0SHR0cE9wdGlvbnMoKSkuc3Vic2NyaWJlKHN1Y2Nlc3MsIGVycm9yKTtcclxuICAgIH0pO1xyXG5cclxuICB9XHJcblxyXG4gIGN1c3RvbVJlcSA9IChmaWxlOiBGaWxlLCBmdWxsVXJsID0gdHJ1ZSwgdXBsb2FkRGF0YTphbnkgPSBudWxsKSA9PiB7XHJcbiAgICBjb25zdCBmb3JtRGF0YSA9IG5ldyBGb3JtRGF0YSgpO1xyXG4gICAgdXBsb2FkRGF0YSA9IHVwbG9hZERhdGEgPyB1cGxvYWREYXRhIDogdGhpcy51cGxvYWREYXRhXHJcbiAgICBmb3IgKGxldCBrZXkgaW4gdXBsb2FkRGF0YSkge1xyXG4gICAgICBpZiAoa2V5ICE9ICdob3N0JylcclxuICAgICAgICBmb3JtRGF0YS5hcHBlbmQoa2V5LCB0aGlzLnVwbG9hZERhdGFba2V5XSlcclxuICAgIH1cclxuICAgIGZvcm1EYXRhLmFwcGVuZCgnZmlsZScsIGZpbGUgYXMgYW55KTtcclxuXHJcbiAgICBjb25zdCByZXEgPSBuZXcgSHR0cFJlcXVlc3QoJ1BPU1QnLCB0aGlzLnVwbG9hZERhdGEuaG9zdCEsIGZvcm1EYXRhLCB7XHJcbiAgICAgIHJlcG9ydFByb2dyZXNzOiB0cnVlXHJcbiAgICB9KTtcclxuXHJcbiAgICByZXR1cm4gbmV3IE9ic2VydmFibGU8YW55PihvYnNlcnZlID0+IHtcclxuICAgICAgY29uc3Qgc3VjY2VzcyA9IChldmVudDogSHR0cEV2ZW50PGFueT4pID0+IHtcclxuICAgICAgICBpZiAoZXZlbnQudHlwZSA9PT0gSHR0cEV2ZW50VHlwZS5VcGxvYWRQcm9ncmVzcykge1xyXG5cclxuICAgICAgICB9IGVsc2UgaWYgKGV2ZW50IGluc3RhbmNlb2YgSHR0cFJlc3BvbnNlKSB7XHJcbiAgICAgICAgICBjb25zdCB1cmwgPSBmdWxsVXJsID8gKGV2ZW50LnVybCArIHVwbG9hZERhdGEua2V5KSA6IHVwbG9hZERhdGEua2V5O1xyXG4gICAgICAgICAgb2JzZXJ2ZS5uZXh0KHVybCk7XHJcbiAgICAgICAgICBvYnNlcnZlLnVuc3Vic2NyaWJlKCk7XHJcbiAgICAgICAgfVxyXG4gICAgICB9XHJcblxyXG4gICAgICBjb25zdCBlcnJvciA9ICgpID0+IHtcclxuICAgICAgICBvYnNlcnZlLm5leHQoZmFsc2UpO1xyXG4gICAgICAgIG9ic2VydmUudW5zdWJzY3JpYmUoKTtcclxuICAgICAgfTtcclxuXHJcbiAgICAgIHRoaXMuaHR0cENsaWVudC5yZXF1ZXN0KHJlcSkuc3Vic2NyaWJlKHN1Y2Nlc3MsIGVycm9yKTtcclxuICAgIH0pO1xyXG4gIH1cclxuXHJcbn1cclxuIl19
|
|
@@ -2007,7 +2007,7 @@ class UploadOssService {
|
|
|
2007
2007
|
const success = (result) => {
|
|
2008
2008
|
if (result.status === 200) {
|
|
2009
2009
|
this.uploadData = result.data;
|
|
2010
|
-
this.customReq(file, fullUrl).subscribe((url) => {
|
|
2010
|
+
this.customReq(file, fullUrl, result.data).subscribe((url) => {
|
|
2011
2011
|
observe.next(url);
|
|
2012
2012
|
observe.unsubscribe();
|
|
2013
2013
|
});
|
|
@@ -2028,9 +2028,10 @@ class UploadOssService {
|
|
|
2028
2028
|
}, ToolsUtil.getHttpOptions()).subscribe(success, error);
|
|
2029
2029
|
});
|
|
2030
2030
|
};
|
|
2031
|
-
this.customReq = (file, fullUrl = true) => {
|
|
2031
|
+
this.customReq = (file, fullUrl = true, uploadData = null) => {
|
|
2032
2032
|
const formData = new FormData();
|
|
2033
|
-
|
|
2033
|
+
uploadData = uploadData ? uploadData : this.uploadData;
|
|
2034
|
+
for (let key in uploadData) {
|
|
2034
2035
|
if (key != 'host')
|
|
2035
2036
|
formData.append(key, this.uploadData[key]);
|
|
2036
2037
|
}
|
|
@@ -2043,7 +2044,7 @@ class UploadOssService {
|
|
|
2043
2044
|
if (event.type === HttpEventType.UploadProgress) {
|
|
2044
2045
|
}
|
|
2045
2046
|
else if (event instanceof HttpResponse) {
|
|
2046
|
-
const url = fullUrl ? (event.url +
|
|
2047
|
+
const url = fullUrl ? (event.url + uploadData.key) : uploadData.key;
|
|
2047
2048
|
observe.next(url);
|
|
2048
2049
|
observe.unsubscribe();
|
|
2049
2050
|
}
|