* core: add this argument to fetcher callback.

easysoft · Aug 31, 2024 · 9998568 · 9998568
1 parent e9c75cf
commit 9998568
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/core/src/ajax/fetcher.ts b/lib/core/src/ajax/fetcher.ts
@@ -3,14 +3,14 @@ import {$} from '../cash';
 import {Ajax} from './ajax';
 import type {AjaxSetting, FetcherSetting} from './types';
 
-export async function fetchData<T = {}, A extends unknown[] = unknown[]>(setting: FetcherSetting<T, A>, args: A = ([] as unknown as A), extraAjaxSetting?: Partial<AjaxSetting> | ((ajaxSetting: AjaxSetting) => Partial<AjaxSetting>)): Promise<T> {
+export async function fetchData<T = {}, A extends unknown[] = unknown[], THIS = unknown>(setting: FetcherSetting<T, A, THIS>, args: A = ([] as unknown as A), extraAjaxSetting?: Partial<AjaxSetting> | ((ajaxSetting: AjaxSetting) => Partial<AjaxSetting>), thisObj?: THIS): Promise<T> {
     const ajaxSetting = {throws: true, dataType: 'json'} as AjaxSetting;
     if (typeof setting === 'string') {
         ajaxSetting.url = formatString(setting, ...args);
     } else if (typeof setting === 'object') {
         $.extend(ajaxSetting, setting);
     } else if (typeof setting === 'function') {
-        const result = setting(...args);
+        const result = setting.call(thisObj as THIS, ...args);
         if (result instanceof Promise) {
             const data = await result;
             return data;

diff --git a/lib/core/src/ajax/types.ts b/lib/core/src/ajax/types.ts
@@ -43,6 +43,6 @@ export type FetcherUrl = string;
 
 export type FetcherInit = AjaxSetting;
 
-export type FetcherFn<T = {}, A extends unknown[] = unknown[]> = (...args: A) => Promise<T> | T;
+export type FetcherFn<T = {}, A extends unknown[] = unknown[], THIS = unknown> = (this: THIS, ...args: A) => Promise<T> | T;
 
-export type FetcherSetting<T = {}, A extends unknown[] = unknown[]> = FetcherUrl | FetcherInit | FetcherFn<T, A>;
+export type FetcherSetting<T = {}, A extends unknown[] = unknown[], THIS = unknown> = FetcherUrl | FetcherInit | FetcherFn<T, A, THIS>;