react-toolkits 2.11.2 → 2.11.3

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # react-toolkits
 
+## 2.11.3
+
+### Patch Changes
+
+- fc98255: fix: registor interceptors must be sync
+
 ## 2.11.2
 
 ### Patch Changes

package/lib/index.d.ts

@@ -366,7 +366,7 @@ declare const createToolkitsStore: (initProps?: Partial<ContextSlice>) => Omit<z
 };
 
 type ToolkitsStore = ReturnType<typeof createToolkitsStore>;
-declare function useToolkitsStore<T>(selector: (state: ToolkitsState, equalityFn?: (left: T, right: T) => boolean) => T): T;
+declare function useToolkitsStore<T>(selector: (state: ToolkitsState) => T): T;
 type ToolkitsProviderProps = PropsWithChildren<Partial<ContextSlice>>;
 declare let toolkitsStore: ToolkitsStore;
 declare const ToolkitsProvider: FC<ToolkitsProviderProps>;
@@ -436,7 +436,30 @@ declare function usePermission(code?: string, config?: Omit<AxiosRequestConfig,
     isLoading: boolean;
 };
 
-declare const MenuItemList: () => react_jsx_runtime.JSX.Element;
+interface Permission {
+    label: string;
+    value: string;
+    route: string;
+    method?: string;
+}
+interface MenuListItem {
+    id: number;
+    category: string;
+    is_common: boolean;
+    is_model: boolean;
+    model_name: 'change' | 'recharge';
+    type: string;
+    permissions: Permission[];
+    front_route: string;
+    order: number;
+}
+
+declare function useMenuList(): swr.SWRResponse<MenuListItem[], any, any>;
+
+declare const MenuItemList: {
+    (): react_jsx_runtime.JSX.Element;
+    useMenuList: typeof useMenuList;
+};
 
 interface NotFoundProps {
     redirectUrl?: string;

package/lib/index.js

@@ -1,11 +1,10 @@
 import axios, { AxiosHeaders } from 'axios';
 import { jwtDecode } from 'jwt-decode';
-import { create, createStore } from 'zustand';
+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, Row, Col, Breadcrumb, Skeleton, Descriptions, Switch, Popconfirm, 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';
 import { has, template, get, isEqual } from 'lodash-es';
 import { flushSync } from 'react-dom';
@@ -276,87 +275,85 @@ var init_axios = __esm({
     Interceptor = ({ children }) => {
       const state = useToolkitsStore((s) => s);
       const { notification } = App.useApp();
-      useEffect(() => {
+      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}`);
+      }
+      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);
             }
-            if (!headers.has(APP_ID_HEADER) && state.usePermissionApiV2 && state.game) {
-              if (state.gameApiV2) {
-                headers.set(APP_ID_HEADER, state.game.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 {
-                headers.set(APP_ID_HEADER, state.game.id);
+                notification.error({
+                  message: "Request failed",
+                  description: data.msg
+                });
+                throw new Error(data.msg);
               }
             }
-            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;
               }
-              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 ToolkitsProvider \u4E2D\u914D\u7F6E signInPath");
-                  }
-                } else if (response.status === 403) {
-                  notification.error({
-                    message: "Forbidden",
-                    description: "You do not have permission to access this resource."
-                  });
+              if (response.status === 401 || response.status === 412) {
+                state.clearToken?.();
+                if (state.signInPath) {
+                  if (response.status === 412) ;
+                  window.location.replace(state?.signInPath);
                 } else {
-                  notification.error({
-                    message: "Request failed",
-                    description: response.data.msg
-                  });
-                  throw new Error(response.data.msg);
+                  throw new Error("\u8BF7\u5728 ToolkitsProvider \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;
             }
-          );
-        }
-        return () => {
-          instance.interceptors.request.eject(requestInterceptorId);
-          instance.interceptors.response.eject(responseInterceptorId);
-        };
-      }, [state]);
+            throw error;
+          }
+        );
+      }
       return children;
     };
   }
@@ -364,7 +361,7 @@ var init_axios = __esm({
 function useToolkitsStore(selector) {
   const store = useContext(ToolkitsContext);
   if (!store) throw new Error("Missing ToolkitsProvider in the tree");
-  return useStoreWithEqualityFn(store, selector);
+  return useStore(store, selector);
 }
 var ToolkitsContext, toolkitsStore, ToolkitsProvider, Provider_default;
 var init_Provider = __esm({
@@ -378,7 +375,7 @@ var init_Provider = __esm({
       if (!storeRef.current) {
         storeRef.current = createToolkitsStore(restProps);
       }
-      return /* @__PURE__ */ jsx(App, { children: /* @__PURE__ */ jsx(ToolkitsContext.Provider, { value: storeRef.current, children: /* @__PURE__ */ jsx(App, { children: /* @__PURE__ */ jsx(Interceptor, { children }) }) }) });
+      return /* @__PURE__ */ jsx(ToolkitsContext.Provider, { value: storeRef.current, children: /* @__PURE__ */ jsx(Interceptor, { children }) });
     };
     if (process.env.NODE_ENV !== "production") {
       ToolkitsProvider.displayName = "ToolkitsProvider";
@@ -2419,23 +2416,23 @@ init_toolkitsProvider();
 init_axios();
 function useCreateMenu() {
   return useSWRMutation2(
-    "/api/usystem/resource/set",
+    "/api/usystem/menu/set",
     (url4, { arg }) => instance.post(url4, { ...arg, id: 0 })
   );
 }
 function useUpdateMenu() {
-  return useSWRMutation2("/api/usystem/resource/set", (url4, { arg }) => instance.post(url4, arg));
+  return useSWRMutation2("/api/usystem/menu/set", (url4, { arg }) => instance.post(url4, arg));
 }
 function useMenuList() {
   const game = useToolkitsStore((state) => state.game);
   return useSWRImmutable(
-    ["/api/usystem/resource/navbar", game],
+    ["/api/usystem/menu/navbar", game],
     ([url4]) => instance(url4).then((response) => response.data.data)
   );
 }
 function useRemoveMenu() {
   return useSWRMutation2(
-    "/api/usystem/resource/delete",
+    "/api/usystem/menu/delete",
     (url4, { arg }) => instance.post(url4, null, { params: { id: arg } })
   );
 }
@@ -2625,6 +2622,7 @@ var MenuItemList = () => {
     updateModal
   ] });
 };
+MenuItemList.useMenuList = useMenuList;
 var menu_default = MenuItemList;
 
 // src/pages/notFound/index.tsx