react-toolkits 2.11.15 → 2.11.17

package/lib/index.js

@@ -1,10 +1,10 @@
-import axios, { AxiosHeaders } from 'axios';
+import axios, { AxiosHeaders, isAxiosError } from 'axios';
 import { jwtDecode } from 'jwt-decode';
 import { create, useStore, createStore } from 'zustand';
 import { persist, createJSONStorage } from 'zustand/middleware';
-import * as Antd2 from 'antd';
-import { Spin, Menu, Modal, Form, App, theme, Space, Input, Tag, Typography, Result, Table, Button, Empty, Dropdown, Divider, Card, Select, Alert, Switch, InputNumber, Row, Col, Breadcrumb, Skeleton, Descriptions, Tooltip, Popconfirm, Collapse, Checkbox } from 'antd';
-import { memo, useMemo, useCallback, useEffect, lazy, useContext, useState, useRef, Fragment as Fragment$1, Suspense, createContext, forwardRef, useImperativeHandle, cloneElement } from 'react';
+import * as Antd from 'antd';
+import { Spin, Menu, Modal, Form, Card, Input, Select, theme, Space, Tag, Typography, Result, Table, Button, Dropdown, Divider, Alert, App, Switch, InputNumber, Row, Col, Breadcrumb, Skeleton, Descriptions, Tooltip, Popconfirm, Empty, Collapse, Checkbox } from 'antd';
+import { memo, useMemo, useCallback, useEffect, lazy, useContext, useState, useRef, Suspense, createContext, forwardRef, Fragment as Fragment$1, useImperativeHandle, cloneElement } from 'react';
 import useSWR5, { mutate, SWRConfig, unstable_serialize } from 'swr';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import { has, template, get, isEqual } from 'lodash-es';
@@ -50,6 +50,14 @@ var init_storage = __esm({
     };
   }
 });
+var createAxiosSlice;
+var init_axios = __esm({
+  "src/stores/axios.ts"() {
+    createAxiosSlice = () => ({
+      axios: axios.create()
+    });
+  }
+});
 
 // src/components/locale/en_GB.ts
 var locale, en_GB_default;
@@ -157,7 +165,8 @@ var init_context = __esm({
       usePermissionApiV2: false,
       gameApiV2: false,
       isGlobal: false,
-      signInPath: "/"
+      signInPath: "/",
+      hideGame: false
     });
   }
 });
