react-toolkits 2.11.0 → 2.11.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # react-toolkits
 
+## 2.11.1
+
+### Patch Changes
+
+- d685357: feat: export axios instance
+
 ## 2.11.0
 
 ### Minor Changes

package/lib/index.d.ts

@@ -4,6 +4,7 @@ import { ParagraphProps } from 'antd/es/typography/Paragraph';
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import { FormInstance, MenuProps, ButtonProps, ModalProps, FormProps } from 'antd';
 import { TableProps } from 'antd/es/table';
+import * as axios from 'axios';
 import { AxiosHeaderValue, InternalAxiosRequestConfig, AxiosResponse, AxiosInterceptorOptions, AxiosRequestConfig } from 'axios';
 import { ItemType, SubMenuType, MenuItemGroupType, MenuItemType } from 'antd/es/menu/interface';
 import { Merge } from 'ts-essentials';
@@ -454,4 +455,14 @@ declare const SignIn: FC<SignInProps>;
 
 declare const mixedStorage: StateStorage;
 
-export { APP_ID_HEADER, 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, RequireGame, RequirePermission, type RequirePermissionProps, SSO_URL, SignIn, ToolkitsProvider, type ToolkitsProviderProps, type UseFormModalProps, type UseModalOperation, type UseModalProps, UserWidget, type UserWidgetProps, mixedStorage, _default as permissionRoutes, toolkitsStore, useFormModal, useLayoutStore, useModal, useModalStore, usePermission, usePermissions, useQueryListStore, useToolkitsStore };
+declare const instance: axios.AxiosInstance;
+declare function registerInterceptors(): void;
+type JsonData<T = any> = {
+    code?: number;
+    status?: number;
+    errno?: number;
+    data: T;
+    msg: string;
+};
+
+export { APP_ID_HEADER, DynamicTags, type DynamicTagsProps, ExpandableParagraph, type ExpandableParagraphProps, FilterFormWrapper, type FilterFormWrapperProps, type Game, Highlight, type HighlightProps, InfiniteList, type InfiniteListProps, type JsonData, Layout, type LayoutState, NavMenu, type NavMenuItem, NotFound, OperationLogList, PermissionButton, type PermissionButtonProps, QueryList, QueryListAction, type QueryListProps, type QueryListRef, RequireGame, RequirePermission, type RequirePermissionProps, SSO_URL, SignIn, ToolkitsProvider, type ToolkitsProviderProps, type UseFormModalProps, type UseModalOperation, type UseModalProps, UserWidget, type UserWidgetProps, instance, mixedStorage, _default as permissionRoutes, registerInterceptors, toolkitsStore, useFormModal, useLayoutStore, useModal, useModalStore, usePermission, usePermissions, useQueryListStore, useToolkitsStore };

package/lib/index.js

@@ -1,9 +1,9 @@
-import axios2, { AxiosHeaders } from 'axios';
+import axios, { AxiosHeaders } from 'axios';
 import { jwtDecode } from 'jwt-decode';
 import { create, createStore } from 'zustand';
 import { persist, createJSONStorage } from 'zustand/middleware';
 import * as Antd2 from 'antd';
