react-toolkits 2.32.13 → 2.32.15

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # react-toolkits
 
+## 2.32.15
+
+### Patch Changes
+
+- 512207b: refactor: update useKy hook to remove UseKyOptions interface and streamline options handling
+
+## 2.32.14
+
+### Patch Changes
+
+- cf5be23: refactor: enhance GameSelect component to improve query invalidation logic
+
 ## 2.32.13
 
 ### Patch Changes

package/lib/index.d.ts

@@ -1,6 +1,6 @@
 import { ButtonProps, SelectProps, FormInstance, DrawerProps, Button, FormProps, ModalProps } from 'antd';
 import { FC, PropsWithChildren, Key, ReactNode, ReactElement, CSSProperties, Ref, DetailedHTMLProps, ImgHTMLAttributes, ComponentProps } from 'react';
-import { Options, KyInstance, Hooks } from 'ky';
+import { Options, KyInstance } from 'ky';
 import { ParagraphProps } from 'antd/es/typography/Paragraph';
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import { useLocation, PathPattern } from 'react-router';
@@ -41,11 +41,6 @@ interface KyMethods {
     }) => Promise<T>;
     instance: KyInstance;
 }
-/** useKy 配置选项 */
-interface UseKyOptions {
-    /** 自定义 hooks（拦截器），在默认 hooks 之前执行 */
-    hooks?: Partial<Hooks>;
-}
 /**
  * HTTP 客户端 Hook
  *
@@ -70,7 +65,7 @@ interface UseKyOptions {
  * })
  * ```
  */