@@ -182,10 +191,11 @@ var init_game = __esm({
           if (token) {
             headers.setAuthorization("Bearer " + get2().token);
           }
-          const games = apiV2 ? await axios({
+          const instance = get2().axios;
+          const games = apiV2 ? await instance({
             url: "/api/game/list",
             headers
-          }).then((response) => response.data.data.list ?? []) : await axios({
+          }).then((response) => response.data.data.list ?? []) : await instance({
             url: "/api/usystem/game/all",
             headers
           }).then((response) => response.data.data ?? []);
@@ -224,6 +234,7 @@ var createToolkitsStore;
 var init_stores = __esm({
   "src/stores/index.ts"() {
     init_storage();
+    init_axios();
     init_context();
     init_game();
     init_token();
@@ -236,6 +247,7 @@ var init_stores = __esm({
               ...createTokenSlice(...args),
               ...createGameSlice(...args),
               ...createContextSlice(...args),
+              ...createAxiosSlice(...args),
               ...initProps,
               setContext: (props) => {
                 set({ ...props });
@@ -272,43 +284,43 @@ var init_constants = __esm({
     FRONTEND_ROUTE_PREFIX = "/console/";
   }
 });
-var axiosInstance, requestInterceptorId, responseInterceptorId, Interceptor;
-var init_axios = __esm({
-  "src/utils/axios.tsx"() {
-    init_toolkitsProvider();
+var Interceptors, Interceptors_default;
+var init_Interceptors = __esm({
+  "src/components/interceptors/Interceptors.tsx"() {
     init_constants();
-    axiosInstance = axios.create({
-      baseURL: "/",
-      headers: {
-        "Content-Type": "application/json; charset=utf-8"
-      }
-    });
-    Interceptor = ({ children }) => {
-      const state = useToolkitsStore((s) => s);
+    init_toolkitsProvider();
+    Interceptors = ({ children }) => {
       const { notification } = App.useApp();
-      if (requestInterceptorId) {
-        axiosInstance.interceptors.request.eject(requestInterceptorId);
-      }
-      if (responseInterceptorId) {
-        axiosInstance.interceptors.response.eject(responseInterceptorId);
-      }
-      const interceptors = state.interceptors;
+      const {
+        axios: axios2,
+        interceptors,
+        token,
+        usePermissionApiV2,
+        isGlobal,
+        game,
+        gameApiV2,
+        signInPath,
+        clearToken,
+        setUnregistered
+      } = useToolkitsStore((s) => s);
+      let requestInterceptorId;
+      let responseInterceptorId;
       if (interceptors?.request) {
-        requestInterceptorId = axiosInstance.interceptors.request.use(...interceptors.request);
+        requestInterceptorId = axios2.interceptors.request.use(...interceptors.request);
       } else {
-        requestInterceptorId = axiosInstance.interceptors.request.use((config) => {
+        requestInterceptorId = axios2.interceptors.request.use((config) => {
           const headers = new AxiosHeaders(config.headers);
           config.responseType = config.responseType || "json";
-          if (state.token) {
-            headers.set("Authorization", `Bearer ${state.token}`);
+          if (token) {
+            headers.setAuthorization(`Bearer ${token}`);
           }
-          if (!headers.has(APP_ID_HEADER) && state.usePermissionApiV2) {
-            if (state.isGlobal || !state.game) {
+          if (!headers.has(APP_ID_HEADER) && usePermissionApiV2) {
+            if (isGlobal || !game) {
               headers.set(APP_ID_HEADER, "global");
-            } else if (state.gameApiV2) {
-              headers.set(APP_ID_HEADER, state.game.game_id);
+            } else if (gameApiV2) {
+              headers.set(APP_ID_HEADER, game.game_id);
             } else {
-              headers.set(APP_ID_HEADER, state.game.id);
+              headers.set(APP_ID_HEADER, game.id);
             }
           }
           headers.set("Accept", config.responseType === "blob" ? "application/octet-stream" : "application/json");
@@ -317,9 +329,9 @@ var init_axios = __esm({
         });
       }
       if (interceptors?.response) {
-        responseInterceptorId = axiosInstance.interceptors.response.use(...interceptors.response);
+        responseInterceptorId = axios2.interceptors.response.use(...interceptors.response);
       } else {
-        responseInterceptorId = axiosInstance.interceptors.response.use(
+        responseInterceptorId = axios2.interceptors.response.use(
           (response) => {
             const responseType = response.request.responseType || "json";
             if (responseType === "json") {
@@ -337,17 +349,17 @@ var init_axios = __esm({
             return response;
           },
           (error) => {
-            if (axios.isAxiosError(error)) {
+            if (isAxiosError(error)) {
               const response = error.response;
               if (!response) {
                 throw error;
               }
               if (response.status === 401 || response.status === 412) {
-                state.clearToken?.();
+                clearToken?.();
                 if (response.status === 412) {
-                  state.setUnregistered();
+                  setUnregistered();
                 }
-                window.location.replace(state.signInPath);
+                window.location.replace(signInPath);
               } else if (response.status === 403) {
                 notification.error({
                   message: "Forbidden",
@@ -365,8 +377,22 @@ var init_axios = __esm({
           }
         );
       }
+      useEffect(() => {
+        return () => {
+          axios2.interceptors.request.eject(requestInterceptorId);
+          axios2.interceptors.response.eject(responseInterceptorId);
+        };
+      }, []);
       return children;
     };
+    Interceptors_default = Interceptors;
+  }
+});
+
+// src/components/interceptors/index.ts
+var init_interceptors = __esm({
+  "src/components/interceptors/index.ts"() {
+    init_Interceptors();
   }
 });
 function useToolkitsStore(selector) {
@@ -374,36 +400,43 @@ function useToolkitsStore(selector) {
   if (!store) throw new Error("Missing ToolkitsProvider in the tree");
   return useStore(store, selector);
 }
-var ToolkitsContext, toolkitsStore, globalState, ToolkitsProvider, Provider_default;
+var ToolkitsContext, toolkitsStore, globalState, ToolkitsProvider, withContext, Provider_default;
 var init_Provider = __esm({
   "src/components/toolkitsProvider/Provider.tsx"() {
     init_stores();
-    init_axios();
+    init_interceptors();
     ToolkitsContext = createContext(null);
     ToolkitsProvider = (props) => {
       const { children, ...restProps } = props;
       const storeRef = useRef();
       if (!storeRef.current) {
-        storeRef.current = createToolkitsStore({ ...globalState, ...restProps });
+        storeRef.current = createToolkitsStore({
+          ...globalState,
+          ...restProps
+        });
       }
       globalState = storeRef.current.getState();
       if (!globalState.signInPath) {
         throw new Error('ToolkitsProvider: \u8BF7\u914D\u7F6E "signInPath"');
       }
-      return /* @__PURE__ */ jsx(ToolkitsContext.Provider, { value: storeRef.current, children: /* @__PURE__ */ jsx(App, { children: /* @__PURE__ */ jsx(
+      const { axios: axios2 } = globalState;
+      return /* @__PURE__ */ jsx(ToolkitsContext.Provider, { value: storeRef.current, children: /* @__PURE__ */ jsx(App, { children: /* @__PURE__ */ jsx(Interceptors_default, { children: /* @__PURE__ */ jsx(
         SWRConfig,
         {
           value: {
-            fetcher: (arg) => {
-              if (typeof arg === "string") {
-                return axiosInstance.get(arg).then((res) => res.data.data);
-              }
-              return axiosInstance.request(arg).then((res) => res.data.data);
+            fetcher: async (arg) => {
+              const response = typeof arg === "string" ? await axios2.get(arg) : await axios2.request(arg);
+              return response.data.data;
             }
           },
-          children: /* @__PURE__ */ jsx(Interceptor, { children })
+          children
         }
-      ) }) });
+      ) }) }) });
+    };
+    withContext = (Component, providerProps) => {
+      return (props) => {
+        return /* @__PURE__ */ jsx(ToolkitsProvider, { ...providerProps, children: /* @__PURE__ */ jsx(Component, { ...props }) });
+      };
     };
     if (process.env.NODE_ENV !== "production") {
       ToolkitsProvider.displayName = "ToolkitsProvider";
@@ -522,10 +555,10 @@ var init_highlight = __esm({
     init_Highlight();
   }
 });
-function usePermissions(codes = [], config) {
+function usePermissions(codes = []) {
   const usePermissionApiV2 = useToolkitsStore((state) => state.usePermissionApiV2);
   const url4 = usePermissionApiV2 ? "/api/usystem/user/checkV2" : "/api/usystem/user/check";
-  const key = codes.length ? { ...config, method: "POST", url: url4, data: { permissions: codes } } : null;
+  const key = codes.length ? { method: "POST", url: url4, data: { permissions: codes } } : null;
   const { data, ...rest } = useSWR5(key);
   const newData = codes.reduce((acc, curr) => {
     acc[curr] = data?.has_all ? true : data?.[curr] ?? false;
@@ -533,8 +566,8 @@ function usePermissions(codes = [], config) {
   }, {});
   return { ...rest, data: newData };
 }
-function usePermission(code, config) {
-  const { data, isValidating, isLoading } = usePermissions(code ? [code] : void 0, config);
+function usePermission(code) {
+  const { data, isValidating, isLoading } = usePermissions(code ? [code] : void 0);
   if (code === void 0) {
     return {
       accessible: true,
@@ -559,16 +592,17 @@ var init_PermissionButton = __esm({
     init_permission();
     init_locale();
     PermissionButton = (props) => {
-      const { children, code, showLoading, disabled, headers, ...restProps } = props;
-      const { data, isLoading } = usePermissions(Array.isArray(code) ? code : [code], { headers });
+      const { children, code, showLoading, disabled, ...restProps } = props;
+      const codes = code ? Array.isArray(code) ? code : [code] : [];
+      const { data, isLoading } = usePermissions(codes);
       const { t } = useTranslation();
       if (isLoading) {
         return /* @__PURE__ */ jsx(Button, { loading: showLoading, disabled: !showLoading, ...restProps, children });
       }
-      if (!Object.values(data ?? {})?.some(Boolean)) {
-        return /* @__PURE__ */ jsx(Tooltip, { defaultOpen: false, title: t("global.noEntitlement"), children: /* @__PURE__ */ jsx(Button, { disabled: true, ...restProps, children }) });
+      if (codes.length === 0 || Object.values(data).some(Boolean)) {
+        return /* @__PURE__ */ jsx(Button, { disabled, ...restProps, children });
       }
-      return /* @__PURE__ */ jsx(Button, { disabled, ...restProps, children });
+      return /* @__PURE__ */ jsx(Tooltip, { defaultOpen: false, title: t("global.noEntitlement"), children: /* @__PURE__ */ jsx(Button, { disabled: true, ...restProps, children }) });
     };
     PermissionButton_default = PermissionButton;
   }
@@ -613,11 +647,10 @@ var init_stores2 = __esm({
 var QueryListAction, InternalQueryList, QueryList, QueryList_default;
 var init_QueryList = __esm({
   "src/components/queryList/QueryList.tsx"() {
-    init_constants();
     init_permission();
-    init_axios();
     init_filterFormWrapper();
     init_locale();
+    init_toolkitsProvider();
     init_stores2();
     QueryListAction = /* @__PURE__ */ ((QueryListAction2) => {
       QueryListAction2[QueryListAction2["Confirm"] = 0] = "Confirm";
@@ -648,7 +681,6 @@ var init_QueryList = __esm({
         tableExtra,
         form,
         body,
-        isGlobal,
         params,
         renderForm,
         afterSuccess,
@@ -663,23 +695,22 @@ var init_QueryList = __esm({
       const { t } = useTranslation();
       const [_form] = Form.useForm(form);
       const action = useRef(3 /* Init */);
-      let _headers = typeof headers === "function" ? headers(_form) : headers;
-      if (isGlobal) {
-        _headers = { ..._headers, [APP_ID_HEADER]: "global" };
-      }
-      const { accessible, isLoading } = usePermission(code, { headers: _headers });
+      const _headers = typeof headers === "function" ? headers(_form) : headers;
+      const { accessible, isLoading } = usePermission(code);
       const [isValid, setIsValid] = useState(false);
       const { keyMap, getPayload, refetch } = useQueryListStore();
       const { page, size = defaultSize, formValue } = getPayload(url4);
       const payload = { page, size, formValue };
-      const _body = typeof body === "function" ? body(payload) : method === "POST" && typeof body === "undefined" ? {
+      const _body = typeof body === "function" ? body(payload) : typeof body === "undefined" ? method === "POST" ? {
         ...formValue,
-        ...!onePage ? { page, size } : void 0
-      } : body;
-      const _params = typeof params === "function" ? params(payload) : method === "GET" && typeof params === "undefined" ? {
+        page: !onePage ? page : void 0,
+        size: !onePage ? size : void 0
+      } : void 0 : body;
+      const _params = typeof params === "function" ? params(payload) : typeof params === "undefined" ? method === "GET" ? {
         ...formValue,
-        ...!onePage ? { page, size } : void 0
-      } : void 0;
+        page: !onePage ? page : void 0,
+        size: !onePage ? size : void 0
+      } : void 0 : params;
       const shouldPoll = useRef(false);
       const requestConfig = {
         url: url4,
@@ -696,10 +727,11 @@ var init_QueryList = __esm({
         keyMap.set(url4, serializedKey);
         return serializedKey;
       }, [accessible, isValid, url4, requestConfig]);
+      const { axios: axios2 } = useToolkitsStore((s) => s);
       const { data, isValidating } = useSWR5(
         key,
         async () => {
-          const response = await axiosInstance.request(requestConfig);
+          const response = await axios2.request(requestConfig);
           return response.data.data;
         },
         {
@@ -712,8 +744,8 @@ var init_QueryList = __esm({
           }
         }
       );
-      const dataSource = useMemo(() => getDataSource(data, _form), [data, form, getDataSource]);
-      const total = useMemo(() => getTotal(data), [data, getTotal]);
+      const dataSource = getDataSource(data, _form);
+      const total = getTotal(data);
       const pagination = !onePage && {
         showSizeChanger: true,
         showQuickJumper: true,
@@ -854,34 +886,36 @@ var init_constants2 = __esm({
   }
 });
 function useCreateMenu() {
+  const { axios: axios2 } = useToolkitsStore((s) => s);
   return useSWRMutation2(
     "/api/usystem/menu/set",
-    (url4, { arg }) => axiosInstance.post(url4, { ...arg, id: 0, is_model: true })
+    (url4, { arg }) => axios2.post(url4, { ...arg, id: 0, is_model: true })
   );
 }
 function useUpdateMenu() {
+  const { axios: axios2 } = useToolkitsStore((s) => s);
   return useSWRMutation2(
     "/api/usystem/menu/set",
-    (url4, { arg }) => axiosInstance.post(url4, { ...arg, is_model: true })
+    (url4, { arg }) => axios2.post(url4, { ...arg, is_model: true })
   );
 }
 function useMenuList() {
-  const { game, signInPath } = useToolkitsStore((s) => s);
+  const { game, signInPath, axios: axios2 } = useToolkitsStore((s) => s);
   return useSWR5(
     window.location.pathname !== signInPath ? ["/api/usystem/menu/navbar", game] : null,
-    ([url4]) => axiosInstance(url4).then((response) => response.data.data)
+    ([url4]) => axios2(url4).then((response) => response.data.data)
   );
 }
 function useRemoveMenu() {
+  const { axios: axios2 } = useToolkitsStore((s) => s);
   return useSWRMutation2(
     "/api/usystem/menu/delete",
-    (url4, { arg }) => axiosInstance.post(url4, null, { params: { id: arg } })
+    (url4, { arg }) => axios2.post(url4, null, { params: { id: arg } })
   );
 }
 var init_hooks2 = __esm({
   "src/features/menu/hooks/index.ts"() {
     init_toolkitsProvider();
-    init_axios();
   }
 });
 
@@ -902,6 +936,7 @@ var init_menu = __esm({
 function useModal(props) {
   const { content, onConfirm, ...modalProps } = props;
   const _id = useMemo(() => ++id, []);
+  console.log(typeof useModalStore);
   const modalStore = useModalStore();
   const open = modalStore.getOpen(_id);
   const [confirmLoading, setConfirmLoading] = useState(false);
@@ -1218,9 +1253,9 @@ __export(updateMenuItem_exports, {
 var EditMenuItem, updateMenuItem_default;
 var init_updateMenuItem = __esm({
   "src/pages/menu/updateMenuItem/index.tsx"() {
+    init_toolkitsProvider();
     init_constants();
     init_menu();
-    init_axios();
     EditMenuItem = () => {
       const { message } = App.useApp();
       const [form] = Form.useForm();
@@ -1228,9 +1263,10 @@ var init_updateMenuItem = __esm({
       const { trigger } = useUpdateMenu();
       const params = useParams();
       const { mutate: mutate2 } = useMenuList();
+      const { axios: axios2 } = useToolkitsStore((s) => s);
       const { data, isLoading } = useSWR5(
         `/api/usystem/menu/info?id=${params.id}`,
-        (url4) => axiosInstance(url4).then((response) => response.data.data)
+        (url4) => axios2(url4).then((response) => response.data.data)
       );
       const onFinish = async (values) => {
         const { permissions, front_route, ...rest } = values;
@@ -1315,88 +1351,86 @@ var init_updateMenuItem = __esm({
 });
 function useAllPermissions() {
   return useSWR5({
-    url: "/api/usystem/user/allPermssions",
-    headers: { [APP_ID_HEADER]: "global" }
+    url: "/api/usystem/user/allPermssions"
   });
 }
 function useAllPermissionsV2() {
   return useSWR5({
-    url: "/api/usystem/user/allPermissionsV2",
-    headers: { [APP_ID_HEADER]: "global" }
+    url: "/api/usystem/user/allPermissionsV2"
   });
 }
 function useAllRoles() {
-  const { accessible } = usePermission("200005", { headers: { [APP_ID_HEADER]: "global" } });
+  const { accessible } = usePermission("200005");
   return useSWR5(
     accessible ? {
-      url: "/api/usystem/role/all",
-      headers: { [APP_ID_HEADER]: "global" }
+      url: "/api/usystem/role/all"
     } : null
   );
 }
 function useRole(name) {
   const usePermissionApiV2 = useToolkitsStore((state) => state.usePermissionApiV2);
   return useSWR5({
-    url: `/api/usystem/role/${usePermissionApiV2 ? "infoV2" : "info"}?name=${name}`,
-    headers: { [APP_ID_HEADER]: "global" }
+    url: `/api/usystem/role/${usePermissionApiV2 ? "infoV2" : "info"}?name=${name}`
   });
 }
 function useCreateRole() {
-  const usePermissionApiV2 = useToolkitsStore((state) => state.usePermissionApiV2);
+  const { axios: axios2, usePermissionApiV2 } = useToolkitsStore((s) => s);
   return useSWRMutation2(
     usePermissionApiV2 ? "/api/usystem/role/createV2" : "/api/usystem/role/create",
     (url4, {
       arg
-    }) => axiosInstance.post(url4, arg, { headers: { [APP_ID_HEADER]: "global" } })
+    }) => axios2.post(url4, arg)
   );
 }
 function useUpdateRole() {
-  const usePermissionApiV2 = useToolkitsStore((state) => state.usePermissionApiV2);
+  const { axios: axios2, usePermissionApiV2 } = useToolkitsStore((s) => s);
   return useSWRMutation2(
     usePermissionApiV2 ? "/api/usystem/role/updateV2" : "/api/usystem/role/update",
     (url4, {
       arg
-    }) => axiosInstance.post(url4, arg, { headers: { [APP_ID_HEADER]: "global" } })
+    }) => axios2.post(url4, arg)
   );
 }
 function useRemoveRole() {
+  const { axios: axios2 } = useToolkitsStore((s) => s);
   return useSWRMutation2(
     "/api/usystem/role/delete",
     (url4, {
       arg
-    }) => axiosInstance.post(url4, arg, { headers: { [APP_ID_HEADER]: "global" } })
+    }) => axios2.post(url4, arg)
   );
 }
 function useCreateUser() {
+  const { axios: axios2 } = useToolkitsStore((s) => s);
   return useSWRMutation2(
     "/api/usystem/user/create",
     (url4, {
       arg
-    }) => axiosInstance.post(url4, arg, { headers: { [APP_ID_HEADER]: "global" } })
+    }) => axios2.post(url4, arg)
   );
 }
 function useUpdateUser() {
+  const { axios: axios2 } = useToolkitsStore((s) => s);
   return useSWRMutation2(
     "/api/usystem/user/update",
     (url4, {
       arg
-    }) => axiosInstance.post(url4, arg, { headers: { [APP_ID_HEADER]: "global" } })
+    }) => axios2.post(url4, arg)
   );
 }
 function useRemoveUser() {
+  const { axios: axios2 } = useToolkitsStore((s) => s);
   return useSWRMutation2(
     "/api/usystem/user/delete",
     (url4, {
       arg
-    }) => axiosInstance.post(url4, arg, { headers: { [APP_ID_HEADER]: "global" } })
+    }) => axios2.post(url4, arg)
   );
 }
 var init_hooks3 = __esm({
   "src/features/permission/hooks/index.ts"() {
     init_toolkitsProvider();
-    init_constants();
     init_permission();
-    init_axios();
   }
 });
 var PermissionCollapse, permissionCollapse_default;
@@ -1678,8 +1712,7 @@ var init_userList = __esm({
     init_locale();
     init_permissionButton();
     init_queryList();
-    init_stores2();
-    init_constants();
+    init_toolkitsProvider();
     init_permission2();
     init_formModal();
     ({ Option: Option3 } = Select);
@@ -1772,7 +1805,6 @@ var init_userList = __esm({
                 size: "small",
                 type: "link",
                 code: "100003",
-                headers: { [APP_ID_HEADER]: "global" },
                 onClick: () => {
                   showUpdateModal({
                     initialValues: {
@@ -1794,7 +1826,6 @@ var init_userList = __esm({
                 size: "small",
                 code: "100004",
                 type: "link",
-                headers: { [APP_ID_HEADER]: "global" },
                 onClick: () => {
                   modal.confirm({
                     title: t("UserList.deleteTitle"),
@@ -1833,7 +1864,6 @@ var init_userList = __esm({
                 type: "primary",
                 icon: /* @__PURE__ */ jsx(UserAddOutlined, {}),
                 code: "100002",
-                headers: { [APP_ID_HEADER]: "global" },
                 onClick: () => {
                   showCreateModal();
                 },
@@ -1848,8 +1878,7 @@ var init_userList = __esm({
                 rowKey: "id",
                 columns,
                 getTotal: (response) => response?.Total,
-                getDataSource: (response) => response?.List,
-                headers: { [APP_ID_HEADER]: "global" }
+                getDataSource: (response) => response?.List
               }
             )
           }
@@ -1858,7 +1887,7 @@ var init_userList = __esm({
         updateModal
       ] });
     };
-    userList_default = UserList;
+    userList_default = withContext(UserList, { isGlobal: true, hideGame: true });
   }
 });
 
@@ -1876,11 +1905,9 @@ var init_roleList = __esm({
     init_queryList();
     init_stores2();
     init_toolkitsProvider();
-    init_constants();
     init_permission2();
     init_formModal();
     init_permission();
-    init_axios();
     url3 = "/api/usystem/role/list";
     useModal3 = (isCreate) => {
       const { message } = App.useApp();
@@ -1932,20 +1959,17 @@ var init_roleList = __esm({
       });
     };
     RoleList = () => {
-      const { accessible: viewable } = usePermission("200005", { headers: { [APP_ID_HEADER]: "global" } });
+      const { accessible: viewable } = usePermission("200005");
       const { modal, message } = App.useApp();
       const { t } = useTranslation();
-      const usePermissionApiV2 = useToolkitsStore((state) => state.usePermissionApiV2);
+      const { axios: axios2, usePermissionApiV2 } = useToolkitsStore((s) => s);
       const { mutate: mutate2 } = useQueryListStore();
       const { show: showCreateModal, modal: createModal } = useModal3(true);
       const { show: showUpdateModal, modal: updateModal } = useModal3();
       const remove = useRemoveRole();
       const handleUpdateBtnClick = async (record) => {
-        const response = await axiosInstance.get(
-          `/api/usystem/role/info${usePermissionApiV2 ? "V2" : ""}?name=${record.name}`,
-          {
-            headers: { [APP_ID_HEADER]: "global" }
-          }
+        const response = await axios2.get(
+          `/api/usystem/role/info${usePermissionApiV2 ? "V2" : ""}?name=${record.name}`
         );
         const data = response.data.data;
         showUpdateModal({
@@ -1992,7 +2016,6 @@ var init_roleList = __esm({
                   code: "200003",
                   size: "small",
                   type: "link",
-                  headers: { [APP_ID_HEADER]: "global" },
                   onClick: async () => {
                     handleUpdateBtnClick(record);
                   },
@@ -2006,7 +2029,6 @@ var init_roleList = __esm({
                   code: "200004",
                   size: "small",
                   type: "link",
-                  headers: { [APP_ID_HEADER]: "global" },
                   onClick: () => {
                     modal.confirm({
                       title: t("RoleList.deleteTitle"),
@@ -2046,7 +2068,6 @@ var init_roleList = __esm({
                 type: "primary",
                 code: "200002",
                 icon: /* @__PURE__ */ jsx(UsergroupAddOutlined, {}),
-                headers: { [APP_ID_HEADER]: "global" },
                 onClick: () => {
                   showCreateModal();
                 },
@@ -2060,7 +2081,6 @@ var init_roleList = __esm({
                 columns,
                 code: "200001",
                 url: url3,
-                headers: { [APP_ID_HEADER]: "global" },
                 getTotal: (response) => response?.Total,
                 getDataSource: (response) => response?.List
               }
@@ -2071,7 +2091,10 @@ var init_roleList = __esm({
         updateModal
       ] });
     };
-    roleList_default = RoleList;
+    roleList_default = withContext(RoleList, {
+      isGlobal: true,
+      hideGame: true
+    });
   }
 });
 
@@ -2084,6 +2107,7 @@ var RoleDetail, roleDetail_default;
 var init_roleDetail = __esm({
   "src/pages/permission/roleDetail/index.tsx"() {
     init_locale();
+    init_toolkitsProvider();
     init_permission2();
     RoleDetail = () => {
       const params = useParams();
@@ -2116,7 +2140,7 @@ var init_roleDetail = __esm({
         ] }) })
       ] });
     };
-    roleDetail_default = RoleDetail;
+    roleDetail_default = withContext(RoleDetail, { isGlobal: true, hideGame: true });
   }
 });
 
@@ -2276,15 +2300,16 @@ init_highlight();
 
 // src/components/infiniteList/InfiniteList.tsx
 init_permission();
-init_axios();
 init_filterFormWrapper();
 init_locale();
+init_toolkitsProvider();
 var InfiniteList = (props) => {
   const { code, url: url4, extras, headers, getRowKey, getDataSource, hasMore, renderForm, transformArg, ...tableProps } = props;
   const { t } = useTranslation();
   const [form] = Form.useForm();
   const [isValid, setIsValid] = useState(false);
   const [formValues, setFormValues] = useState();
+  const { axios: axios2 } = useToolkitsStore((s) => s);
   const getKey = (pageIndex, previousPageData) => {
     if (!isValid) return null;
     const rowKey = pageIndex !== 0 ? getRowKey(previousPageData) : void 0;
@@ -2293,9 +2318,7 @@ var InfiniteList = (props) => {
     return queryString ? `${url4}?${qs.stringify(args)}` : url4;
   };
   const _headers = typeof headers === "function" ? headers(form) : headers;
-  const { accessible, isLoading } = usePermission(code, {
-    headers: _headers
-  });
+  const { accessible, isLoading } = usePermission(code);
   const {
     data,
     size,
@@ -2304,7 +2327,7 @@ var InfiniteList = (props) => {
   } = useSWRInfinite(
     getKey,
     async (arg) => {
-      const response = await axiosInstance({ url: arg, headers: _headers });
+      const response = await axios2({ url: arg, headers: _headers });
       return response.data.data;
     },
     {
@@ -2498,45 +2521,16 @@ if (process.env.NODE_ENV === "development") {
 }
 var NavMenu_default = NavMenu;
 
-// src/components/requireGame/RequireGame.tsx
-init_locale();
-init_toolkitsProvider();
-var { Spin: Spin3 } = Antd2;
-var RequireGame = ({ children }) => {
-  const { usePermissionApiV2, game, isLoading, isGlobal } = useToolkitsStore((s) => s);
-  const { t } = useTranslation();
-  if (isLoading) {
-    return /* @__PURE__ */ jsx(
-      "div",
-      {
-        style: {
-          display: "flex",
-          justifyContent: "center",
-          alignItems: "center",
-          height: 200
-        },
-        children: /* @__PURE__ */ jsx(Spin3, {})
-      }
-    );
-  }
-  if (usePermissionApiV2 && !isGlobal && !game) {
-    return /* @__PURE__ */ jsx(Empty, { image: Empty.PRESENTED_IMAGE_SIMPLE, description: t("RequireGame.description") });
-  }
-  return /* @__PURE__ */ jsx(Fragment$1, { children }, game?.id ?? game?.game_id);
-};
-var RequireGame_default = RequireGame;
-
 // src/components/layout/Layout.tsx
 init_toolkitsProvider();
 
 // src/components/userWidget/UserWidget.tsx
 init_locale();
 init_toolkitsProvider();
-var UserWidget = (props) => {
-  const { logoutRedirectUrl } = props;
+var UserWidget = () => {
   const { t } = useTranslation();
   const navigate = useNavigate();
-  const { clearToken, getUser } = useToolkitsStore((state) => state);
+  const { clearToken, getUser, signInPath } = useToolkitsStore((s) => s);
   const user = getUser();
   const items = [
     {
@@ -2547,7 +2541,7 @@ var UserWidget = (props) => {
         {
           onClick: () => {
             clearToken();
-            navigate(logoutRedirectUrl);
+            navigate(signInPath);
           },
           children: t("UserWidget.signOutText")
         }
@@ -2631,31 +2625,19 @@ var useLayoutStore = create()(
     }
   )
 );
-var { Spin: Spin4, theme: theme3 } = Antd2;
-var { Header, Sider, Content } = Antd2.Layout;
+var { Spin: Spin3, theme: theme3 } = Antd;
+var { Header, Sider, Content } = Antd.Layout;
 var Layout2 = (props) => {
-  const {
-    menuCollapsible,
-    isMenuLoading,
-    title,
-    items,
-    headerExtra,
-    hideGameSelect,
-    children,
-    navWidth,
-    logoutRedirectUrl,
-    filter,
-    onGameChange
-  } = props;
+  const { menuCollapsible, isMenuLoading, title, items, headerExtra, children, navWidth, filter, onGameChange } = props;
   const {
     token: { colorBgContainer, colorBorder }
   } = theme3.useToken();
-  const usePermissionApiV2 = useToolkitsStore((state) => state.usePermissionApiV2);
+  const { usePermissionApiV2, hideGame } = useToolkitsStore((s) => s);
   const { collapsed, setCollapsed } = useLayoutStore();
   const onCollapse = async () => {
     setCollapsed(!collapsed);
   };
-  return /* @__PURE__ */ jsxs(Antd2.Layout, { children: [
+  return /* @__PURE__ */ jsxs(Antd.Layout, { children: [
     /* @__PURE__ */ jsxs(
       Sider,
       {
@@ -2680,7 +2662,7 @@ var Layout2 = (props) => {
         ]
       }
     ),
-    /* @__PURE__ */ jsxs(Antd2.Layout, { children: [
+    /* @__PURE__ */ jsxs(Antd.Layout, { children: [
       /* @__PURE__ */ jsx(
         Header,
         {
@@ -2699,12 +2681,12 @@ var Layout2 = (props) => {
                   onClick: onCollapse
                 }
               ),
-              usePermissionApiV2 && !hideGameSelect && /* @__PURE__ */ jsx(GameSelect_default, { filter, onGameChange }),
+              usePermissionApiV2 && !hideGame && /* @__PURE__ */ jsx(GameSelect_default, { filter, onGameChange }),
               headerExtra?.left?.map((extra) => /* @__PURE__ */ jsx("span", { children: extra.children }, extra.key))
             ] }),
             /* @__PURE__ */ jsxs(Space, { size: "small", split: /* @__PURE__ */ jsx(Divider, { type: "vertical" }), children: [
               headerExtra?.right?.map((extra) => /* @__PURE__ */ jsx("span", { children: extra.children }, extra.key)),
-              /* @__PURE__ */ jsx(UserWidget_default, { logoutRedirectUrl })
+              /* @__PURE__ */ jsx(UserWidget_default, {})
             ] })
           ] })
         }
@@ -2721,7 +2703,7 @@ var Layout2 = (props) => {
             Suspense,
             {
               fallback: /* @__PURE__ */ jsx(
-                Spin4,
+                Spin3,
                 {
                   style: {
                     display: "flex",
@@ -2731,7 +2713,7 @@ var Layout2 = (props) => {
                   }
                 }
               ),
-              children: /* @__PURE__ */ jsx(RequireGame_default, { children })
+              children
             }
           )
         }
@@ -2746,15 +2728,11 @@ init_permissionButton();
 init_queryList();
 
 // src/components/requirePermission/RequirePermission.tsx
-init_constants();
 init_permission();
 init_locale();
 var RequirePermission = (props) => {
-  const { code, isGlobal, children } = props;
-  const { accessible, isValidating } = usePermission(
-    code,
-    isGlobal ? { headers: { [APP_ID_HEADER]: "global" } } : void 0
-  );
+  const { code, children } = props;
+  const { accessible, isValidating } = usePermission(code);
   const { t } = useTranslation();
   if (isValidating) {
     return /* @__PURE__ */ jsx(
@@ -2780,9 +2758,6 @@ var RequirePermission_default = RequirePermission;
 init_toolkitsProvider();
 init_constants();
 init_menu();
-init_formModal();
-init_modal();
-init_permission();
 var MenuItemList2 = lazy(() => Promise.resolve().then(() => (init_menuItemList(), menuItemList_exports)));
 var CreateMenuItem2 = lazy(() => Promise.resolve().then(() => (init_createMenuItem(), createMenuItem_exports)));
 var UpdateMenuItem = lazy(() => Promise.resolve().then(() => (init_updateMenuItem(), updateMenuItem_exports)));
@@ -2820,7 +2795,7 @@ var NotFound = (props) => {
 var notFound_default = NotFound;
 init_locale();
 init_queryList();
-init_constants();
+init_toolkitsProvider();
 var { Option } = Select;
 var OperationLogList = () => {
   const { t } = useTranslation();
@@ -2883,7 +2858,6 @@ var OperationLogList = () => {
       columns,
       tableLayout: "fixed",
       url: "/api/usystem/log/list",
-      headers: { [APP_ID_HEADER]: "global" },
       getTotal: (response) => response?.Total,
       getDataSource: (response) => response?.List,
       renderForm: (form) => /* @__PURE__ */ jsxs(Form, { form, layout: "inline", children: [
@@ -2898,7 +2872,7 @@ var OperationLogList = () => {
     }
   ) });
 };
-var operationLogList_default = OperationLogList;
+var operationLogList_default = withContext(OperationLogList, { isGlobal: true });
 var UserList2 = lazy(() => Promise.resolve().then(() => (init_userList(), userList_exports)));
 var RoleList2 = lazy(() => Promise.resolve().then(() => (init_roleList(), roleList_exports)));
 var RoleDetail2 = lazy(() => Promise.resolve().then(() => (init_roleDetail(), roleDetail_exports)));
@@ -2979,9 +2953,8 @@ var SignIn = (props) => {
 var signIn_default = SignIn;
 
 // src/index.ts
-init_axios();
 init_storage();
 
-export { APP_ID_HEADER, DynamicTags_default as DynamicTags, ExpandableParagraph_default as ExpandableParagraph, FRONTEND_ROUTE_PREFIX, FilterFormWrapper_default as FilterFormWrapper, Highlight_default as Highlight, InfiniteList_default as InfiniteList, Interceptor, Layout_default as Layout, NavMenu_default as NavMenu, notFound_default as NotFound, operationLogList_default as OperationLogList, PermissionButton_default as PermissionButton, QueryList_default as QueryList, QueryListAction, RequireGame_default as RequireGame, RequirePermission_default as RequirePermission, SSO_URL, signIn_default as SignIn, Provider_default as ToolkitsProvider, UserWidget_default as UserWidget, axiosInstance, menu_default as menuRoutes, mixedStorage, permission_default as permissionRoutes, toolkitsStore, useFormModal, useLayoutStore, useMenuList, useModal, useModalStore, usePermission, usePermissions, useQueryListStore, useToolkitsStore };
+export { APP_ID_HEADER, DynamicTags_default as DynamicTags, ExpandableParagraph_default as ExpandableParagraph, FRONTEND_ROUTE_PREFIX, FilterFormWrapper_default as FilterFormWrapper, Highlight_default as Highlight, InfiniteList_default as InfiniteList, Layout_default as Layout, NavMenu_default as NavMenu, notFound_default as NotFound, operationLogList_default as OperationLogList, PermissionButton_default as PermissionButton, QueryList_default as QueryList, QueryListAction, RequirePermission_default as RequirePermission, SSO_URL, signIn_default as SignIn, Provider_default as ToolkitsProvider, UserWidget_default as UserWidget, menu_default as menuRoutes, mixedStorage, permission_default as permissionRoutes, toolkitsStore, useFormModal, useLayoutStore, useMenuList, useModal, useModalStore, usePermission, usePermissions, useQueryListStore, useToolkitsStore, withContext };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map