xinyin025/soybean-admin
1
0
Fork 0
mirror of https://github.com/soybeanjs/soybean-admin.git synced 2025-09-23 03:56:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor(request)!: remove cancelRequest method and related logic from request instances

Browse Source
This commit is contained in:
Soybean 2025-07-19 02:24:14 +08:00
parent 50a5cba088
commit b4e125300e
3 changed files with 2 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
packages/axios/src/index.ts
View File

@ -81,14 +81,6 @@ function createCommonRequest<
} }
); );
function cancelRequest(requestId: string) {
const abortController = abortControllerMap.get(requestId);
if (abortController) {
abortController.abort();
abortControllerMap.delete(requestId);
}
}
function cancelAllRequest() { function cancelAllRequest() {
abortControllerMap.forEach(abortController => { abortControllerMap.forEach(abortController => {
abortController.abort(); abortController.abort();
@ -99,7 +91,6 @@ function createCommonRequest<
return { return {
instance, instance,
opts, opts,
cancelRequest,
cancelAllRequest cancelAllRequest
}; };
} }
@ -114,10 +105,7 @@ export function createRequest<ResponseData, ApiData, State extends Record<string
axiosConfig?: CreateAxiosDefaults, axiosConfig?: CreateAxiosDefaults,
options?: Partial<RequestOption<ResponseData, ApiData, State>> options?: Partial<RequestOption<ResponseData, ApiData, State>>
) { ) {
const { instance, opts, cancelRequest, cancelAllRequest } = createCommonRequest<ResponseData, ApiData, State>( const { instance, opts, cancelAllRequest } = createCommonRequest<ResponseData, ApiData, State>(axiosConfig, options);
axiosConfig,
options
);
const request: RequestInstance<ApiData, State> = async function request< const request: RequestInstance<ApiData, State> = async function request<
T extends ApiData = ApiData, T extends ApiData = ApiData,
@ -134,7 +122,6 @@ export function createRequest<ResponseData, ApiData, State extends Record<string
return response.data as MappedType<R, T>; return response.data as MappedType<R, T>;
} as RequestInstance<ApiData, State>; } as RequestInstance<ApiData, State>;
request.cancelRequest = cancelRequest;
request.cancelAllRequest = cancelAllRequest; request.cancelAllRequest = cancelAllRequest;
request.state = {} as State; request.state = {} as State;
@ -153,10 +140,7 @@ export function createFlatRequest<ResponseData, ApiData, State extends Record<st
axiosConfig?: CreateAxiosDefaults, axiosConfig?: CreateAxiosDefaults,
options?: Partial<RequestOption<ResponseData, ApiData, State>> options?: Partial<RequestOption<ResponseData, ApiData, State>>
) { ) {
const { instance, opts, cancelRequest, cancelAllRequest } = createCommonRequest<ResponseData, ApiData, State>( const { instance, opts, cancelAllRequest } = createCommonRequest<ResponseData, ApiData, State>(axiosConfig, options);
axiosConfig,
options
);
const flatRequest: FlatRequestInstance<ResponseData, ApiData, State> = async function flatRequest< const flatRequest: FlatRequestInstance<ResponseData, ApiData, State> = async function flatRequest<
T extends ApiData = ApiData, T extends ApiData = ApiData,
@ -179,7 +163,6 @@ export function createFlatRequest<ResponseData, ApiData, State extends Record<st
} }
} as FlatRequestInstance<ResponseData, ApiData, State>; } as FlatRequestInstance<ResponseData, ApiData, State>;
flatRequest.cancelRequest = cancelRequest;
flatRequest.cancelAllRequest = cancelAllRequest; flatRequest.cancelAllRequest = cancelAllRequest;
flatRequest.state = { flatRequest.state = {
...opts.defaultState ...opts.defaultState

8
packages/axios/src/type.ts
View File

@ -79,14 +79,6 @@ export type CustomAxiosRequestConfig<R extends ResponseType = 'json'> = Omit<Axi
}; };
export interface RequestInstanceCommon<State extends Record<string, unknown>> { export interface RequestInstanceCommon<State extends Record<string, unknown>> {
/**
* cancel the request by request id
*
* if the request provide abort controller sign from config, it will not collect in the abort controller map
*
* @param requestId
*/
cancelRequest: (requestId: string) => void;
/** /**
* cancel all request * cancel all request
* *

1
packages/hooks/src/use-request.ts
View File

@ -73,7 +73,6 @@ export default function createHookRequest<ResponseData, ApiData, State extends R
}; };
} as HookRequestInstance<ResponseData, ApiData, State>; } as HookRequestInstance<ResponseData, ApiData, State>;
hookRequest.cancelRequest = request.cancelRequest;
hookRequest.cancelAllRequest = request.cancelAllRequest; hookRequest.cancelAllRequest = request.cancelAllRequest;
return hookRequest; return hookRequest;