-declare function useKy(options?: UseKyOptions): KyMethods;
+declare function useKy(options?: Options): KyMethods;
 
 interface AuthButtonProps extends ButtonProps {
     /** 权限码，支持单个或多个 */
@@ -1497,4 +1492,4 @@ declare function useAuth(code?: string | string[], config?: RequestOptions): {
 declare function useMenuList(): _tanstack_react_query.UseQueryResult<MenuListItem[], Error>;
 declare const useGames: () => _tanstack_react_query.UseQueryResult<Game[], Error>;
 
-export { APP_ID_HEADER, AuthButton, type AuthButtonProps, AuthMode, DynamicTags, type DynamicTagsProps, ExpandableParagraph, type ExpandableParagraphProps, FRONTEND_ROUTE_PREFIX, FilterFormWrapper, type FilterFormWrapperProps, type Game, type GameSelectConfig, type GameSelectProps, type HeaderExtra, type HeaderExtraConfig, Highlight, type HighlightProps, HttpResponseError, InfiniteList, type InfiniteListDataAdapter, type InfiniteListPayload, type InfiniteListProps, type InfiniteListRef, type InfiniteListRequestConfig, type InfiniteListRequestConfigType, type JsonResponse, KeepAlive, type KeepAliveCacheItem, KeepAliveOutlet, type KeepAliveOutletProps, type KeepAliveProps, KeepAliveProvider, type KeepAliveProviderProps, type KyMethods, Layout, type LayoutProps, Logo, type LogoProps, type MenuListItem, type NavItem, type NavMenuItemGroupType, type NavMenuItemType, type NavSubMenuType, type NavigationConfig, NotFound, OperationLogList, type PageParam, type Permission, QueryList, QueryListAction, type QueryListPayload, type QueryListProps, type QueryListRef, type RecursivePartial, type RequestOptions, RequireAuth, type RequireAuthProps, RequireGame, type ResponseType, type RouteMatchRule, SSO_URL, SelectAll, type SelectAllProps, type ShowFormOptions$1 as ShowFormDrawerOptions, type ShowFormOptions as ShowFormModalOptions, SignIn, ToolkitsProvider, type ToolkitsProviderProps, type UseDrawerOperation, type UseDrawerProps, type UseFormDrawerProps, type UseFormDrawerReturn, type UseFormModalProps, type UseFormModalReturn, type UseKeepAliveReturn, type UseKyOptions, type UseModalOperation, type UseModalProps, UserDropdown, type VisibilityState, WILDCARD, createVisibilityStoreConfig, generateId, _default$1 as menuRoutes, mixedStorage, _default as permissionRoutes, useAuth, useDrawer, useDrawerStore, useFormDrawer, useFormModal, useGames, useInfiniteListStore, useKeepAlive, useKeepAliveContext, useKy, useMenuList, useModal, useModalStore, useQueryListStore, useToolkitsStore };
+export { APP_ID_HEADER, AuthButton, type AuthButtonProps, AuthMode, DynamicTags, type DynamicTagsProps, ExpandableParagraph, type ExpandableParagraphProps, FRONTEND_ROUTE_PREFIX, FilterFormWrapper, type FilterFormWrapperProps, type Game, type GameSelectConfig, type GameSelectProps, type HeaderExtra, type HeaderExtraConfig, Highlight, type HighlightProps, HttpResponseError, InfiniteList, type InfiniteListDataAdapter, type InfiniteListPayload, type InfiniteListProps, type InfiniteListRef, type InfiniteListRequestConfig, type InfiniteListRequestConfigType, type JsonResponse, KeepAlive, type KeepAliveCacheItem, KeepAliveOutlet, type KeepAliveOutletProps, type KeepAliveProps, KeepAliveProvider, type KeepAliveProviderProps, type KyMethods, Layout, type LayoutProps, Logo, type LogoProps, type MenuListItem, type NavItem, type NavMenuItemGroupType, type NavMenuItemType, type NavSubMenuType, type NavigationConfig, NotFound, OperationLogList, type PageParam, type Permission, QueryList, QueryListAction, type QueryListPayload, type QueryListProps, type QueryListRef, type RecursivePartial, type RequestOptions, RequireAuth, type RequireAuthProps, RequireGame, type ResponseType, type RouteMatchRule, SSO_URL, SelectAll, type SelectAllProps, type ShowFormOptions$1 as ShowFormDrawerOptions, type ShowFormOptions as ShowFormModalOptions, SignIn, ToolkitsProvider, type ToolkitsProviderProps, type UseDrawerOperation, type UseDrawerProps, type UseFormDrawerProps, type UseFormDrawerReturn, type UseFormModalProps, type UseFormModalReturn, type UseKeepAliveReturn, type UseModalOperation, type UseModalProps, UserDropdown, type VisibilityState, WILDCARD, createVisibilityStoreConfig, generateId, _default$1 as menuRoutes, mixedStorage, _default as permissionRoutes, useAuth, useDrawer, useDrawerStore, useFormDrawer, useFormModal, useGames, useInfiniteListStore, useKeepAlive, useKeepAliveContext, useKy, useMenuList, useModal, useModalStore, useQueryListStore, useToolkitsStore };

package/lib/index.js

@@ -587,7 +587,8 @@ function useKy(options) {
     notification.error({ message: "Request failed", description: errorMessage });
     throw new HttpResponseError(errorMessage, response, data);
   };
-  const hooks = mergeHooks(options?.hooks, {
+  const { hooks: customHooks, ...kyOptions } = options || {};
+  const hooks = mergeHooks(customHooks, {
     beforeRequest: [beforeRequestHook],
     beforeError: [beforeErrorHook],
     afterResponse: [afterResponseHook]
@@ -596,17 +597,18 @@ function useKy(options) {
     prefixUrl: apiBaseUrl,
     retry: 0,
     timeout: REQUEST_TIMEOUT,
+    ...kyOptions,
     hooks
   });
   const request = async (method, url, data, opts) => {
-    const { responseType = "json", isGlobalMode: reqGlobalMode, context, ...kyOptions } = opts || {};
+    const { responseType = "json", isGlobalMode: reqGlobalMode, context, ...reqOptions } = opts || {};
     const finalContext = {
       ...context,
       responseType,
       ...reqGlobalMode !== void 0 && { isGlobalMode: reqGlobalMode }
     };
     const finalOptions = {
-      ...kyOptions,
+      ...reqOptions,
       context: finalContext
     };
     if (data !== void 0) {
@@ -4435,6 +4437,7 @@ var GameSelect = (props) => {
   const { data, isLoading } = useGames();
   const queryClient = useQueryClient();
   const keepAlive = useKeepAlive();
+  const pendingRefreshRef = useRef(false);
   const selectOptions = useMemo(() => {
     const filteredData = filter ? data?.filter((item) => filter(item)) : data;
     if (options) return options(filteredData);
@@ -4443,20 +4446,23 @@ var GameSelect = (props) => {
       value: String(useGameApiV2 ? item.game_id : item.id)
     }));
   }, [data, filter, options, useGameApiV2]);
-  const handleChange = (value) => {
-    setAppId(value);
-    keepAlive.clearCache();
+  useEffect(() => {
+    if (!pendingRefreshRef.current) return;
+    pendingRefreshRef.current = false;
     queryClient.invalidateQueries({
       predicate: (query) => !query.queryKey.includes("/api/game/list") && !query.queryKey.includes("/api/usystem/game/all")
     });
+  }, [appId, queryClient]);
+  const handleChange = (value) => {
+    pendingRefreshRef.current = true;
+    keepAlive.clearCache();
+    setAppId(value);
     onChange?.(value);
   };
   useEffect(() => {
     if (isLoading || !selectOptions) return;
     const isValid = appId && selectOptions.some((item) => String(item.value) === String(appId));
-    if (!isValid) {
-      setAppId(selectOptions[0]?.value);
-    }
+    if (!isValid) setAppId(selectOptions[0]?.value);
   }, [selectOptions, isLoading, appId, setAppId]);
   return /* @__PURE__ */ jsxs(Space, { children: [
     /* @__PURE__ */ jsx(Typography.Text, { children: t("GameSelect.label") }),