refactor: 添加英文的异常信息
parent
21e7058a75
commit
a02a4c7e4f
|
@ -252,31 +252,21 @@ export function createAdapter(platform: AxiosPlatform): AxiosAdapter {
|
|||
}
|
||||
|
||||
function transformResult(result: AnyObject): void {
|
||||
result.status = result.status || isUndefined(result.data) ? 400 : 200;
|
||||
if (result.statusCode) {
|
||||
result.status = result.statusCode;
|
||||
delete result.statusCode;
|
||||
}
|
||||
result.status =
|
||||
result.status ?? result.statusCode ?? isUndefined(result.data)
|
||||
? 400
|
||||
: 200;
|
||||
result.statusText =
|
||||
result.status === 200
|
||||
? 'OK'
|
||||
: result.status === 400
|
||||
? 'Bad Adapter'
|
||||
: result.errMsg;
|
||||
result.headers = result.headers || result.header;
|
||||
|
||||
if (isUndefined(result.statusText)) {
|
||||
result.statusText =
|
||||
result.status === 200
|
||||
? 'OK'
|
||||
: result.status === 400
|
||||
? 'Bad Adapter'
|
||||
: '';
|
||||
}
|
||||
|
||||
result.headers = result.headers || {};
|
||||
if (result.header) {
|
||||
result.headers = result.header;
|
||||
delete result.header;
|
||||
}
|
||||
|
||||
if (result.errMsg) {
|
||||
result.statusText = result.errMsg;
|
||||
delete result.errMsg;
|
||||
}
|
||||
if (result.statusCode) delete result.statusCode;
|
||||
if (result.errMsg) delete result.errMsg;
|
||||
if (result.header) delete result.header;
|
||||
}
|
||||
|
||||
function transformOptions(
|
||||
|
|
|
@ -60,13 +60,10 @@ export function request<TData = unknown>(
|
|||
const response = _ as AxiosResponse<TData>;
|
||||
response.config = config;
|
||||
response.request = adapterTask;
|
||||
if (
|
||||
!isFunction(config.validateStatus) ||
|
||||
config.validateStatus(response.status)
|
||||
) {
|
||||
if (config.validateStatus?.(response.status) ?? true) {
|
||||
resolve(response);
|
||||
} else {
|
||||
catchError('请求失败', response);
|
||||
catchError('validate status fail', response);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -75,7 +72,7 @@ export function request<TData = unknown>(
|
|||
responseError.isFail = true;
|
||||
responseError.config = config;
|
||||
responseError.request = adapterTask;
|
||||
catchError('网络错误', responseError);
|
||||
catchError(responseError.statusText, responseError);
|
||||
}
|
||||
|
||||
function catchError(
|
||||
|
@ -95,9 +92,7 @@ export function request<TData = unknown>(
|
|||
if (isPlainObject(adapterTask)) {
|
||||
tryToggleProgressUpdate(adapterConfig, adapterTask.offProgressUpdate);
|
||||
|
||||
if (isFunction(adapterTask.abort)) {
|
||||
adapterTask.abort();
|
||||
}
|
||||
adapterTask?.abort?.();
|
||||
}
|
||||
|
||||
reject(reason);
|
||||
|
|
|
@ -65,6 +65,6 @@ describe('src/core/request.ts', () => {
|
|||
url: '/test',
|
||||
method: 'get',
|
||||
}),
|
||||
).rejects.toThrowErrorMatchingInlineSnapshot('"网络错误"');
|
||||
).rejects.toThrowErrorMatchingInlineSnapshot('"FAIL"');
|
||||
});
|
||||
});
|
||||
|
|
Loading…
Reference in New Issue