react-toolkits 0.0.3 → 0.0.5

package/dist/index.esm.js

@@ -1,14 +1,14 @@
 import { AliyunOutlined, UserAddOutlined, UsergroupAddOutlined, PlusOutlined } from '@ant-design/icons';
-import { App, Spin, Row, Col, Card, Alert, Divider, Space, Button, theme, Layout as Layout$1, Tag, Form, Input, Breadcrumb, Skeleton, Descriptions, Typography, Modal, Tooltip, Result, Table, Select, Menu, Collapse, Checkbox } from 'antd';
-import { lazy, useState, useRef, useCallback, useMemo, useEffect, forwardRef, useId, useImperativeHandle } from 'react';
+import { Spin, Row, Col, Card, Alert, Divider, Space, Button, Result, theme, Layout as Layout$1, App, Tag, Form, Input, Breadcrumb, Skeleton, Descriptions, Typography, Modal, Tooltip, Table, Select, Menu, Collapse, Checkbox } from 'antd';
+import { lazy, useState, useRef, useCallback, useMemo, useEffect, Suspense, forwardRef, useId, useImperativeHandle } from 'react';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import { createPortal, flushSync } from 'react-dom';
 import { createRoot } from 'react-dom/client';
 import { create } from 'zustand';
 import { persist } from 'zustand/middleware';
 import axios from 'axios';
-import { useNavigate, useSearchParams, Navigate, Link, useParams, useLocation } from 'react-router-dom';
 import useSWRImmutable from 'swr/immutable';
+import { useNavigate, useSearchParams, Navigate, Link, useParams, useLocation } from 'react-router-dom';
 import useSWRMutation2 from 'swr/mutation';
 import useSWR from 'swr';
 import logo from './512_orange_nobackground-L6MFCL6M.png';
@@ -353,7 +353,7 @@ function useFormModal(props) {
     setOpen(false);
   }, []);
   const Modal2 = useMemo(() => {
-    return /* @__PURE__ */ jsx(FormModal_default, __spreadProps(__spreadValues({}, restProps), { open, closeFn: closeModal, title, onConfirm, children: content }));
+    return /* @__PURE__ */ jsx(FormModal_default, __spreadProps(__spreadValues({ ref: formRef }, restProps), { open, closeFn: closeModal, title, onConfirm, children: content }));
   }, [title, content, restProps, open, closeModal, onConfirm]);
   return {
     Modal: createPortal(Modal2, document.body),
@@ -481,10 +481,7 @@ var init_stores = __esm({
     init_queryTrigger();
   }
 });
