react-toolkits 2.9.11 → 2.9.13

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # react-toolkits
 
+## 2.9.13
+
+### Patch Changes
+
+- 7d51c81: feat: remove 'isGlobal' flag
+
+## 2.9.12
+
+### Patch Changes
+
+- 9af5cfe: fix: not match the game
+
 ## 2.9.11
 
 ### Patch Changes

package/lib/index.d.ts

@@ -26,7 +26,6 @@ interface RequestOptions extends Omit<RequestInit, 'body'> {
     body?: Record<string | number, any> | FormData | null;
     params?: Record<string | number, any> | URLSearchParams | null;
     responseType?: 'json' | 'blob' | 'text';
-    isGlobal?: boolean;
 }
 type RequestResponse<T> = Pick<Response, 'headers' | 'status' | 'statusText' | 'url'> & {
     data: T;
@@ -222,14 +221,6 @@ interface Game {
     is_new_game: 0 | 1;
     server_type: string;
 }
-interface GameState {
-    initialized: boolean;
-    game: Game | null;
-    games: Game[];
-    isLoading: boolean;
-    setGame: (id: string | number) => Promise<void>;
-    refetchGames: (apiV2?: boolean) => Promise<void>;
-}
 
 interface GameSelectProps {
     apiV2?: boolean;
@@ -270,6 +261,13 @@ declare const useLayoutStore: zustand.UseBoundStore<Omit<zustand.StoreApi<Layout
         getOptions: () => Partial<zustand_middleware.PersistOptions<LayoutState, unknown>>;
     };
 }>;
