react-toolkits 2.13.24 → 2.13.26

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # react-toolkits
 
+## 2.13.26
+
+### Patch Changes
+
+- 546fd76: feat: remove isValidating
+
+## 2.13.25
+
+### Patch Changes
+
+- b7a9818: fix: some issues
+
 ## 2.13.24
 
 ### Patch Changes

package/lib/index.d.ts

@@ -7,7 +7,7 @@ import { AnyObject } from 'antd/es/_util/type';
 import { TableProps } from 'antd/es/table';
 import { AxiosHeaderValue, AxiosRequestConfig, AxiosInstance, InternalAxiosRequestConfig, AxiosResponse, AxiosInterceptorOptions } from 'axios';
 import * as swr from 'swr';
-import { MutatorCallback, MutatorOptions, SWRResponse } from 'swr';
+import { MutatorCallback, MutatorOptions, Arguments, SWRResponse } from 'swr';
 import { ItemType, SubMenuType, MenuItemGroupType, MenuItemType } from 'antd/es/menu/interface';
 import { Merge } from 'ts-essentials';
 import * as zustand from 'zustand';
@@ -43,10 +43,20 @@ interface HighlightProps extends PropsWithChildren {
 }
 declare const Highlight: (props: HighlightProps) => react_jsx_runtime.JSX.Element;
 
-interface InfiniteListRef<Item extends AnyObject = AnyObject, Values = AnyObject, Data = any> {
+interface SWRInfiniteRevalidateFn<Data = any> {
+    (data: Data, key: Arguments): boolean;
+}
+type InfiniteKeyedMutator<Data> = <MutationData = Data>(data?: Data | Promise<Data | undefined> | MutatorCallback<Data>, opts?: boolean | SWRInfiniteMutatorOptions<Data, MutationData>) => Promise<Data | MutationData | undefined>;
+interface SWRInfiniteMutatorOptions<Data = any, MutationData = Data> extends Omit<MutatorOptions<Data, MutationData>, 'revalidate'> {
+    revalidate?: boolean | SWRInfiniteRevalidateFn<Data extends unknown[] ? Data[number] : never>;
+}
+interface InfiniteListRef<Item = any, Values = any, Data = any> {
     data: Data[] | undefined;
     dataSource: Item[] | undefined;
     form: FormInstance<Values>;
+    mutate: InfiniteKeyedMutator<Data[]>;
+    size: number;
+    setSize: (size: number | ((_size: number) => number)) => Promise<Data[] | undefined>;
 }
 interface InfiniteListProps<Item, Values, Data> extends Pick<TableProps<Item>, 'columns' | 'rowKey' | 'tableLayout' | 'expandable' | 'rowSelection' | 'bordered'>, Pick<FilterFormWrapperProps, 'buttonsAlign' | 'showReset'> {
     url: string;

package/lib/index.js

@@ -623,18 +623,16 @@ function usePermission(code, config) {
   const url4 = permissionVersion !== "v1" /* V1 */ ? "/api/usystem/user/checkV2" : "/api/usystem/user/check";
   const permissionCodes = typeof code !== "undefined" ? typeof code === "string" ? [code] : code : [];
   const body = { permissions: permissionCodes };
+  const mergedConfig = {
+    ...config,
+    headers: {
+      // FIXME: 在 QueryList 内，切换游戏的时有时不会触发查询
+      [APP_ID_HEADER]: gameId,
+      ...config?.headers
+    }
+  };
   const { data, ...rest } = useSWR6(
-    permissionCodes.length > 0 ? [
-      url4,
-      body,
-      {
-        ...config,
-        headers: {
-          ...config?.headers,
-          [APP_ID_HEADER]: gameId
-        }
-      }
-    ] : null,
+    permissionCodes.length > 0 ? [url4, body, mergedConfig] : null,
     (args) => axios2.post(...args).then((response) => response.data.data)
   );
   let newData;
@@ -1354,11 +1352,11 @@ var init_QueryList = __esm({
         return serializedKey;
       }, [accessible, isValid, url4, requestConfig]);
       const { axios: axios2 } = useToolkitsStore((s) => s);
-      const { data, isLoading, isValidating } = useSWR6(
+      const { data, isLoading } = useSWR6(
         key,
         async () => {
           const response = await axios2.request(requestConfig);
-          return response.data.data;
+          return response.data;
         },
         {
           shouldRetryOnError: false,
@@ -1460,7 +1458,7 @@ var init_QueryList = __esm({
         {
           showReset,
           buttonsAlign,
-          isConfirming: isValidating,
+          isConfirming: isLoading,
           onReset,
           onConfirm,
           children: cloneElement(renderForm(_form), {
@@ -1484,7 +1482,7 @@ var init_QueryList = __esm({
           {
             ...tableProps,
             dataSource,
-            loading: isLoading || isValidating,
+            loading: isLoading,
             pagination,
             footer: renderFooter
           }
@@ -3289,8 +3287,8 @@ var InternalInfiniteList = (props, ref) => {
   } = useSWRInfinite(
     getKey,
     async (arg) => {
-      const response = await axios2({ url: arg, headers: _headers });
-      return response.data.data;
+      const response = await axios2.get(arg, { headers: _headers });
+      return response.data;
     },
     {
       shouldRetryOnError: false,
@@ -3341,7 +3339,10 @@ var InternalInfiniteList = (props, ref) => {
   useImperativeHandle(ref, () => ({
     data,
     dataSource,
-    form: _form
+    form: _form,
+    mutate: mutate2,
+    size,
+    setSize
   }));
   if (isLoading) {
     return /* @__PURE__ */ jsx(