-function useFetcher() {
-  const { notification } = App.useApp();
-  const clearToken = useTokenStore((state) => state.clearToken);
-  const navigate = useNavigate();
+function useHttpClient() {
   const token = useTokenStore((state) => state.token);
   const defaultOptions = {
     withCredentials: true
@@ -500,52 +497,34 @@ function useFetcher() {
       if (response.data.code === 0 || response.data.status === 0) {
         return response.data.data;
       }
-      throw new FetcherError(response.data.msg, 0);
+      throw new HttpClientError(response.data.msg, 0);
     },
     (error) => {
       var _a;
       if (error.response) {
         if (error.response.status === 401) {
-          throw new FetcherError("\u672A\u767B\u5F55\u6216\u767B\u5F55\u5DF2\u8FC7\u671F", error.response.status);
+          throw new HttpClientError("\u672A\u767B\u5F55\u6216\u767B\u5F55\u5DF2\u8FC7\u671F", error.response.status);
         } else if (error.response.status === 403) {
-          throw new FetcherError("\u65E0\u6743\u9650\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u8FDB\u884C\u6388\u6743", error.response.status);
+          throw new HttpClientError("\u65E0\u6743\u9650\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u8FDB\u884C\u6388\u6743", error.response.status);
         } else if ([404, 405].includes(error.response.status)) {
-          throw new FetcherError("Not Found or Method not Allowed", error.response.status, true);
+          throw new HttpClientError("Not Found or Method not Allowed", error.response.status, true);
         } else if (error.response.status === 412) {
-          throw new FetcherError("\u672A\u6CE8\u518C\u7528\u6237", error.response.status);
+          throw new HttpClientError("\u672A\u6CE8\u518C\u7528\u6237", error.response.status);
         } else {
-          throw new FetcherError((_a = error.response.data) == null ? void 0 : _a.msg, error.response.status);
+          throw new HttpClientError((_a = error.response.data) == null ? void 0 : _a.msg, error.response.status);
         }
-      } else if (error.request) {
-        console.log(error.request);
       }
-      return Promise.reject(error);
+      throw new HttpClientError("\u65E0\u54CD\u5E94");
     }
   );
-  return (config) => instance.request(config).catch((err) => {
-    switch (err.code) {
-      case 401:
-      case 412:
-        clearToken();
-        navigate(err.code === 401 ? "/login" : "/login?not_registered=1", { replace: true });
-        break;
-      default:
-        if (!err.skip) {
-          notification.error({
-            message: "\u8BF7\u6C42\u51FA\u9519",
-            description: err.message
-          });
-        }
-    }
-    throw err;
-  });
+  return instance;
 }
-var FetcherError;
-var init_use_fetcher = __esm({
-  "src/hooks/use-fetcher.tsx"() {
+var HttpClientError;
+var init_use_http_client = __esm({
+  "src/hooks/use-http-client.tsx"() {
     init_esm_shims();
     init_stores();
-    FetcherError = class extends Error {
+    HttpClientError = class extends Error {
       constructor(message, code, skip = false) {
         super(message);
         this.code = code;
@@ -555,14 +534,15 @@ var init_use_fetcher = __esm({
   }
 });
 function usePermissions(codes) {
-  const fetcher = useFetcher();
+  const httpClient = useHttpClient();
+  const navigate = useNavigate();
   const { data, isLoading } = useSWRImmutable(
     codes.length > 0 ? {
       method: "POST",
       url: "/api/usystem/user/check",
       data: { permissions: codes }
     } : null,
-    (config) => fetcher(config).then((res) => {
+    (config) => httpClient.request(config).then((res) => {
       if (res.has_all) {
         return codes.reduce(
           (acc, curr) => {
@@ -579,7 +559,14 @@ function usePermissions(codes) {
         },
         {}
       );
-    })
+    }),
+    {
+      suspense: true,
+      shouldRetryOnError: false,
+      onError() {
+        navigate("/login");
+      }
+    }
   );
   return { data, isLoading };
 }
@@ -600,7 +587,7 @@ function usePermission(code) {
 var init_use_permission = __esm({
   "src/hooks/use-permission.tsx"() {
     init_esm_shims();
-    init_use_fetcher();
+    init_use_http_client();
   }
 });
 
@@ -608,7 +595,7 @@ var init_use_permission = __esm({
 var init_hooks2 = __esm({
   "src/hooks/index.ts"() {
     init_esm_shims();
-    init_use_fetcher();
+    init_use_http_client();
     init_use_permission();
   }
 });
@@ -640,14 +627,14 @@ var init_QueryList = __esm({
     init_FilterForm();
     QueryList = (props) => {
       const _a = props, { code, confirmText, labelCol, swrKey: swrKey3, renderForm, transformArg, initialValues } = _a, tableProps = __objRest(_a, ["code", "confirmText", "labelCol", "swrKey", "renderForm", "transformArg", "initialValues"]);
-      const { accessible, isValidating } = usePermission(code);
+      const { accessible } = usePermission(code != null ? code : "");
       const [form] = Form.useForm();
       const setTrigger = useQueryTriggerStore((state) => state.setTrigger);
       const [paginationData, setPaginationData] = useState({
         page: 1,
         perPage: 10
       });
-      const fetcher = useFetcher();
+      const httpClient = useHttpClient();
       const { data, isMutating, trigger } = useSWRMutation2(
         swrKey3,
         (_0, _1) => __async(void 0, [_0, _1], function* (key, {
@@ -661,9 +648,8 @@ var init_QueryList = __esm({
           setPaginationData(newPaginationData);
           const values = form.getFieldsValue();
           const fetcherArg = __spreadValues(__spreadValues({}, values), newPaginationData);
-          return fetcher(__spreadProps(__spreadValues({}, key), {
-            // TODO: 兼容 params 与 data
-            params: typeof transformArg === "function" ? transformArg(fetcherArg) : fetcherArg
+          return httpClient.request(__spreadProps(__spreadValues({}, key), {
+            [key.method === "POST" ? "data" : "params"]: typeof transformArg === "function" ? transformArg(fetcherArg) : fetcherArg
           }));
         })
       );
@@ -690,7 +676,7 @@ var init_QueryList = __esm({
       );
       useEffect(() => {
         setTrigger(swrKey3, trigger);
-      }, [swrKey3, setTrigger, trigger]);
+      }, [swrKey3, trigger, setTrigger]);
       useEffect(() => {
         (() => __async(void 0, null, function* () {
           try {
@@ -701,19 +687,6 @@ var init_QueryList = __esm({
           }
         }))();
       }, [form, trigger]);
-      if (isValidating) {
-        return /* @__PURE__ */ jsx(
-          Spin,
-          {
-            style: {
-              display: "flex",
-              justifyContent: "center",
-              alignItems: "center",
-              height: 200
-            }
-          }
-        );
-      }
       if (!accessible) {
         return /* @__PURE__ */ jsx(Result, { status: 403, subTitle: "\u65E0\u6743\u9650\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u8FDB\u884C\u6388\u6743" });
       }
@@ -784,69 +757,57 @@ function useRole(name) {
   });
 }
 function useCreateRole() {
-  const fetcher = useFetcher();
+  const httpClient = useHttpClient();
   return useSWRMutation2(
     "/api/usystem/role/create",
     (url, {
       arg
-    }) => fetcher({ method: "POST", url, data: arg })
+    }) => httpClient.post(url, arg)
   );
 }
 function useUpdateRole() {
-  const fetcher = useFetcher();
+  const httpClient = useHttpClient();
   return useSWRMutation2(
     "/api/usystem/role/update",
     (url, {
       arg
-    }) => fetcher({ method: "POST", url, data: arg })
+    }) => httpClient.post(url, arg)
   );
 }
 function useRemoveRole() {
-  const fetcher = useFetcher();
+  const httpClient = useHttpClient();
   return useSWRMutation2(
     "/api/usystem/role/delete",
     (url, {
       arg
-    }) => fetcher({ method: "POST", url, data: arg })
+    }) => httpClient.post(url, arg)
   );
 }
 function useCreateUser() {
-  const fetcher = useFetcher();
+  const httpClient = useHttpClient();
   return useSWRMutation2(
     "/api/usystem/user/create",
     (url, {
       arg
-    }) => fetcher({
-      method: "POST",
-      url,
-      data: arg
-    })
+    }) => httpClient.post(url, arg)
   );
 }
 function useUpdateUser() {
-  const fetcher = useFetcher();
+  const httpClient = useHttpClient();
   return useSWRMutation2(
     "/api/usystem/user/update",
     (url, {
       arg
-    }) => fetcher({
-      method: "POST",
-      url,
-      data: arg
-    })
+    }) => httpClient.post(url, arg)
   );
 }
 function useRemoveUser() {
-  const fetcher = useFetcher();
+  const httpClient = useHttpClient();
   return useSWRMutation2(
     "/api/usystem/user/delete",
     (url, {
       arg
-    }) => fetcher({
-      method: "POST",
-      url,
-      data: arg
-    })
+    }) => httpClient.post(url, arg)
   );
 }
 var init_hooks3 = __esm({
@@ -1207,7 +1168,7 @@ var init_RoleList = __esm({
     RoleList = () => {
       const { accessible: viewable } = usePermission("200005");
       const { modal, message } = App.useApp();
-      const fetcher = useFetcher();
+      const httpClient = useHttpClient();
       const create4 = useCreateRole();
       const remove = useRemoveRole();
       const update = useUpdateRole();
@@ -1304,9 +1265,7 @@ var init_RoleList = __esm({
                     size: "small",
                     type: "link",
                     onClick: () => __async(void 0, null, function* () {
-                      const role = yield fetcher({
-                        method: "GET",
-                        url: "/api/usystem/role/info",
+                      const role = yield httpClient.get("/api/usystem/role/info", {
                         params: { name: value.name }
                       });
                       showUpdateModal({
@@ -1362,7 +1321,7 @@ var init_RoleList = __esm({
             }
           }
         ],
-        [trigger, viewable, fetcher, modal, message, remove, showUpdateModal]
+        [trigger, viewable, httpClient, modal, message, remove, showUpdateModal]
       );
       return /* @__PURE__ */ jsxs(Fragment, { children: [
         /* @__PURE__ */ jsx(
@@ -1464,7 +1423,6 @@ init_esm_shims();
 // src/constants/index.ts
 init_esm_shims();
 var SSO_URL = "https://idaas.ifunplus.cn/enduser/api/application/plugin_FunPlus/sso/v1";
-new TextEncoder().encode("cc7e0d44fd473002f1c42167459001140ec6389b7353f8088f4d9a95f2f596f2");
 
 // src/pages/Login/index.tsx
 init_stores();
@@ -2869,6 +2827,9 @@ var Default = () => {
   ] });
 };
 var default_default = Default;
+
+// src/pages/Login/index.tsx
+init_hooks2();
 var { Title } = Typography;
 var Login = (props) => {
   const { children } = props;
@@ -2876,6 +2837,7 @@ var Login = (props) => {
   const token = useTokenStore((state) => state.token);
   const setToken = useTokenStore((state) => state.setToken);
   const [showAlert, setShowAlert] = useState(false);
+  const httpClient = useHttpClient();
   const { isLoading } = useSWRImmutable(
     searchParams.has("ticket") ? {
       url: "/api/usystem/user/login",
@@ -2883,6 +2845,7 @@ var Login = (props) => {
         ticket: searchParams.get("ticket")
       }
     } : null,
+    (config) => httpClient.request(config),
     {
       onSuccess: (data) => {
         setToken(data.token);
@@ -2950,6 +2913,31 @@ var Login = (props) => {
 };
 var Login_default = Login;
 
+// src/pages/NoMatch/index.tsx
+init_esm_shims();
+var NoMatch = () => {
+  const navigate = useNavigate();
+  return /* @__PURE__ */ jsx("div", { className: "h-screen flex justify-center items-center", children: /* @__PURE__ */ jsx(
+    Result,
+    {
+      status: "404",
+      title: "404",
+      subTitle: "Sorry, the page you visited does not exist.",
+      extra: /* @__PURE__ */ jsx(
+        Button,
+        {
+          type: "primary",
+          onClick: () => {
+            navigate("/");
+          },
+          children: "Back Home"
+        }
+      )
+    }
+  ) });
+};
+var NoMatch_default = NoMatch;
+
 // src/pages/permission/index.tsx
 init_esm_shims();
 var UserList2 = lazy(() => Promise.resolve().then(() => (init_UserList(), UserList_exports)));
@@ -3038,7 +3026,7 @@ var NavBar = (props) => {
   const location = useLocation();
   const flattenItems = useMemo(() => flatItems(items != null ? items : []), [items]);
   const codes = flattenItems.map((item) => item.code).filter(Boolean);
-  const { data: permissions, isLoading } = usePermissions(codes);
+  const { data: permissions } = usePermissions(codes);
   const internalItems = useMemo(() => transformItems(items != null ? items : [], permissions), [items, permissions]);
   const openKeys = useMenuStore((state) => state.openKeys);
   const selectedKeys = useMenuStore((state) => state.selectedKeys);
@@ -3063,19 +3051,6 @@ var NavBar = (props) => {
       setOpenKeys(keypath);
     }
   }, [flattenItems, location, setOpenKeys, setSelectedKeys]);
-  if (isLoading) {
-    return /* @__PURE__ */ jsx(
-      Spin,
-      {
-        style: {
-          display: "flex",
-          justifyContent: "center",
-          alignItems: "center",
-          height: "calc(100vh - 64px)"
-        }
-      }
-    );
-  }
   return /* @__PURE__ */ jsx(
     Menu,
     {
@@ -3089,58 +3064,96 @@ var NavBar = (props) => {
   );
 };
 var NavBar_default = NavBar;
+
+// src/layouts/Layout.tsx
+init_hooks2();
 var { Header, Sider, Content } = Layout$1;
+var { ErrorBoundary } = Alert;
 var Layout = (props) => {
   const { title, items, header, children } = props;
   const {
     token: { colorBgContainer, colorBorder }
   } = theme.useToken();
-  return /* @__PURE__ */ jsxs(Layout$1, { hasSider: true, className: "h-screen", children: [
-    /* @__PURE__ */ jsxs(
-      Sider,
-      {
-        width: 256,
-        style: {
-          overflow: "auto",
-          height: "100vh",
-          position: "fixed",
-          left: 0,
-          top: 0,
-          bottom: 0,
-          borderRightWidth: 1,
-          borderRightStyle: "solid",
-          borderRightColor: colorBorder
-        },
-        theme: "light",
-        children: [
-          /* @__PURE__ */ jsxs("div", { className: "flex items-end px-6 py-4", children: [
-            /* @__PURE__ */ jsx("img", { src: logo, alt: "logo", className: "w-8 h-8" }),
-            /* @__PURE__ */ jsx(Link, { className: "font-bold text-lg ml-2", to: "/", children: title })
-          ] }),
-          /* @__PURE__ */ jsx(NavBar_default, { items })
-        ]
-      }
-    ),
-    /* @__PURE__ */ jsxs(Layout$1, { className: "ml-64", children: [
-      /* @__PURE__ */ jsx(
-        Header,
+  usePermission("100001");
+  return /* @__PURE__ */ jsx(Layout$1, { hasSider: true, className: "h-screen", children: /* @__PURE__ */ jsx(ErrorBoundary, { children: /* @__PURE__ */ jsxs(
+    Suspense,
+    {
+      fallback: /* @__PURE__ */ jsx(
+        Spin,
         {
           style: {
-            padding: "0 24px",
-            background: colorBgContainer,
-            borderBottomWidth: 1,
-            borderBottomStyle: "solid",
-            borderBottomColor: colorBorder
-          },
-          children: header
+            display: "flex",
+            justifyContent: "center",
+            alignItems: "center",
+            width: "100vw",
+            height: "100vh"
+          }
         }
       ),
-      /* @__PURE__ */ jsx(Content, { className: "p-6 overflow-auto bg-gray-50", children })
-    ] })
-  ] });
+      children: [
+        /* @__PURE__ */ jsxs(
+          Sider,
+          {
+            width: 256,
+            style: {
+              overflow: "auto",
+              height: "100vh",
+              position: "fixed",
+              left: 0,
+              top: 0,
+              bottom: 0,
+              borderRightWidth: 1,
+              borderRightStyle: "solid",
+              borderRightColor: colorBorder
+            },
+            theme: "light",
+            children: [
+              /* @__PURE__ */ jsxs("div", { className: "flex items-end px-6 py-4", children: [
+                /* @__PURE__ */ jsx("img", { src: logo, alt: "logo", className: "w-8 h-8" }),
+                /* @__PURE__ */ jsx(Link, { className: "font-bold text-lg ml-2", to: "/", children: title })
+              ] }),
+              /* @__PURE__ */ jsx(NavBar_default, { items })
+            ]
+          }
+        ),
+        /* @__PURE__ */ jsxs(Layout$1, { className: "ml-64", children: [
+          /* @__PURE__ */ jsx(
+            Header,
+            {
+              style: {
+                padding: "0 24px",
+                background: colorBgContainer,
+                borderBottomWidth: 1,
+                borderBottomStyle: "solid",
+                borderBottomColor: colorBorder
+              },
+              children: header
+            }
+          ),
+          /* @__PURE__ */ jsx(Content, { className: "p-6 overflow-auto bg-gray-50", children: /* @__PURE__ */ jsx(
+            Suspense,
+            {
+              fallback: /* @__PURE__ */ jsx(
+                Spin,
+                {
+                  style: {
+                    display: "flex",
+                    justifyContent: "center",
+                    alignItems: "center",
+                    height: "50vh"
+                  }
+                }
+              ),
+              children
+            }
+          ) })
+        ] })
+      ]
+    }
+  ) }) });
 };
 var Layout_default = Layout;
 
-export { DynamicTags_default as DynamicTags, FetcherError, FilterForm_default as FilterForm, FormModal_default as FormModal, Highlight_default as Highlight, Layout_default as Layout, Login_default as Login, PermissionButton_default as PermissionButton, QueryList_default as QueryList, permission_default as permission, useFetcher, useFormModal, useMenuStore, usePermission, usePermissions, useQueryTriggerStore, useTokenStore };
+export { DynamicTags_default as DynamicTags, FilterForm_default as FilterForm, FormModal_default as FormModal, Highlight_default as Highlight, HttpClientError, Layout_default as Layout, Login_default as Login, NoMatch_default as NoMatch, PermissionButton_default as PermissionButton, QueryList_default as QueryList, SSO_URL, permission_default as permission, useFormModal, useHttpClient, useMenuStore, usePermission, usePermissions, useQueryTriggerStore, useTokenStore };
 //# sourceMappingURL=out.js.map
 //# sourceMappingURL=index.esm.js.map