+interface GameState {
+    initialized: boolean;
+    game: Game | null;
+    games: Game[];
+    isLoading: boolean;
+    refetchGames: (apiV2?: boolean) => Promise<void>;
+}
 declare const useGameStore: zustand.UseBoundStore<Omit<zustand.StoreApi<GameState>, "persist"> & {
     persist: {
         setOptions: (options: Partial<zustand_middleware.PersistOptions<GameState, unknown>>) => void;
@@ -397,12 +395,12 @@ declare function useFormModal<Values extends AnyObject = AnyObject, ExtraValues
     modal: react_jsx_runtime.JSX.Element;
 };
 
-declare function usePermissions(codes: string[], isGlobal?: boolean): {
+declare function usePermissions(codes: string[], options?: Omit<RequestOptions, 'method' | 'body'>): {
     data: Record<string, boolean> | undefined;
     isValidating: boolean;
     isLoading: boolean;
 };
-declare function usePermission(code: string | undefined, isGlobal?: boolean): {
+declare function usePermission(code: string | undefined, options?: Omit<RequestOptions, 'method' | 'body'>): {
     accessible: boolean;
     isValidating: boolean;
     isLoading: boolean;
@@ -456,4 +454,4 @@ declare const SignIn: FC<SignInProps>;
 
 declare const mixedStorage: StateStorage;
 
-export { ContextProvider, type ContextState, DynamicTags, type DynamicTagsProps, ExpandableParagraph, type ExpandableParagraphProps, FilterFormWrapper, type FilterFormWrapperProps, type Game, type GameState, Highlight, type HighlightProps, InfiniteList, type InfiniteListProps, Layout, type LayoutState, NavMenu, type NavMenuItem, NotFound, OperationLogList, PermissionButton, type PermissionButtonProps, QueryList, QueryListAction, type QueryListProps, type QueryListRef, RequestError, type RequestOptions, type RequestResponse, RequirePermission, type RequirePermissionProps, SignIn, type TokenState, type UseFormModalProps, type UseModalOperation, type UseModalProps, UserWidget, type UserWidgetProps, contextStore, mixedStorage, _default as permissionRoutes, request, useFormModal, useGameStore, useLayoutStore, useModal, useModalStore, usePermission, usePermissions, useQueryListStore, useTokenStore, useTokenValidation, useToolkitsContext };
+export { ContextProvider, type ContextState, DynamicTags, type DynamicTagsProps, ExpandableParagraph, type ExpandableParagraphProps, FilterFormWrapper, type FilterFormWrapperProps, type Game, Highlight, type HighlightProps, InfiniteList, type InfiniteListProps, Layout, type LayoutState, NavMenu, type NavMenuItem, NotFound, OperationLogList, PermissionButton, type PermissionButtonProps, QueryList, QueryListAction, type QueryListProps, type QueryListRef, RequestError, type RequestOptions, type RequestResponse, RequirePermission, type RequirePermissionProps, SignIn, type TokenState, type UseFormModalProps, type UseModalOperation, type UseModalProps, UserWidget, type UserWidgetProps, contextStore, mixedStorage, _default as permissionRoutes, request, useFormModal, useGameStore, useLayoutStore, useModal, useModalStore, usePermission, usePermissions, useQueryListStore, useTokenStore, useTokenValidation, useToolkitsContext };

package/lib/index.js

@@ -389,7 +389,7 @@ var init_NavMenu = __esm({
       const location = useLocation();
       const flattenItems = useMemo(() => flatItems(items ?? []), [items]);
       const codes = useMemo(() => flattenItems.map((item) => item.code).filter(Boolean), [flattenItems]);
-      const { data: permissions, isLoading } = usePermissions(codes, true);
+      const { data: permissions, isLoading } = usePermissions(codes, { headers: { "App-ID": "global" } });
       const internalItems = useMemo(() => transformItems(items ?? [], permissions), [items, permissions]);
       const { openKeys, selectedKeys, setOpenKeys, setSelectedKeys } = useNavStore();
       const onOpenChange = useCallback(
@@ -447,7 +447,7 @@ function useTokenValidation(options) {
       body: {
         permissions: ["100001"]
       },
-      isGlobal: true
+      headers: { "App-ID": "global" }
     })
   );
 }
@@ -586,16 +586,6 @@ var init_stores2 = __esm({
           isLoading: false,
           game: null,
           games: [],
-          async setGame(id2) {
-            if (id2 === get2().game?.game_id) {
-              return;
-            }
-            if (!get2().initialized) {
-              await get2().refetchGames();
-            }
-            const game = (get2().games ?? []).find((item) => item.game_id === id2) ?? null;
-            set({ game });
-          },
           async refetchGames(apiV2) {
             if (!get2().isLoading) {
               try {
@@ -634,7 +624,7 @@ var init_GameSelect = __esm({
     GameSelect = (props) => {
       const { apiV2, filter, onGameChange } = props;
       const { t } = useTranslation();
-      const { game, games, isLoading, refetchGames, setGame } = useGameStore();
+      const { game, games, isLoading, refetchGames } = useGameStore();
       useEffect(() => {
         refetchGames(apiV2);
       }, []);
@@ -643,8 +633,9 @@ var init_GameSelect = __esm({
         value: apiV2 ? item.game_id : item.id
       }));
       const onChange = async (id2) => {
-        setGame(id2);
-        onGameChange?.(games.find((item) => String(apiV2 ? item.game_id : item.id) === String(id2)));
+        const match = games.find((item) => String(apiV2 ? item.game_id : item.id) === String(id2));
+        useGameStore.setState({ game: match });
+        onGameChange?.(match);
       };
       return /* @__PURE__ */ jsxs(Space, { children: [
         /* @__PURE__ */ jsx(Text, { children: t("GameSelect.label") }),
@@ -836,7 +827,7 @@ var init_layout = __esm({
 });
 async function request(url, opts = {}) {
   const _opts = Object.assign(opts, { responseType: opts.responseType ?? "json" });
-  const { body, params, responseType, isGlobal, ...rest } = _opts;
+  const { body, params, responseType, ...rest } = _opts;
   if (!url) {
     throw new RequestError({
       status: 400,
@@ -858,14 +849,10 @@ async function request(url, opts = {}) {
   if (token) {
     headers.set("Authorization", `Bearer ${token}`);
   }
-  if (contextStore.getState().usePermissionApiV2) {
-    if (isGlobal) {
-      headers.set("App-ID", "global");
-    } else {
-      const game = useGameStore.getState().game;
-      if (game) {
-        headers.set("App-ID", String(game.game_id));
-      }
+  if (!headers.has("App-ID") && contextStore.getState().usePermissionApiV2) {
+    const game = useGameStore.getState().game;
+    if (game) {
+      headers.set("App-ID", String(game.game_id ?? game.id));
     }
   }
   if (responseType === "blob") {
@@ -929,16 +916,16 @@ var init_request = __esm({
     };
   }
 });
-function usePermissions(codes, isGlobal) {
+function usePermissions(codes, options) {
   const usePermissionApiV2 = useToolkitsContext((state) => state.usePermissionApiV2);
   const { data, isValidating, isLoading } = useSWR3(
     codes.length > 0 ? [usePermissionApiV2 ? "/api/usystem/user/checkV2" : "/api/usystem/user/check", codes] : null,
     ([url]) => request(url, {
+      ...options,
       method: "POST",
       body: {
         permissions: codes
-      },
-      isGlobal
+      }
     }).then((response) => {
       if (response.data?.has_all) {
         return codes.reduce(
@@ -963,8 +950,8 @@ function usePermissions(codes, isGlobal) {
   );
   return { data, isValidating, isLoading };
 }
-function usePermission(code, isGlobal) {
-  const { data, isValidating, isLoading } = usePermissions(code ? [code] : [], isGlobal);
+function usePermission(code, options) {
+  const { data, isValidating, isLoading } = usePermissions(code ? [code] : [], options);
   if (code === void 0) {
     return {
       accessible: true,
@@ -987,11 +974,11 @@ var init_permission = __esm({
 var PermissionButton, PermissionButton_default;
 var init_PermissionButton = __esm({
   "src/components/permissionButton/PermissionButton.tsx"() {
-    init_locale();
     init_permission();
+    init_locale();
     PermissionButton = (props) => {
       const { children, code, showLoading, isGlobal, disabled, ...restProps } = props;
-      const { data, isLoading } = usePermissions(Array.isArray(code) ? code : [code], isGlobal);
+      const { data, isLoading } = usePermissions(Array.isArray(code) ? code : [code], { headers: { "App-ID": "global" } });
       const { t } = useTranslation();
       if (isLoading) {
         return /* @__PURE__ */ jsx(Button, { loading: showLoading, disabled: !showLoading, ...restProps, children });
@@ -1091,7 +1078,9 @@ var init_QueryList = __esm({
       const { notification } = App.useApp();
       const { t } = useTranslation();
       const [_form] = Form.useForm(form);
-      const { accessible, isLoading } = usePermission(code, isGlobal);
+      const { accessible, isLoading } = usePermission(code, {
+        headers: isGlobal ? { "App-ID": "global" } : void 0
+      });
       const action = useRef(3 /* Init */);
       const { game } = useGameStore();
       const usePermissionApiV2 = useToolkitsContext((state) => state.usePermissionApiV2);
@@ -1386,27 +1375,27 @@ var init_formModal = __esm({
 function useAllPermissions() {
   return useSWR3(
     "/api/usystem/user/allPermssions",
-    (url) => request(url, { isGlobal: true }).then((response) => response.data)
+    (url) => request(url, { headers: { "App-ID": "global" } }).then((response) => response.data)
   );
 }
 function useAllPermissionsV2() {
   return useSWR3(
     "/api/usystem/user/allPermissionsV2",
-    (url) => request(url, { isGlobal: true }).then((response) => response.data)
+    (url) => request(url, { headers: { "App-ID": "global" } }).then((response) => response.data)
   );
 }
 function useAllRoles() {
-  const { accessible } = usePermission("200005", true);
+  const { accessible } = usePermission("200005", { headers: { "App-ID": "global" } });
   return useSWR3(
     accessible ? "/api/usystem/role/all" : null,
-    (url) => request(url, { isGlobal: true }).then((response) => response.data)
+    (url) => request(url, { headers: { "App-ID": "global" } }).then((response) => response.data)
   );
 }
 function useRole(name) {
   const usePermissionApiV2 = useToolkitsContext((state) => state.usePermissionApiV2);
   return useSWR3(
     `/api/usystem/role/${usePermissionApiV2 ? "infoV2" : "info"}?name=${name}`,
-    (url) => request(url, { isGlobal: true }).then((response) => response.data)
+    (url) => request(url, { headers: { "App-ID": "global" } }).then((response) => response.data)
   );
 }
 function useCreateRole() {
@@ -1418,7 +1407,7 @@ function useCreateRole() {
     }) => request(url, {
       method: "post",
       body: arg,
-      isGlobal: true
+      headers: { "App-ID": "global" }
     })
   );
 }
@@ -1431,7 +1420,7 @@ function useUpdateRole() {
     }) => request(url, {
       method: "post",
       body: arg,
-      isGlobal: true
+      headers: { "App-ID": "global" }
     })
   );
 }
@@ -1443,7 +1432,7 @@ function useRemoveRole() {
     }) => request(url, {
       method: "post",
       body: arg,
-      isGlobal: true
+      headers: { "App-ID": "global" }
     })
   );
 }
@@ -1455,7 +1444,7 @@ function useCreateUser() {
     }) => request(url, {
       method: "post",
       body: arg,
-      isGlobal: true
+      headers: { "App-ID": "global" }
     })
   );
 }
@@ -1467,7 +1456,7 @@ function useUpdateUser() {
     }) => request(url, {
       method: "post",
       body: arg,
-      isGlobal: true
+      headers: { "App-ID": "global" }
     })
   );
 }
@@ -1479,7 +1468,7 @@ function useRemoveUser() {
     }) => request(url, {
       method: "post",
       body: arg,
-      isGlobal: true
+      headers: { "App-ID": "global" }
     })
   );
 }
@@ -2013,7 +2002,7 @@ var init_roleList = __esm({
       });
     };
     RoleList = () => {
-      const { accessible: viewable } = usePermission("200005", true);
+      const { accessible: viewable } = usePermission("200005", { headers: { "App-ID": "global" } });
       const { modal, message } = App.useApp();
       const { t } = useTranslation();
       const usePermissionApiV2 = useToolkitsContext((state) => state.usePermissionApiV2);
@@ -2024,7 +2013,7 @@ var init_roleList = __esm({
       const handleUpdateBtnClick = async (record) => {
         const { data: role } = await request(
           `/api/usystem/role/info${usePermissionApiV2 ? "V2" : ""}?name=${record.name}`,
-          { isGlobal: true }
+          { headers: { "App-ID": "global" } }
         );
         showUpdateModal({
           initialValues: {
@@ -2358,7 +2347,9 @@ init_highlight();
 // src/components/infiniteList/InfiniteList.tsx
 init_permission();
 init_request();
+init_contextProvider();
 init_filterFormWrapper();
+init_layout();
 init_locale();
 var InfiniteList = (props) => {
   const {
@@ -2386,6 +2377,19 @@ var InfiniteList = (props) => {
     const queryString = qs.stringify(args);
     return queryString ? `${action}?${qs.stringify(args)}` : action;
   };
+  const { game } = useGameStore();
+  const usePermissionApiV2 = useToolkitsContext((state) => state.usePermissionApiV2);
+  const _headers = useMemo(() => {
+    const newHeaders = new Headers(typeof headers === "function" ? headers(form) : headers);
+    if (usePermissionApiV2) {
+      if (isGlobal) {
+        newHeaders.set("App-ID", "global");
+      } else if (game) {
+        newHeaders.set("App-ID", String(game.id));
+      }
+    }
+    return newHeaders;
+  }, [usePermissionApiV2, isGlobal, game, headers]);
   const {
     data,
     size,
@@ -2395,8 +2399,7 @@ var InfiniteList = (props) => {
     getKey,
     (arg) => {
       return request(arg, {
-        headers: typeof headers === "function" ? headers(form) : headers,
-        isGlobal
+        headers: _headers
       }).then((response) => response.data);
     },
     {
@@ -2500,7 +2503,7 @@ init_permission();
 init_locale();
 var RequirePermission = (props) => {
   const { code, isGlobal, children } = props;
-  const { accessible, isValidating } = usePermission(code, isGlobal);
+  const { accessible, isValidating } = usePermission(code, isGlobal ? { headers: { "App-ID": "global" } } : void 0);
   const { t } = useTranslation();
   if (isValidating) {
     return /* @__PURE__ */ jsx(
@@ -2614,6 +2617,7 @@ var OperationLogList = () => {
   return /* @__PURE__ */ jsx(Card, { title: "\u64CD\u4F5C\u65E5\u5FD7", children: /* @__PURE__ */ jsx(
     QueryList_default,
     {
+      isGlobal: true,
       rowKey: "id",
       code: "300001",
       columns,