react-toolkits 2.20.0 → 2.21.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # react-toolkits
 
+## 2.21.0
+
+### Minor Changes
+
+- 01b6652: 重构InfiniteList和QueryList组件，采用dataAdapter模式优化数据源处理逻辑，提升代码可读性和一致性。同时更新相关页面以使用新的dataAdapter配置。
+
 ## 2.20.0
 
 ### Minor Changes

package/lib/index.d.ts

@@ -136,6 +136,11 @@ declare enum InfiniteListAction {
     LoadMore = 2,
     Init = 3
 }
+interface InfiniteListDataAdapter<Item = any, Values = any, Data = any> {
+    items?: (data: Data[] | undefined, form: FormInstance<Values>) => Item[] | undefined;
+    hasMore?: (lastPage: Data | undefined, allPages: Data[]) => boolean;
+    nextPageParam?: (lastPage: Data | undefined, allPages: Data[], pageParam: any) => any;
+}
 interface InfiniteListRef<Item = any, Values = any, Data = any> {
     data: Data[] | undefined;
     dataSource: Item[] | undefined;
@@ -155,9 +160,7 @@ interface InfiniteListProps<Item, Values, Data> extends Pick<TableProps<Item>, '
     renderForm?: (form: FormInstance<Values>) => ReactElement;
     afterSuccess?: (action: InfiniteListAction, form: FormInstance<Values>, data?: Data[]) => void;
     afterError?: (error: Error, action: InfiniteListAction, form: FormInstance<Values>) => void;
-    getDataSource?: (data: Data[] | undefined, form: FormInstance<Values>) => Item[] | undefined;
-    getHasMore?: (lastPage: Data | undefined, allPages: Data[]) => boolean;
-    getNextPageParam?: (lastPage: Data | undefined, allPages: Data[], pageParam: any) => any;
+    dataAdapter?: InfiniteListDataAdapter<Item, Values, Data>;
     initialPageParam?: any;
     footer?: (data: Data[] | undefined) => ReactNode;
 }
@@ -348,6 +351,10 @@ interface QueryListRef<Item extends AnyObject = AnyObject, Values = AnyObject, D
     dataSource: Item[] | undefined;
     form: FormInstance<Values>;
 }
+interface QueryListDataAdapter<Item extends AnyObject = AnyObject, Values = AnyObject, Data = any> {
+    total?: (data: Data | undefined) => number | undefined;
+    items?: (data: Data | undefined, form: FormInstance<Values>) => Item[] | undefined;
+}
 interface QueryListProps<Item extends AnyObject = AnyObject, Values = AnyObject, Data = any> extends Omit<TableProps<Item>, 'pagination' | 'dataSource' | 'loading' | 'footer'>, Pick<FilterFormWrapperProps, 'buttonsAlign' | 'showReset'> {
     identifier: string;
     code?: string;
@@ -361,8 +368,7 @@ interface QueryListProps<Item extends AnyObject = AnyObject, Values = AnyObject,
     renderForm?: (form: FormInstance<Values>) => ReactElement;
     afterSuccess?: (action: QueryListAction, form: FormInstance<Values>, data?: Data) => void;
     afterError?: (error: Error, action: QueryListAction, form: FormInstance<Values>) => void;
-    getTotal?: (data: Data | undefined) => number | undefined;
-    getDataSource?: (data: Data | undefined, form: FormInstance<Values>) => Item[] | undefined;
+    dataAdapter?: QueryListDataAdapter<Item, Values, Data>;
     footer?: (data: Data | undefined) => ReactNode;
 }
 declare const QueryList: <Item extends AnyObject = AnyObject, Values extends object | undefined = undefined, Data = any>(props: QueryListProps<Item, Values, Data> & {