fix: usePagination/useAntdTable/useFusionTable params ts error

alibaba · Dec 16, 2021 · 136c79f · 136c79f
1 parent 28f9912
commit 136c79f
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 17 deletions.
diff --git a/packages/hooks/src/useAntdTable/index.tsx b/packages/hooks/src/useAntdTable/index.tsx
@@ -1,8 +1,15 @@
 import { useEffect, useRef, useState } from 'react';
 import { useMemoizedFn, usePagination, useUpdateEffect } from '..';
-import type { Antd4ValidateFields, AntdTableOptions, Data, Params, Service } from './types';
-
-const useAntdTable = <TData extends Data, TParams extends any[] = Params>(
+import type {
+  Antd4ValidateFields,
+  AntdTableOptions,
+  Data,
+  Params,
+  Service,
+  AntdTableResult,
+} from './types';
+
+const useAntdTable = <TData extends Data, TParams extends Params>(
   service: Service<TData, TParams>,
   options: AntdTableOptions<TData, TParams> = {},
 ) => {
@@ -119,6 +126,7 @@ const useAntdTable = <TData extends Data, TParams extends any[] = Params>(
             current: 1,
           };
           if (!form) {
+            // @ts-ignore
             run(pagination);
             return;
           }
@@ -129,6 +137,7 @@ const useAntdTable = <TData extends Data, TParams extends any[] = Params>(
             ...values,
           };
 
+          // @ts-ignore
           run(pagination, values, {
             allFormData: allFormDataRef.current,
             type,
@@ -152,6 +161,7 @@ const useAntdTable = <TData extends Data, TParams extends any[] = Params>(
 
   const onTableChange = (pagination: any, filters: any, sorter: any) => {
     const [oldPaginationParams, ...restParams] = params || [];
+    // @ts-ignore
     run(
       {
         ...oldPaginationParams,
@@ -170,6 +180,7 @@ const useAntdTable = <TData extends Data, TParams extends any[] = Params>(
     if (params.length > 0) {
       allFormDataRef.current = cacheFormTableData?.allFormData || {};
       restoreForm();
+      // @ts-ignore
       run(...params);
       return;
     }
@@ -232,7 +243,7 @@ const useAntdTable = <TData extends Data, TParams extends any[] = Params>(
       changeType: useMemoizedFn(changeType),
       reset: useMemoizedFn(reset),
     },
-  };
+  } as AntdTableResult<TData, TParams>;
 };
 
 export default useAntdTable;
diff --git a/packages/hooks/src/useAntdTable/types.ts b/packages/hooks/src/useAntdTable/types.ts
@@ -13,7 +13,7 @@ export type Params = [
   ...any[]
 ];
 
-export type Service<TData extends Data, TParams extends any[]> = (
+export type Service<TData extends Data, TParams extends Params> = (
   ...args: TParams
 ) => Promise<TData>;
 
@@ -33,7 +33,7 @@ export interface AntdFormUtils {
   [key: string]: any;
 }
 
-export interface AntdTableResult<TData extends Data, TParams extends any[]>
+export interface AntdTableResult<TData extends Data, TParams extends Params>
   extends PaginationResult<TData, TParams> {
   tableProps: {
     dataSource: any[];
@@ -50,7 +50,7 @@ export interface AntdTableResult<TData extends Data, TParams extends any[]>
   };
 }
 
-export interface AntdTableOptions<TData extends Data, TParams extends any[]>
+export interface AntdTableOptions<TData extends Data, TParams extends Params>
   extends PaginationOptions<TData, TParams> {
   form?: AntdFormUtils;
   defaultType?: 'simple' | 'advance';

diff --git a/packages/hooks/src/useFusionTable/index.tsx b/packages/hooks/src/useFusionTable/index.tsx
@@ -3,7 +3,7 @@ import type { Data, Params, Service } from '../useAntdTable/types';
 import { fieldAdapter, resultAdapter } from './fusionAdapter';
 import type { FusionTableOptions, FusionTableResult } from './types';
 
-const useFusionTable = <TData extends Data, TParams extends any[] = Params>(
+const useFusionTable = <TData extends Data, TParams extends Params>(
   service: Service<TData, TParams>,
   options: FusionTableOptions<TData, TParams> = {},
 ): FusionTableResult<TData, TParams> => {

diff --git a/packages/hooks/src/useFusionTable/types.ts b/packages/hooks/src/useFusionTable/types.ts
@@ -1,4 +1,4 @@
-import type { AntdTableOptions, AntdTableResult, Data } from '../useAntdTable/types';
+import type { AntdTableOptions, AntdTableResult, Data, Params } from '../useAntdTable/types';
 
 export interface Field {
   getFieldInstance?: (name: string) => {};
@@ -9,7 +9,7 @@ export interface Field {
   [key: string]: any;
 }
 
-export interface FusionTableResult<TData extends Data, TParams extends any[]>
+export interface FusionTableResult<TData extends Data, TParams extends Params>
   extends Omit<AntdTableResult<TData, TParams>, 'tableProps'> {
   paginationProps: {
     onChange: (current: number) => void;
@@ -32,7 +32,7 @@ export interface FusionTableResult<TData extends Data, TParams extends any[]>
   };
 }
 
-export interface FusionTableOptions<TData extends Data, TParams extends any[]>
+export interface FusionTableOptions<TData extends Data, TParams extends Params>
   extends Omit<AntdTableOptions<TData, TParams>, 'form'> {
   field?: Field;
 }
diff --git a/packages/hooks/src/usePagination/index.ts b/packages/hooks/src/usePagination/index.ts
@@ -1,8 +1,8 @@
 import { useMemo } from 'react';
 import { useMemoizedFn, useRequest } from '..';
-import type { Data, PaginationOptions, Params, Service } from './types';
+import type { Data, PaginationOptions, Params, Service, PaginationResult } from './types';
 
-const usePagination = <TData extends Data, TParams extends any[] = Params>(
+const usePagination = <TData extends Data, TParams extends Params>(
   service: Service<TData, TParams>,
   options: PaginationOptions<TData, TParams> = {},
 ) => {
@@ -61,7 +61,7 @@ const usePagination = <TData extends Data, TParams extends any[] = Params>(
       changeCurrent: useMemoizedFn(changeCurrent),
       changePageSize: useMemoizedFn(changePageSize),
     },
-  };
+  } as PaginationResult<TData, TParams>;
 };
 
 export default usePagination;
diff --git a/packages/hooks/src/usePagination/types.ts b/packages/hooks/src/usePagination/types.ts
@@ -4,11 +4,11 @@ export type Data = { total: number; list: any[] };
 
 export type Params = [{ current: number; pageSize: number; [key: string]: any }, ...any[]];
 
-export type Service<TData extends Data, TParams extends any[]> = (
+export type Service<TData extends Data, TParams extends Params> = (
   ...args: TParams
 ) => Promise<TData>;
 
-export interface PaginationResult<TData extends Data, TParams extends any[]>
+export interface PaginationResult<TData extends Data, TParams extends Params>
   extends Result<TData, TParams> {
   pagination: {
     current: number;
@@ -21,7 +21,7 @@ export interface PaginationResult<TData extends Data, TParams extends any[]>
   };
 }
 
-export interface PaginationOptions<TData extends Data, TParams extends any[]>
+export interface PaginationOptions<TData extends Data, TParams extends Params>
   extends Options<TData, TParams> {
   defaultPageSize?: number;
 }