blackteay/fes.js
1
0
Fork 0
mirror of https://github.com/WeBankFinTech/fes.js.git synced 2025-04-06 03:59:53 +08:00
Code Issues Projects Releases Wiki Activity

fix: 优化 rawRequest

Browse Source
This commit is contained in:
winixt 2024-01-18 17:04:07 +08:00
parent ffb34170b9
commit f589d133d2
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
packages/fes-plugin-request/src/template/request.js
View File

@ -106,20 +106,30 @@ function getCustomerHandler(ctx, options = {}) {
}; };
} }
export const request = (url, data, options = {}) => { function formatOptions(options = {}) {
if (typeof options === 'string') { if (typeof options === 'string') {
options = { options = {
method: options, method: options,
}; };
} }
return options;
}
function getReqInstance() {
if (!currentRequestInstance) { if (!currentRequestInstance) {
currentRequestInstance = getRequestInstance(); currentRequestInstance = getRequestInstance();
} }
return currentRequestInstance;
}
const _request = (url, data, options, onSuccess) => {
options = formatOptions(options);
const reqInstance = getReqInstance();
const userConfig = userConfigHandler(url, data, options); const userConfig = userConfigHandler(url, data, options);
const context = createContext(userConfig); const context = createContext(userConfig);
const { dataHandler, errorHandler } = getCustomerHandler(context, options); const { dataHandler, errorHandler } = getCustomerHandler(context, options);
return currentRequestInstance.request(context).then(async () => { return reqInstance.request(context).then(async () => {
if (context.config.skipErrorHandler) { if (context.config.skipErrorHandler) {
console.warn('3.x 已移除 skipErrorHandler 参数，请改用 dataHandler 处理'); console.warn('3.x 已移除 skipErrorHandler 参数，请改用 dataHandler 处理');
if ( if (
@ -130,6 +140,9 @@ export const request = (url, data, options = {}) => {
} }
} }
if (!context.error) { if (!context.error) {
if (onSuccess) {
return onSuccess(dataHandler(context.response.data, context.response), context);
}
return dataHandler(context.response.data, context.response); return dataHandler(context.response.data, context.response);
} }
errorHandler && errorHandler(context.error); errorHandler && errorHandler(context.error);
@ -137,7 +150,14 @@ export const request = (url, data, options = {}) => {
}); });
}; };
export const rawRequest = request; export const request = _request;
export const rawRequest = (url, data, options) =>
_request(url, data, options, (d, ctx) => {
ctx.response.rawData = ctx.response.data;
ctx.response.data = d;
return ctx.response;
});
function isPromiseLike(obj) { function isPromiseLike(obj) {
return !!obj && typeof obj === 'object' && typeof obj.then === 'function'; return !!obj && typeof obj === 'object' && typeof obj.then === 'function';