-import { Spin, Menu, Modal, Form, theme, Space, Input, Tag, Typography, Result, Table, Button, Empty, Dropdown, Divider, Card, Select, Alert, App, Row, Col, Breadcrumb, Skeleton, Descriptions, Tooltip, notification, Collapse, Checkbox } from 'antd';
+import { Spin, Menu, notification, Modal, Form, theme, Space, Input, Tag, Typography, Result, Table, Button, Empty, Dropdown, Divider, Card, Select, Alert, App, Row, Col, Breadcrumb, Skeleton, Descriptions, Tooltip, 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 { useStoreWithEqualityFn } from 'zustand/traditional';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
@@ -43,7 +43,7 @@ var init_storage = __esm({
         sessionStorage.setItem(name, value);
         localStorage.setItem(name, value);
       },
-      removeItem: async (name) => {
+      removeItem(name) {
         sessionStorage.removeItem(name);
         localStorage.removeItem(name);
       }
@@ -177,10 +177,10 @@ var init_game = __esm({
           set({ isLoading: true });
           let games;
           if (apiV2) {
-            const response = await axios2.get("/api/game/list");
+            const response = await axios.get("/api/game/list");
             games = response.data.data.list ?? [];
           } else {
-            const response = await axios2.get("/api/usystem/game/all");
+            const response = await axios.get("/api/usystem/game/all");
             games = response.data.data ?? [];
           }
           set({ games });
@@ -204,7 +204,7 @@ var init_token = __esm({
         if (token) {
           try {
             return jwtDecode(token);
-          } catch (_) {
+          } catch (error) {
             return null;
           }
         }
@@ -262,101 +262,100 @@ var init_constants = __esm({
     APP_ID_HEADER = "App-ID";
   }
 });
-var instance, requestInterceptorId, responseInterceptorId, registerInterceptors, axios_default;
+function registerInterceptors() {
+  const state = toolkitsStore?.getState() ?? {};
+  if (requestInterceptorId) {
+    instance.interceptors.request.eject(requestInterceptorId);
+  }
+  if (responseInterceptorId) {
+    instance.interceptors.response.eject(responseInterceptorId);
+  }
+  const interceptors = state.interceptors;
+  if (interceptors?.request) {
+    requestInterceptorId = instance.interceptors.request.use(...interceptors.request);
+  } else {
+    requestInterceptorId = instance.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 (!headers.has(APP_ID_HEADER) && state.usePermissionApiV2 && state.game) {
+        if (state.gameApiV2) {
+          headers.set(APP_ID_HEADER, state.game.game_id);
+        } else {
+          headers.set(APP_ID_HEADER, state.game.id);
+        }
+      }
+      headers.set("Accept", config.responseType === "blob" ? "application/octet-stream" : "application/json");
+      config.headers = headers;
+      return config;
+    });
+  }
+  if (interceptors?.response) {
+    responseInterceptorId = instance.interceptors.response.use(...interceptors.response);
+  } else {
+    responseInterceptorId = instance.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);
+          }
+        }
+        return response;
+      },
+      (error) => {
+        if (axios.isAxiosError(error)) {
+          const response = error.response;
+          if (!response) {
+            throw error;
+          }
+          if (response.status === 401 || response.status === 412) {
+            state?.clearToken();
+            if (state.signInPath) {
+              if (response.status === 412) ;
+              window.location.replace(state?.signInPath);
+            } else {
+              throw new Error("\u8BF7\u5728 ContextProvider \u4E2D\u914D\u7F6E 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;
+      }
+    );
+  }
+}
+var instance, requestInterceptorId, responseInterceptorId;
 var init_axios = __esm({
   "src/utils/axios.ts"() {
     init_toolkitsProvider();
     init_constants();
-    instance = axios2.create({
+    instance = axios.create({
       baseURL: "/",
       headers: {
         "Content-Type": "application/json; charset=utf-8"
       }
     });
-    registerInterceptors = () => {
-      const state = toolkitsStore?.getState() ?? {};
-      if (requestInterceptorId) {
-        instance.interceptors.request.eject(requestInterceptorId);
-      }
-      if (responseInterceptorId) {
-        instance.interceptors.response.eject(responseInterceptorId);
-      }
-      const interceptors = state.interceptors;
-      if (interceptors?.request) {
-        requestInterceptorId = instance.interceptors.request.use(...interceptors.request);
-      } else {
-        requestInterceptorId = instance.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 (!headers.has(APP_ID_HEADER) && state.usePermissionApiV2 && state.game) {
-            if (state.gameApiV2) {
-              headers.set(APP_ID_HEADER, state.game.game_id);
-            } else {
-              headers.set(APP_ID_HEADER, state.game.id);
-            }
-          }
-          headers.set("Accept", config.responseType === "blob" ? "application/octet-stream" : "application/json");
-          config.headers = headers;
-          return config;
-        });
-      }
-      if (interceptors?.response) {
-        responseInterceptorId = instance.interceptors.response.use(...interceptors.response);
-      } else {
-        responseInterceptorId = instance.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) {
-                return response;
-              } else {
-                notification.error({
-                  message: "Request failed",
-                  description: data.msg
-                });
-                throw new Error(data.msg);
-              }
-            }
-            return response;
-          },
-          (error) => {
-            console.log(axios2.isAxiosError(error));
-            if (axios2.isAxiosError(error)) {
-              const response = error.response;
-              if (!response) {
-                throw error;
-              }
-              if (response.status === 401 || response.status === 412) {
-                state?.clearToken();
-                if (state.signInPath) {
-                  if (response.status === 412) ;
-                  window.location.replace(state?.signInPath);
-                } else {
-                  throw new Error("\u8BF7\u5728 ContextProvider \u4E2D\u914D\u7F6E 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;
-          }
-        );
-      }
-    };
-    axios_default = instance;
+    registerInterceptors();
   }
 });
 function useToolkitsStore(selector) {
@@ -502,12 +501,12 @@ var init_axios2 = __esm({
   "src/hooks/axios.ts"() {
     init_axios();
     useSWRAxios = (key, swrConfig) => {
-      return useSWR(key, (config) => axios_default.request(config).then((response) => response.data.data), swrConfig);
+      return useSWR(key, (config) => instance.request(config).then((response) => response.data.data), swrConfig);
     };
     useSWRImmutableAxios = (axiosConfig, swrConfig) => {
       return useSWRImmutable(
         axiosConfig,
-        (config) => axios_default.request(config).then((response) => response.data.data),
+        (config) => instance.request(config).then((response) => response.data.data),
         swrConfig
       );
     };
@@ -693,7 +692,7 @@ var init_QueryList = __esm({
       const { data, isValidating } = useSWR(
         key,
         async () => {
-          const response = await axios_default.request(requestConfig);
+          const response = await instance.request(requestConfig);
           return response.data.data;
         },
         {
@@ -966,7 +965,7 @@ function useCreateRole() {
     usePermissionApiV2 ? "/api/usystem/role/createV2" : "/api/usystem/role/create",
     (url3, {
       arg
-    }) => axios_default.post(url3, arg, { headers: { [APP_ID_HEADER]: "global" } })
+    }) => instance.post(url3, arg, { headers: { [APP_ID_HEADER]: "global" } })
   );
 }
 function useUpdateRole() {
@@ -975,7 +974,7 @@ function useUpdateRole() {
     usePermissionApiV2 ? "/api/usystem/role/updateV2" : "/api/usystem/role/update",
     (url3, {
       arg
-    }) => axios_default.post(url3, arg, { headers: { [APP_ID_HEADER]: "global" } })
+    }) => instance.post(url3, arg, { headers: { [APP_ID_HEADER]: "global" } })
   );
 }
 function useRemoveRole() {
@@ -983,7 +982,7 @@ function useRemoveRole() {
     "/api/usystem/role/delete",
     (url3, {
       arg
-    }) => axios_default.post(url3, arg, { headers: { [APP_ID_HEADER]: "global" } })
+    }) => instance.post(url3, arg, { headers: { [APP_ID_HEADER]: "global" } })
   );
 }
 function useCreateUser() {
@@ -991,7 +990,7 @@ function useCreateUser() {
     "/api/usystem/user/create",
     (url3, {
       arg
-    }) => axios_default.post(url3, arg, { headers: { [APP_ID_HEADER]: "global" } })
+    }) => instance.post(url3, arg, { headers: { [APP_ID_HEADER]: "global" } })
   );
 }
 function useUpdateUser() {
@@ -999,7 +998,7 @@ function useUpdateUser() {
     "/api/usystem/user/update",
     (url3, {
       arg
-    }) => axios_default.post(url3, arg, { headers: { [APP_ID_HEADER]: "global" } })
+    }) => instance.post(url3, arg, { headers: { [APP_ID_HEADER]: "global" } })
   );
 }
 function useRemoveUser() {
@@ -1007,7 +1006,7 @@ function useRemoveUser() {
     "/api/usystem/user/delete",
     (url3, {
       arg
-    }) => axios_default.post(url3, arg, { headers: { [APP_ID_HEADER]: "global" } })
+    }) => instance.post(url3, arg, { headers: { [APP_ID_HEADER]: "global" } })
   );
 }
 var init_hooks2 = __esm({
@@ -1561,7 +1560,7 @@ var init_roleList = __esm({
       const { show: showUpdateModal, modal: updateModal } = useModal3();
       const remove = useRemoveRole();
       const handleUpdateBtnClick = async (record) => {
-        const response = await axios_default.get(
+        const response = await instance.get(
           `/api/usystem/role/info${usePermissionApiV2 ? "V2" : ""}?name=${record.name}`,
           {
             headers: { [APP_ID_HEADER]: "global" }
@@ -1924,7 +1923,7 @@ var InfiniteList = (props) => {
   } = useSWRInfinite(
     getKey,
     async (arg) => {
-      const response = await axios_default({ url: arg, headers: _headers });
+      const response = await instance({ url: arg, headers: _headers });
       return response.data.data;
     },
     {
@@ -1957,7 +1956,7 @@ var InfiniteList = (props) => {
       form.resetFields();
       await form.validateFields({ validateOnly: true });
       setSize(1);
-    } catch (_) {
+    } catch (error) {
       setSize(0);
     }
   };
@@ -2593,7 +2592,8 @@ var signIn_default = SignIn;
 
 // src/index.ts
 init_storage();
+init_axios();
 
-export { APP_ID_HEADER, DynamicTags_default as DynamicTags, ExpandableParagraph_default as ExpandableParagraph, 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, RequireGame_default as RequireGame, RequirePermission_default as RequirePermission, SSO_URL, signIn_default as SignIn, Provider_default as ToolkitsProvider, UserWidget_default as UserWidget, mixedStorage, permission_default as permissionRoutes, toolkitsStore, useFormModal, useLayoutStore, useModal, useModalStore, usePermission, usePermissions, useQueryListStore, useToolkitsStore };
+export { APP_ID_HEADER, DynamicTags_default as DynamicTags, ExpandableParagraph_default as ExpandableParagraph, 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, RequireGame_default as RequireGame, RequirePermission_default as RequirePermission, SSO_URL, signIn_default as SignIn, Provider_default as ToolkitsProvider, UserWidget_default as UserWidget, instance, mixedStorage, permission_default as permissionRoutes, registerInterceptors, toolkitsStore, useFormModal, useLayoutStore, useModal, useModalStore, usePermission, usePermissions, useQueryListStore, useToolkitsStore };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map