optimize(projects): optimize type

soybeanjs · Sep 8, 2024 · 4679b17 · 4679b17
1 parent 01d962a
commit 4679b17
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/typings/antd.d.ts b/src/typings/antd.d.ts
@@ -19,7 +19,7 @@ declare namespace AntDesign {
 
   type TableColumn<T> = SetTableColumnKey<TableColumnType<T>, T> | SetTableColumnKey<TableColumnGroupType<T>, T>;
 
-  type TableApiFn<T = any, R = Api.SystemManage.CommonSearchParams> = (
+  type TableApiFn<T = any, R = Api.Common.CommonSearchParams> = (
     params: R
   ) => Promise<FlatResponseData<Api.Common.PaginatingQueryRecord<T>>>;
 

diff --git a/src/typings/api.d.ts b/src/typings/api.d.ts
@@ -20,6 +20,9 @@ declare namespace Api {
       records: T[];
     }
 
+    /** common search params of table */
+    type CommonSearchParams = Pick<Common.PaginatingCommonParams, 'current' | 'size'>;
+
     /**
      * enable status
      *
@@ -88,8 +91,6 @@ declare namespace Api {
    * backend api module: "systemManage"
    */
   namespace SystemManage {
-    type CommonSearchParams = Pick<Common.PaginatingCommonParams, 'current' | 'size'>;
-
     /** role */
     type Role = Common.CommonRecord<{
       /** role name */
@@ -102,7 +103,7 @@ declare namespace Api {
 
     /** role search params */
     type RoleSearchParams = Partial<
-      Pick<Api.SystemManage.Role, 'roleName' | 'roleCode' | 'status'> & CommonSearchParams
+      Pick<Api.SystemManage.Role, 'roleName' | 'roleCode' | 'status'> & Common.CommonSearchParams
     >;
 
     /** role list */
@@ -138,7 +139,7 @@ declare namespace Api {
     /** user search params */
     type UserSearchParams = Partial<
       Pick<Api.SystemManage.User, 'userName' | 'userGender' | 'nickName' | 'userPhone' | 'userEmail' | 'status'> &
-        CommonSearchParams
+        Common.CommonSearchParams
     >;
 
     /** user list */