react-toolkits 2.13.6 → 2.13.7

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # react-toolkits
 
+## 2.13.7
+
+### Patch Changes
+
+- fd68eee: fix: some issues
+
 ## 2.13.6
 
 ### Patch Changes

package/lib/index.d.ts

@@ -4,7 +4,7 @@ import { ParagraphProps } from 'antd/es/typography/Paragraph';
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import { FormInstance, MenuProps, ModalProps, FormProps, ButtonProps } from 'antd';
 import { TableProps } from 'antd/es/table';
-import { AxiosHeaderValue, AxiosInstance, InternalAxiosRequestConfig, AxiosResponse, AxiosInterceptorOptions } from 'axios';
+import { AxiosHeaderValue, AxiosRequestConfig, AxiosInstance, InternalAxiosRequestConfig, AxiosResponse, AxiosInterceptorOptions } from 'axios';
 import * as swr from 'swr';
 import { MutatorCallback, MutatorOptions } from 'swr';
 import { ItemType, SubMenuType, MenuItemGroupType, MenuItemType } from 'antd/es/menu/interface';
@@ -188,6 +188,7 @@ declare const useModalStore: zustand.UseBoundStore<zustand.StoreApi<ModalState>>
 interface PermissionButtonProps extends ButtonProps {
     code?: string | string[];
     showLoading?: boolean;
+    config?: AxiosRequestConfig;
 }
 declare const PermissionButton: FC<PropsWithChildren<PermissionButtonProps>>;
 
@@ -255,6 +256,7 @@ declare const RequireGame: FC<PropsWithChildren>;
 
 interface RequirePermissionProps {
     code: string;
+    config?: AxiosRequestConfig;
 }
 declare const RequirePermission: FC<PropsWithChildren<RequirePermissionProps>>;
 
@@ -437,7 +439,7 @@ interface MenuListItem {
     ext: string;
 }
 
