react-toolkits 2.22.0 → 2.22.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # react-toolkits
 
+## 2.22.1
+
+### Patch Changes
+
+- 41e87c2: 重构QueryList组件，优化dataAdapter配置，支持更灵活的数据处理方式。同时更新相关页面以使用新的dataAdapter结构，提升代码可读性和一致性。
+
 ## 2.22.0
 
 ### Minor Changes

package/lib/index.d.ts

@@ -331,15 +331,18 @@ interface QueryListPayload<Values = any> {
     size?: number;
     formValue?: Values;
 }
-interface QueryListRequestConfig<Values = any> {
-    url: string;
-    method?: 'GET' | 'POST';
-    body?: FormData | Record<string | number, any> | ((payload: QueryListPayload<Values>) => FormData | Record<string | number, any>);
-    params?: Record<string | number, any> | ((payload: QueryListPayload<Values>) => Record<string | number, any>);
-    headers?: Record<string, string> | ((form: FormInstance<Values>) => Record<string, string>);
+interface CacheConfig {
     cacheTime?: number;
     staleTime?: number;
 }
+interface QueryListRequestConfig extends CacheConfig {
+    url: string;
+    method?: 'GET' | 'POST';
+    body?: FormData | Record<string | number, any>;
+    searchParams?: Record<string | number, any>;
+    headers?: Record<string, string>;
+}
+type QueryListRequestConfigType<Values = any> = QueryListRequestConfig | ((payload: QueryListPayload<Values>) => QueryListRequestConfig);
 declare enum QueryListAction {
     Confirm = 0,
     Reset = 1,
@@ -351,24 +354,25 @@ 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 QueryListDataAdapter<Item extends AnyObject = AnyObject> {
+    total?: number;
+    items?: Item[];
 }
+type QueryListDataAdapterConfig<Item extends AnyObject = AnyObject, Values = AnyObject, Data = any> = QueryListDataAdapter<Item> | ((form: FormInstance<Values>, data: Data) => QueryListDataAdapter<Item>);
 interface QueryListProps<Item extends AnyObject = AnyObject, Values = AnyObject, Data = any> extends Omit<TableProps<Item>, 'pagination' | 'dataSource' | 'loading' | 'footer'>, Pick<FilterFormWrapperProps, 'buttonsAlign' | 'showReset'> {
-    identifier: string;
+    identifier?: string;
     code?: string;
     form?: FormInstance<Values>;
     refreshInterval?: number;
     onePage?: boolean;
     defaultSize?: number;
     pageSizeOptions?: number[];
-    request: QueryListRequestConfig<Values>;
+    request: QueryListRequestConfigType<Values>;
     tableExtra?: ReactNode | ((form: FormInstance<Values>, data?: Data) => ReactNode);
     renderForm?: (form: FormInstance<Values>) => ReactElement;
     afterSuccess?: (action: QueryListAction, form: FormInstance<Values>, data?: Data) => void;
     afterError?: (error: Error, action: QueryListAction, form: FormInstance<Values>) => void;
-    dataAdapter?: QueryListDataAdapter<Item, Values, Data>;
+    dataAdapter?: QueryListDataAdapterConfig<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> & {