meixioacomponent 0.9.57 → 0.9.58
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/lib/config/uploadRequest.d.ts +1 -1
- package/lib/config/uploadRequest.d.ts.map +1 -1
- package/lib/config/uploadRequest.js +5 -5
- package/lib/meixioacomponent.common.js +6 -6
- package/lib/meixioacomponent.umd.js +6 -6
- package/lib/meixioacomponent.umd.min.js +2 -2
- package/package.json +1 -1
- package/packages/config/uploadRequest.ts +6 -5
- package/packages/utils/upload.js +1 -0
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
declare const _default: (params: any, uploadProgressFn: any, sourceToken: any) => Promise<unknown>;
|
|
1
|
+
declare const _default: (params: any, uploadProgressFn: any, sourceToken: any, oss: any) => Promise<unknown>;
|
|
2
2
|
export default _default;
|
|
3
3
|
//# sourceMappingURL=uploadRequest.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uploadRequest.d.ts","sourceRoot":"","sources":["../../packages/config/uploadRequest.ts"],"names":[],"mappings":";AAKA,
|
|
1
|
+
{"version":3,"file":"uploadRequest.d.ts","sourceRoot":"","sources":["../../packages/config/uploadRequest.ts"],"names":[],"mappings":";AAKA,wBAuFC"}
|
|
@@ -13,7 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
const axios_1 = __importDefault(require("axios"));
|
|
16
|
-
exports.default = (params, uploadProgressFn, sourceToken) => {
|
|
16
|
+
exports.default = (params, uploadProgressFn, sourceToken, oss) => {
|
|
17
17
|
const ossInstance = (data, uploadProgressFn) => {
|
|
18
18
|
// 创建 axios 实例
|
|
19
19
|
const instance = axios_1.default.create({
|
|
@@ -26,7 +26,6 @@ exports.default = (params, uploadProgressFn, sourceToken) => {
|
|
|
26
26
|
};
|
|
27
27
|
// 响应异常拦截处理器
|
|
28
28
|
const resErrorHandler = (error) => {
|
|
29
|
-
console.log(error);
|
|
30
29
|
// Message.error(`网络超时，请稍后重试`);
|
|
31
30
|
// return errorHandler(error);
|
|
32
31
|
throw error;
|
|
@@ -37,8 +36,10 @@ exports.default = (params, uploadProgressFn, sourceToken) => {
|
|
|
37
36
|
config.headers['Content-Type'] = 'multipart/form-data';
|
|
38
37
|
// @ts-ignore
|
|
39
38
|
config.headers['type'] = 'application/octet-stream';
|
|
40
|
-
|
|
41
|
-
|
|
39
|
+
if (!oss) {
|
|
40
|
+
// @ts-ignore
|
|
41
|
+
config.headers['authorization'] = `Bearer ${GetToken('token')}`;
|
|
42
|
+
}
|
|
42
43
|
config.onUploadProgress = (progressEvent) => {
|
|
43
44
|
if (uploadProgressFn) {
|
|
44
45
|
// @ts-ignore
|
|
@@ -63,7 +64,6 @@ exports.default = (params, uploadProgressFn, sourceToken) => {
|
|
|
63
64
|
cancelToken: sourceToken.token,
|
|
64
65
|
}, uploadProgressFn)
|
|
65
66
|
.then((res) => {
|
|
66
|
-
console.log(res);
|
|
67
67
|
const { status } = res;
|
|
68
68
|
if (status == 200) {
|
|
69
69
|
const { data } = res;
|
|
@@ -19323,7 +19323,7 @@ class Upload {
|
|
|
19323
19323
|
params.append('url', this.url);
|
|
19324
19324
|
}
|
|
19325
19325
|
try {
|
|
19326
|
-
let uploadEdUrl = await uploadRequest_default()(params, this.uploadProgressFn, this.cancelToken);
|
|
19326
|
+
let uploadEdUrl = await uploadRequest_default()(params, this.uploadProgressFn, this.cancelToken, isOss);
|
|
19327
19327
|
this.state = 1;
|
|
19328
19328
|
resolve(uploadEdUrl);
|
|
19329
19329
|
} catch (error) {
|
|
@@ -105709,7 +105709,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
105709
105709
|
};
|
|
105710
105710
|
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
105711
105711
|
const axios_1 = __importDefault(__webpack_require__(97218));
|
|
105712
|
-
exports["default"] = (params, uploadProgressFn, sourceToken) => {
|
|
105712
|
+
exports["default"] = (params, uploadProgressFn, sourceToken, oss) => {
|
|
105713
105713
|
const ossInstance = (data, uploadProgressFn) => {
|
|
105714
105714
|
// 创建 axios 实例
|
|
105715
105715
|
const instance = axios_1.default.create({
|
|
@@ -105722,7 +105722,6 @@ exports["default"] = (params, uploadProgressFn, sourceToken) => {
|
|
|
105722
105722
|
};
|
|
105723
105723
|
// 响应异常拦截处理器
|
|
105724
105724
|
const resErrorHandler = (error) => {
|
|
105725
|
-
console.log(error);
|
|
105726
105725
|
// Message.error(`网络超时，请稍后重试`);
|
|
105727
105726
|
// return errorHandler(error);
|
|
105728
105727
|
throw error;
|
|
@@ -105733,8 +105732,10 @@ exports["default"] = (params, uploadProgressFn, sourceToken) => {
|
|
|
105733
105732
|
config.headers['Content-Type'] = 'multipart/form-data';
|
|
105734
105733
|
// @ts-ignore
|
|
105735
105734
|
config.headers['type'] = 'application/octet-stream';
|
|
105736
|
-
|
|
105737
|
-
|
|
105735
|
+
if (!oss) {
|
|
105736
|
+
// @ts-ignore
|
|
105737
|
+
config.headers['authorization'] = `Bearer ${GetToken('token')}`;
|
|
105738
|
+
}
|
|
105738
105739
|
config.onUploadProgress = (progressEvent) => {
|
|
105739
105740
|
if (uploadProgressFn) {
|
|
105740
105741
|
// @ts-ignore
|
|
@@ -105759,7 +105760,6 @@ exports["default"] = (params, uploadProgressFn, sourceToken) => {
|
|
|
105759
105760
|
cancelToken: sourceToken.token,
|
|
105760
105761
|
}, uploadProgressFn)
|
|
105761
105762
|
.then((res) => {
|
|
105762
|
-
console.log(res);
|
|
105763
105763
|
const { status } = res;
|
|
105764
105764
|
if (status == 200) {
|
|
105765
105765
|
const { data } = res;
|
|
@@ -19333,7 +19333,7 @@ class Upload {
|
|
|
19333
19333
|
params.append('url', this.url);
|
|
19334
19334
|
}
|
|
19335
19335
|
try {
|
|
19336
|
-
let uploadEdUrl = await uploadRequest_default()(params, this.uploadProgressFn, this.cancelToken);
|
|
19336
|
+
let uploadEdUrl = await uploadRequest_default()(params, this.uploadProgressFn, this.cancelToken, isOss);
|
|
19337
19337
|
this.state = 1;
|
|
19338
19338
|
resolve(uploadEdUrl);
|
|
19339
19339
|
} catch (error) {
|
|
@@ -105719,7 +105719,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
105719
105719
|
};
|
|
105720
105720
|
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
105721
105721
|
const axios_1 = __importDefault(__webpack_require__(97218));
|
|
105722
|
-
exports["default"] = (params, uploadProgressFn, sourceToken) => {
|
|
105722
|
+
exports["default"] = (params, uploadProgressFn, sourceToken, oss) => {
|
|
105723
105723
|
const ossInstance = (data, uploadProgressFn) => {
|
|
105724
105724
|
// 创建 axios 实例
|
|
105725
105725
|
const instance = axios_1.default.create({
|
|
@@ -105732,7 +105732,6 @@ exports["default"] = (params, uploadProgressFn, sourceToken) => {
|
|
|
105732
105732
|
};
|
|
105733
105733
|
// 响应异常拦截处理器
|
|
105734
105734
|
const resErrorHandler = (error) => {
|
|
105735
|
-
console.log(error);
|
|
105736
105735
|
// Message.error(`网络超时，请稍后重试`);
|
|
105737
105736
|
// return errorHandler(error);
|
|
105738
105737
|
throw error;
|
|
@@ -105743,8 +105742,10 @@ exports["default"] = (params, uploadProgressFn, sourceToken) => {
|
|
|
105743
105742
|
config.headers['Content-Type'] = 'multipart/form-data';
|
|
105744
105743
|
// @ts-ignore
|
|
105745
105744
|
config.headers['type'] = 'application/octet-stream';
|
|
105746
|
-
|
|
105747
|
-
|
|
105745
|
+
if (!oss) {
|
|
105746
|
+
// @ts-ignore
|
|
105747
|
+
config.headers['authorization'] = `Bearer ${GetToken('token')}`;
|
|
105748
|
+
}
|
|
105748
105749
|
config.onUploadProgress = (progressEvent) => {
|
|
105749
105750
|
if (uploadProgressFn) {
|
|
105750
105751
|
// @ts-ignore
|
|
@@ -105769,7 +105770,6 @@ exports["default"] = (params, uploadProgressFn, sourceToken) => {
|
|
|
105769
105770
|
cancelToken: sourceToken.token,
|
|
105770
105771
|
}, uploadProgressFn)
|
|
105771
105772
|
.then((res) => {
|
|
105772
|
-
console.log(res);
|
|
105773
105773
|
const { status } = res;
|
|
105774
105774
|
if (status == 200) {
|
|
105775
105775
|
const { data } = res;
|