-declare const usePermissions: (codes?: string[]) => {
+declare const usePermissions: (codes?: string[], config?: AxiosRequestConfig) => {
     data: Record<string, boolean>;
     error: any;
     mutate: swr.KeyedMutator<{
@@ -446,7 +448,7 @@ declare const usePermissions: (codes?: string[]) => {
     isValidating: boolean;
     isLoading: boolean;
 };
-declare const usePermission: (code?: string) => {
+declare const usePermission: (code?: string, config?: AxiosRequestConfig) => {
     accessible: boolean;
     isValidating: boolean;
     isLoading: boolean;

package/lib/index.js

@@ -19,7 +19,6 @@ import { produce } from 'immer';
 import qs from 'query-string';
 import useSWRInfinite from 'swr/infinite';
 import dayjs from 'dayjs';
-import useSWRImmutable from 'swr/immutable';
 
 var __defProp = Object.defineProperty;
 var __getOwnPropNames = Object.getOwnPropertyNames;
@@ -282,85 +281,85 @@ var init_Interceptors = __esm({
         getGameId,
         permissionVersion
       } = useToolkitsStore((s) => s);
-      let requestInterceptorId;
-      let responseInterceptorId;
-      if (interceptors?.request) {
-        requestInterceptorId = axios2.interceptors.request.use(...interceptors.request);
-      } else {
-        requestInterceptorId = axios2.interceptors.request.use((config) => {
-          const headers = new AxiosHeaders(config.headers);
-          config.responseType = config.responseType || "json";
-          if (token) {
-            headers.setAuthorization(`Bearer ${token}`);
-          }
-          if (!headers.has(APP_ID_HEADER) && permissionVersion !== "v1" /* V1 */) {
-            const gameId = getGameId();
-            if (isGlobal || !gameId) {
-              headers.set(APP_ID_HEADER, "global");
-            } else {
-              headers.set(APP_ID_HEADER, gameId);
+      useEffect(() => {
+        let requestInterceptorId;
+        let responseInterceptorId;
+        if (interceptors?.request) {
+          requestInterceptorId = axios2.interceptors.request.use(...interceptors.request);
+        } else {
+          requestInterceptorId = axios2.interceptors.request.use((config) => {
+            const headers = new AxiosHeaders(config.headers);
+            config.responseType = config.responseType || "json";
+            if (token) {
+              headers.setAuthorization(`Bearer ${token}`);
             }
-          }
-          headers.set("Accept", config.responseType === "blob" ? "application/octet-stream" : "application/json");
-          config.headers = headers;
-          return config;
-        });
-      }
-      if (interceptors?.response) {
-        responseInterceptorId = axios2.interceptors.response.use(...interceptors.response);
-      } else {
-        responseInterceptorId = axios2.interceptors.response.use(
-          (response) => {
-            const responseType = response.request.responseType || "json";
-            if (responseType === "json") {
-              const data = response.data;
-              if (data.code === 0 || data.code === 200 || data.status === 0 || data.errno === 0) {
-                return response;
+            if (!headers.has(APP_ID_HEADER) && permissionVersion !== "v1" /* V1 */) {
+              const gameId = getGameId();
+              if (isGlobal || !gameId) {
+                headers.set(APP_ID_HEADER, "global");
               } else {
-                notification.error({
-                  message: "Request failed",
-                  description: data.msg
-                });
-                throw new Error(data.msg);
+                headers.set(APP_ID_HEADER, gameId);
               }
             }
-            return response;
-          },
-          (error) => {
-            if (isAxiosError(error)) {
-              const response = error.response;
-              if (!response) {
-                throw error;
+            headers.set("Accept", config.responseType === "blob" ? "application/octet-stream" : "application/json");
+            config.headers = headers;
+            return config;
+          });
+        }
+        if (interceptors?.response) {
+          responseInterceptorId = axios2.interceptors.response.use(...interceptors.response);
+        } else {
+          responseInterceptorId = axios2.interceptors.response.use(
+            (response) => {
+              const responseType = response.request.responseType || "json";
+              if (responseType === "json") {
+                const data = response.data;
+                if (data.code === 0 || data.code === 200 || data.status === 0 || data.errno === 0) {
+                  return response;
+                } else {
+                  notification.error({
+                    message: "Request failed",
+                    description: data.msg
+                  });
+                  throw new Error(data.msg);
+                }
               }
-              if (response.status === 401 || response.status === 412) {
-                clearToken?.();
-                if (response.status === 412) {
-                  setUnregistered();
+              return response;
+            },
+            (error) => {
+              if (isAxiosError(error)) {
+                const response = error.response;
+                if (!response) {
+                  throw error;
+                }
+                if (response.status === 401 || response.status === 412) {
+                  clearToken();
+                  if (response.status === 412) {
+                    setUnregistered();
+                  }
+                  window.location.replace(signInPath);
+                } else if (response.status === 403) {
+                  notification.error({
+                    message: "Forbidden",
+                    description: "You do not have permission to access this resource."
+                  });
+                } else {
+                  notification.error({
+                    message: "Request failed",
+                    description: response.data.msg
+                  });
+                  throw new Error(response.data.msg);
                 }
-                window.location.replace(signInPath);
-              } else if (response.status === 403) {
-                notification.error({
-                  message: "Forbidden",
-                  description: "You do not have permission to access this resource."
-                });
-              } else {
-                notification.error({
-                  message: "Request failed",
-                  description: response.data.msg
-                });
-                throw new Error(response.data.msg);
               }
+              throw error;
             }
-            throw error;
-          }
-        );
-      }
-      useEffect(() => {
+          );
+        }
         return () => {
           axios2.interceptors.request.eject(requestInterceptorId);
           axios2.interceptors.response.eject(responseInterceptorId);
         };
-      }, []);
+      }, [axios2, interceptors, token, isGlobal, signInPath, clearToken, setUnregistered, getGameId, permissionVersion]);
       return children;
     };
     Interceptors_default = Interceptors;
@@ -522,25 +521,28 @@ var init_highlight = __esm({
   }
 });
 function useMenuList() {
-  const { getGameId, signInPath, axios: axios2 } = useToolkitsStore((s) => s);
+  const { getGameId, signInPath, axios: axios2, token } = useToolkitsStore((s) => s);
   const gameId = getGameId();
   return useSWR5(
     window.location.pathname !== signInPath ? ["/api/usystem/menu/navbar", gameId] : null,
-    ([url4]) => axios2(url4).then((response) => response.data.data)
+    ([url4]) => axios2(url4, {
+      headers: { Authorization: `Bearer ${token}`, [APP_ID_HEADER]: gameId }
+    }).then((response) => response.data.data)
   );
 }
 var usePermissions, usePermission;
 var init_hooks2 = __esm({
   "src/hooks/index.ts"() {
     init_toolkitsProvider();
-    usePermissions = (codes = []) => {
+    init_constants();
+    usePermissions = (codes = [], config) => {
       const { axios: axios2, permissionVersion } = useToolkitsStore((s) => s);
       const { data, ...rest } = useSWR5(
         codes.length ? [
           permissionVersion !== "v1" /* V1 */ ? "/api/usystem/user/checkV2" : "/api/usystem/user/check",
           { permissions: codes }
         ] : null,
-        ([url4, body]) => axios2.post(url4, body).then((response) => response.data.data)
+        ([url4, body]) => axios2.post(url4, body, config).then((response) => response.data.data)
       );
       const newData = codes.reduce((acc, curr) => {
         acc[curr] = data?.has_all ? true : data?.[curr] ?? false;
@@ -548,8 +550,8 @@ var init_hooks2 = __esm({
       }, {});
       return { ...rest, data: newData };
     };
-    usePermission = (code) => {
-      const { data, isValidating, isLoading } = usePermissions(code ? [code] : void 0);
+    usePermission = (code, config) => {
+      const { data, isValidating, isLoading } = usePermissions(code ? [code] : void 0, config);
       return {
         accessible: code ? data?.[code] : true,
         isValidating,
@@ -564,9 +566,9 @@ var init_hooks3 = __esm({
     init_constants();
     init_toolkitsProvider();
     useGames = () => {
-      const { axios: axios2, gameApiV2 } = useToolkitsStore((s) => s);
+      const { axios: axios2, gameApiV2, token } = useToolkitsStore((s) => s);
       return useSWR5("/api/game/list", async () => {
-        const headers = new AxiosHeaders({ [APP_ID_HEADER]: "global" });
+        const headers = new AxiosHeaders({ [APP_ID_HEADER]: "global", Authorization: `Bearer ${token}` });
         const games = gameApiV2 ? await axios2({
           url: "/api/game/list",
           headers
@@ -835,15 +837,26 @@ var init_GameSelect = __esm({
       const { t } = useTranslation();
       const { gameApiV2, setGame, getGameId } = useToolkitsStore((s) => s);
       const { data, isLoading } = useGames();
+      const defaultValue = getGameId();
+      const [internalValue, setInternalValue] = useState(defaultValue);
       const options = data?.filter((item) => filter?.(item) ?? true)?.map((item) => ({
         label: item.name,
         value: gameApiV2 ? item.game_id : item.id
       }));
-      const onChange = async (value2) => {
-        const game = data?.find((item) => String(gameApiV2 ? item.game_id : item.id) === String(value2));
+      const findGame = (value) => data?.find((item) => String(gameApiV2 ? item.game_id : item.id) === String(value));
+      const onChange = async (value) => {
+        const game = findGame(value);
         setGame(game);
+        setInternalValue(value);
       };
-      const value = getGameId();
+      useEffect(() => {
+        if (data?.every((item) => String(gameApiV2 ? item.game_id : item.id) !== defaultValue)) {
+          const gameId = gameApiV2 ? data?.[0]?.game_id : data?.[0]?.id;
+          setInternalValue(gameId);
+          const game = findGame(gameId);
+          setGame(game);
+        }
+      }, [data]);
       return /* @__PURE__ */ jsxs(Space, { children: [
         /* @__PURE__ */ jsx(Text, { children: t("GameSelect.label") }),
         /* @__PURE__ */ jsx(
@@ -851,7 +864,7 @@ var init_GameSelect = __esm({
           {
             showSearch: true,
             optionFilterProp: "label",
-            value,
+            value: internalValue,
             placeholder: t("GameSelect.placeholder"),
             loading: isLoading,
             style: { width: "200px" },
@@ -1136,9 +1149,9 @@ var init_PermissionButton = __esm({
     init_hooks2();
     init_locale();
     PermissionButton = (props) => {
-      const { children, code, showLoading, disabled, ...restProps } = props;
+      const { children, code, showLoading, disabled, config, ...restProps } = props;
       const codes = code ? Array.isArray(code) ? code : [code] : [];
-      const { data, isLoading } = usePermissions(codes);
+      const { data, isLoading } = usePermissions(codes, config);
       const { t } = useTranslation();
       if (isLoading) {
         return /* @__PURE__ */ jsx(Button, { loading: showLoading, disabled: !showLoading, ...restProps, children });
@@ -1800,9 +1813,8 @@ function useAllPermissionsV2() {
 }
 function useAllRoles() {
   const { axios: axios2 } = useToolkitsStore((s) => s);
-  const { accessible } = usePermission("200005");
   return useSWR5(
-    accessible ? "/api/usystem/role/all" : null,
+    "/api/usystem/role/all",
     (url4) => axios2.get(url4).then((response) => response.data.data)
   );
 }
@@ -1875,7 +1887,6 @@ var init_hooks5 = __esm({
     init_modal2();
     init_toolkitsProvider();
     init_constants();
-    init_hooks2();
     init_components();
     ({ Text: Text2 } = Typography);
     useCreateRoleModal = ({ onSuccess } = {}) => {
@@ -3273,8 +3284,8 @@ init_requireGame();
 init_hooks2();
 init_locale();
 var RequirePermission = (props) => {
-  const { code, children } = props;
-  const { accessible, isValidating } = usePermission(code);
+  const { code, config, children } = props;
+  const { accessible, isValidating } = usePermission(code, config);
   const { t } = useTranslation();
   if (isValidating) {
     return /* @__PURE__ */ jsx(
@@ -3440,10 +3451,11 @@ var SignIn = (props) => {
   const { title, successRedirectUrl, extra } = props;
   const unregistered = useToolkitsStore((s) => s.unregistered);
   const queryParams = new URLSearchParams(window.location.search);
-  const { token, setToken } = useToolkitsStore((state) => state);
+  const { token, setToken, axios: axios2 } = useToolkitsStore((state) => state);
   const { t } = useTranslation();
-  const { isLoading } = useSWRImmutable(
+  const { isLoading } = useSWR5(
     queryParams.has("ticket") ? `/api/usystem/user/login?ticket=${queryParams.get("ticket")}` : null,
+    (url4) => axios2.get(url4).then((res) => res.data.data),
     {
       onSuccess: (data) => {
         if (data) {