react-toolkits 2.9.25 → 2.9.27

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # react-toolkits
 
+## 2.9.27
+
+### Patch Changes
+
+- b5384d7: feat: parse error message when http code out of 2xx range
+  ```
+
+  ```
+
+## 2.9.26
+
+### Patch Changes
+
+- 080eeb6: chore: ensure form instance be passed to Form
+
 ## 2.9.25
 
 ### Patch Changes

package/lib/index.d.ts

@@ -445,9 +445,7 @@ declare const useTokenStore: zustand.UseBoundStore<Omit<zustand.StoreApi<TokenSt
         }>>;
     };
 }>;
-declare function useTokenValidation(options?: {
-    skip: false;
-}): swr.SWRResponse<RequestResponse<any>, any, any>;
+declare function useTestToken(): swr.SWRResponse<RequestResponse<any>, any, any>;
 
 interface NotFoundProps {
     redirectUrl?: string;
@@ -468,4 +466,4 @@ declare const SignIn: FC<SignInProps>;
 
 declare const mixedStorage: StateStorage;
 
-export { APP_ID_HEADER_NAME, 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, RequireGame, RequirePermission, type RequirePermissionProps, SSO_URL, 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 { APP_ID_HEADER_NAME, 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, RequireGame, RequirePermission, type RequirePermissionProps, SSO_URL, 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, useTestToken, useTokenStore, useToolkitsContext };

package/lib/index.js

@@ -483,15 +483,13 @@ var init_requireGame = __esm({
     init_RequireGame();
   }
 });
-function useTokenValidation(options) {
+function useTestToken() {
   const usePermissionApiV2 = useToolkitsContext((state) => state.usePermissionApiV2);
   return useSWRImmutable(
-    !options?.skip ? usePermissionApiV2 ? "/api/usystem/user/checkV2" : "/api/usystem/user/check" : null,
+    usePermissionApiV2 ? "/api/usystem/user/checkV2" : "/api/usystem/user/check",
     (url) => request(url, {
       method: "POST",
-      body: {
-        permissions: ["100001"]
-      },
+      body: { permissions: [] },
       headers: { [APP_ID_HEADER_NAME]: "global" }
     })
   );
@@ -891,7 +889,15 @@ async function request(url, opts = {}) {
   });
   const response = await fetch(url, requestOpts);
   if (!response.ok) {
-    throw new RequestError({ status: response.status });
+    try {
+      const json = await response.json();
+      throw new Error(json.msg);
+    } catch (error) {
+      throw new RequestError({
+        status: response.status,
+        message: error?.message ?? "Can't parse response."
+      });
+    }
   }
   const responseInterceptor = contextStore.getState().interceptor?.response;
   if (typeof responseInterceptor === "function") {
@@ -940,32 +946,33 @@ var init_request = __esm({
 });
 function usePermissions(codes, options) {
   const usePermissionApiV2 = useToolkitsContext((state) => state.usePermissionApiV2);
+  const url = usePermissionApiV2 ? "/api/usystem/user/checkV2" : "/api/usystem/user/check";
+  const key = codes.length > 0 ? {
+    url,
+    codes,
+    options
+  } : null;
   const { data, isValidating, isLoading } = useSWR3(
-    codes.length > 0 ? [usePermissionApiV2 ? "/api/usystem/user/checkV2" : "/api/usystem/user/check", codes, options] : null,
-    ([url]) => request(url, {
-      ...options,
-      method: "POST",
-      body: {
-        permissions: codes
-      }
-    }).then((response) => {
-      if (response.data?.has_all) {
-        return codes.reduce(
-          (acc, curr) => {
-            acc[curr] = true;
-            return acc;
-          },
-          {}
-        );
-      }
-      return codes.reduce(
-        (acc, curr) => {
-          acc[curr] = response.data?.[curr] ?? false;
+    key,
+    async () => {
+      const res = await request(url, {
+        ...options,
+        method: "POST",
+        body: {
+          permissions: codes
+        }
+      });
+      if (res.data?.has_all) {
+        return codes.reduce((acc, curr) => {
+          acc[curr] = true;
           return acc;
-        },
-        {}
-      );
-    }),
+        }, {});
+      }
+      return codes.reduce((acc, curr) => {
+        acc[curr] = res.data?.[curr] ?? false;
+        return acc;
+      }, {});
+    },
     {
       revalidateOnFocus: false
     }
@@ -1271,7 +1278,7 @@ var init_QueryList = __esm({
       if (!accessible) {
         return /* @__PURE__ */ jsx(Result, { status: 403, subTitle: t("global.noEntitlement") });
       }
-      const formRenderer = typeof renderForm === "function" && /* @__PURE__ */ jsx(
+      const formRenderer = typeof renderForm === "function" ? /* @__PURE__ */ jsx(
         FilterFormWrapper_default,
         {
           showReset,
@@ -1287,7 +1294,11 @@ var init_QueryList = __esm({
             }
           })
         }
+      ) : (
+        // 屏蔽 Form 组件的警告（Instance created by `useForm` is not connected to any Form element. Forget to pass `form` prop?）
+        /* @__PURE__ */ jsx(Form, { form: _form })
       );
+      const renderFooter = footer && (() => footer(data));
       return /* @__PURE__ */ jsxs("div", { children: [
         formRenderer,
         typeof tableExtra === "function" ? tableExtra(_form, data) : tableExtra,
@@ -1298,7 +1309,7 @@ var init_QueryList = __esm({
             dataSource,
             loading: isValidating,
             pagination,
-            footer: () => footer?.(data)
+            footer: renderFooter
           }
         )
       ] });
@@ -2780,6 +2791,6 @@ var signIn_default = SignIn;
 init_request();
 init_storage();
 
-export { APP_ID_HEADER_NAME, Provider_default as ContextProvider, 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, RequestError, RequireGame_default as RequireGame, RequirePermission_default as RequirePermission, SSO_URL, signIn_default as SignIn, UserWidget_default as UserWidget, contextStore, mixedStorage, permission_default as permissionRoutes, request, useFormModal, useGameStore, useLayoutStore, useModal, useModalStore, usePermission, usePermissions, useQueryListStore, useTokenStore, useTokenValidation, useToolkitsContext };
+export { APP_ID_HEADER_NAME, Provider_default as ContextProvider, 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, RequestError, RequireGame_default as RequireGame, RequirePermission_default as RequirePermission, SSO_URL, signIn_default as SignIn, UserWidget_default as UserWidget, contextStore, mixedStorage, permission_default as permissionRoutes, request, useFormModal, useGameStore, useLayoutStore, useModal, useModalStore, usePermission, usePermissions, useQueryListStore, useTestToken, useTokenStore, useToolkitsContext };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map