react-toolkits 0.8.21 → 0.8.22

package/lib/{index-EAawrEpf.chunk.js → index-di-49SIT.chunk.js}

@@ -1,4 +1,4 @@
-import { I as O, w as W, e as h, f as x, s as z, m as w, g as V, U as R, h as U, d as G, r as n, c as K } from "./index-2I_COrHX.chunk.js";
+import { I as O, w as W, e as h, f as x, s as z, m as w, g as V, U as R, h as U, d as G, r as n, c as K } from "./index-Tn0ScF_k.chunk.js";
 import L, { useRef as o, useCallback as N, useState as $ } from "react";
 const P = O ? (e) => {
   e();

package/lib/index-oCBonu8R.chunk.js

@@ -0,0 +1,189 @@
+import { A as T, _ as N, u as j, a as b, j as e, P as h, H as z, Q as R, b as A } from "./index-Tn0ScF_k.chunk.js";
+import { App as U, Row as F, Col as E, Tag as w, Space as G, Card as D, Form as p, Input as L, Select as y } from "antd";
+import { p as I } from "./immer-BLf7GM7E.chunk.js";
+import { Link as P } from "react-router-dom";
+import { u as Q, a as V, b as k, c as _ } from "./index-di-49SIT.chunk.js";
+import * as M from "react";
+import "react-dom";
+var $ = { icon: { tag: "svg", attrs: { viewBox: "64 64 896 896", focusable: "false" }, children: [{ tag: "path", attrs: { d: "M678.3 642.4c24.2-13 51.9-20.4 81.4-20.4h.1c3 0 4.4-3.6 2.2-5.6a371.67 371.67 0 00-103.7-65.8c-.4-.2-.8-.3-1.2-.5C719.2 505 759.6 431.7 759.6 349c0-137-110.8-248-247.5-248S264.7 212 264.7 349c0 82.7 40.4 156 102.6 201.1-.4.2-.8.3-1.2.5-44.7 18.9-84.8 46-119.3 80.6a373.42 373.42 0 00-80.4 119.5A373.6 373.6 0 00137 888.8a8 8 0 008 8.2h59.9c4.3 0 7.9-3.5 8-7.8 2-77.2 32.9-149.5 87.6-204.3C357 628.2 432.2 597 512.2 597c56.7 0 111.1 15.7 158 45.1a8.1 8.1 0 008.1.3zM512.2 521c-45.8 0-88.9-17.9-121.4-50.4A171.2 171.2 0 01340.5 349c0-45.9 17.9-89.1 50.3-121.6S466.3 177 512.2 177s88.9 17.9 121.4 50.4A171.2 171.2 0 01683.9 349c0 45.9-17.9 89.1-50.3 121.6C601.1 503.1 558 521 512.2 521zM880 759h-84v-84c0-4.4-3.6-8-8-8h-56c-4.4 0-8 3.6-8 8v84h-84c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h84v84c0 4.4 3.6 8 8 8h56c4.4 0 8-3.6 8-8v-84h84c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8z" } }] }, name: "user-add", theme: "outlined" };
+const q = $;
+var O = function(i, o) {
+  return /* @__PURE__ */ M.createElement(T, N({}, i, {
+    ref: o,
+    icon: q
+  }));
+};
+process.env.NODE_ENV !== "production" && (O.displayName = "UserAddOutlined");
+const B = /* @__PURE__ */ M.forwardRef(O), { Option: H } = y, g = "/api/usystem/user/list";
+function K() {
+  const { message: d } = U.useApp(), i = V(), { data: o, isLoading: u } = k(), { setPayload: m } = j(), n = b();
+  return A({
+    title: n("UserList.createTitle"),
+    labelCol: { flex: "80px" },
+    content: /* @__PURE__ */ e.jsxs(e.Fragment, { children: [
+      /* @__PURE__ */ e.jsx(p.Item, { label: n("global.name"), name: "name", rules: [{ required: !0 }], children: /* @__PURE__ */ e.jsx(L, {}) }),
+      /* @__PURE__ */ e.jsx(p.Item, { label: n("global.role"), name: "roles", children: /* @__PURE__ */ e.jsx(y, { allowClear: !0, mode: "multiple", loading: u, children: (o ?? []).map((t) => /* @__PURE__ */ e.jsx(H, { value: t.name, children: t.name }, t.id)) }) })
+    ] }),
+    async onConfirm(t) {
+      await i.trigger(t), m(g, { page: 1 }), d.success(n("UserList.createSuccessfully"));
+    }
+  });
+}
+function J() {
+  const { message: d } = U.useApp(), i = _(), { data: o, isLoading: u } = k(), { mutate: m } = j(), n = b();
+  return A({
+    title: n("UserList.updateTitle"),
+    labelCol: { flex: "80px" },
+    content: /* @__PURE__ */ e.jsxs(e.Fragment, { children: [
+      /* @__PURE__ */ e.jsx(p.Item, { label: n("global.name"), name: "name", rules: [{ required: !0 }], children: /* @__PURE__ */ e.jsx(L, { readOnly: !0 }) }),
+      /* @__PURE__ */ e.jsx(p.Item, { label: n("global.role"), name: "roles", children: /* @__PURE__ */ e.jsx(
+        y,
+        {
+          allowClear: !0,
+          mode: "multiple",
+          loading: u,
+          options: o == null ? void 0 : o.map((t) => ({
+            label: t.name,
+            value: t.name
+          })),
+          dropdownStyle: { zIndex: 9999 }
+        }
+      ) })
+    ] }),
+    async onConfirm(t, x) {
+      await i.trigger(t), m(
+        g,
+        (a) => I(a, (c) => {
+          var s;
+          if (c != null && c.dataSource) {
+            const l = (s = c.dataSource) == null ? void 0 : s.findIndex((r) => r.id === x.id);
+            l !== -1 && (c.dataSource[l].roles = t.roles);
+          }
+        }),
+        { revalidate: !1 }
+      ), d.success(n("UserList.updateSuccessfully"));
+    }
+  });
+}
+const te = () => {
+  const { modal: d, message: i } = U.useApp(), o = Q(), { mutate: u } = j(), { show: m, modal: n } = K(), { show: t, modal: x } = J(), a = b(), c = [
+    {
+      title: a("global.name"),
+      dataIndex: "name",
+      key: "name"
+    },
+    {
+      title: "ID",
+      dataIndex: "id",
+      key: "id"
+    },
+    {
+      title: a("global.role"),
+      dataIndex: "roles",
+      key: "roles",
+      width: "40%",
+      render(s) {
+        return /* @__PURE__ */ e.jsx(F, { gutter: [4, 4], children: (s || []).map((l) => /* @__PURE__ */ e.jsx(E, { children: l === "root" ? /* @__PURE__ */ e.jsx(w, { color: "#f50", children: l }) : /* @__PURE__ */ e.jsx(w, { color: "#ff5a00", children: /* @__PURE__ */ e.jsx(P, { to: `/permission/role/${l}`, children: l }) }) }, l)) });
+      }
+    },
+    {
+      title: a("global.creationTime"),
+      dataIndex: "Ctime",
+      key: "ctime"
+    },
+    {
+      title: a("global.operation"),
+      width: 150,
+      align: "center",
+      render: (s) => /* @__PURE__ */ e.jsxs(G, { children: [
+        /* @__PURE__ */ e.jsx(
+          h,
+          {
+            isGlobalNS: !0,
+            size: "small",
+            type: "link",
+            code: "100003",
+            onClick: () => {
+              t({
+                initialValues: {
+                  name: s.name,
+                  roles: s.roles
+                },
+                extraValues: {
+                  id: s.id
+                }
+              });
+            },
+            children: a("global.update")
+          }
+        ),
+        /* @__PURE__ */ e.jsx(
+          h,
+          {
+            isGlobalNS: !0,
+            danger: !0,
+            size: "small",
+            code: "100004",
+            type: "link",
+            onClick: () => {
+              d.confirm({
+                title: a("UserList.deleteTitle"),
+                content: /* @__PURE__ */ e.jsx(z, { texts: [s.name], children: a("UserList.deleteContent", { user: s.name }) }),
+                async onOk() {
+                  await o.trigger({
+                    id: s.id,
+                    name: s.name
+                  }), u(g, (l) => I(l, (r) => {
+                    var C, f;
+                    const S = (C = r == null ? void 0 : r.dataSource) == null ? void 0 : C.findIndex((v) => v.id === s.id);
+                    S && ((f = r == null ? void 0 : r.dataSource) == null || f.splice(S, 1));
+                  })), i.success(a("UserList.deleteSuccessfully"));
+                }
+              });
+            },
+            children: a("global.delete")
+          }
+        )
+      ] })
+    }
+  ];
+  return /* @__PURE__ */ e.jsxs(e.Fragment, { children: [
+    /* @__PURE__ */ e.jsx(
+      D,
+      {
+        title: a("global.user"),
+        extra: /* @__PURE__ */ e.jsx(
+          h,
+          {
+            isGlobalNS: !0,
+            type: "primary",
+            icon: /* @__PURE__ */ e.jsx(B, {}),
+            code: "100002",
+            onClick: () => {
+              m();
+            },
+            children: a("UserList.createTitle")
+          }
+        ),
+        children: /* @__PURE__ */ e.jsx(
+          R,
+          {
+            isGlobalNS: !0,
+            code: "100001",
+            action: g,
+            rowKey: "id",
+            columns: c,
+            getTotal: (s) => s.Total,
+            getDataSource: (s) => s.List
+          }
+        )
+      }
+    ),
+    n,
+    x
+  ] });
+};
+export {
+  g as action,
+  te as default
+};

package/lib/{index-MzGlzyfE.chunk.js → index-op-Wl97v.chunk.js}

@@ -1,63 +1,64 @@
-import { A as T, _, c as M, d as N, u as b, a as f, j as e, P as j, r as z, H as P, Q as $, b as L } from "./index-2I_COrHX.chunk.js";
-import { App as w, Space as H, Card as G, Form as m, Input as A } from "antd";
-import { p as k } from "./immer-BLf7GM7E.chunk.js";
+import { A as O, _ as T, c as N, d as _, u as y, a as b, j as e, P as j, r as z, H as P, Q as $, b as S } from "./index-Tn0ScF_k.chunk.js";
+import { App as f, Space as F, Card as G, Form as g, Input as L } from "antd";
+import { p as A } from "./immer-BLf7GM7E.chunk.js";
 import { Link as B } from "react-router-dom";
-import { P as v } from "./index-_CFeMHGZ.chunk.js";
-import { d as E, e as V, f as q } from "./index-EAawrEpf.chunk.js";
-import * as I from "react";
+import { P as k } from "./index-6HknRl5q.chunk.js";
+import { d as E, e as V, f as q } from "./index-di-49SIT.chunk.js";
+import * as v from "react";
 import "react-dom";
 var D = { icon: { tag: "svg", attrs: { viewBox: "64 64 896 896", focusable: "false" }, children: [{ tag: "path", attrs: { d: "M892 772h-80v-80c0-4.4-3.6-8-8-8h-48c-4.4 0-8 3.6-8 8v80h-80c-4.4 0-8 3.6-8 8v48c0 4.4 3.6 8 8 8h80v80c0 4.4 3.6 8 8 8h48c4.4 0 8-3.6 8-8v-80h80c4.4 0 8-3.6 8-8v-48c0-4.4-3.6-8-8-8zM373.5 498.4c-.9-8.7-1.4-17.5-1.4-26.4 0-15.9 1.5-31.4 4.3-46.5.7-3.6-1.2-7.3-4.5-8.8-13.6-6.1-26.1-14.5-36.9-25.1a127.54 127.54 0 01-38.7-95.4c.9-32.1 13.8-62.6 36.3-85.6 24.7-25.3 57.9-39.1 93.2-38.7 31.9.3 62.7 12.6 86 34.4 7.9 7.4 14.7 15.6 20.4 24.4 2 3.1 5.9 4.4 9.3 3.2 17.6-6.1 36.2-10.4 55.3-12.4 5.6-.6 8.8-6.6 6.3-11.6-32.5-64.3-98.9-108.7-175.7-109.9-110.8-1.7-203.2 89.2-203.2 200 0 62.8 28.9 118.8 74.2 155.5-31.8 14.7-61.1 35-86.5 60.4-54.8 54.7-85.8 126.9-87.8 204a8 8 0 008 8.2h56.1c4.3 0 7.9-3.4 8-7.7 1.9-58 25.4-112.3 66.7-153.5 29.4-29.4 65.4-49.8 104.7-59.7 3.8-1.1 6.4-4.8 5.9-8.8zM824 472c0-109.4-87.9-198.3-196.9-200C516.3 270.3 424 361.2 424 472c0 62.8 29 118.8 74.2 155.5a300.95 300.95 0 00-86.4 60.4C357 742.6 326 814.8 324 891.8a8 8 0 008 8.2h56c4.3 0 7.9-3.4 8-7.7 1.9-58 25.4-112.3 66.7-153.5C505.8 695.7 563 672 624 672c110.4 0 200-89.5 200-200zm-109.5 90.5C690.3 586.7 658.2 600 624 600s-66.3-13.3-90.5-37.5a127.26 127.26 0 01-37.5-91.8c.3-32.8 13.4-64.5 36.3-88 24-24.6 56.1-38.3 90.4-38.7 33.9-.3 66.8 12.9 91 36.6 24.8 24.3 38.4 56.8 38.4 91.4-.1 34.2-13.4 66.3-37.6 90.5z" } }] }, name: "usergroup-add", theme: "outlined" };
-const F = D;
-var U = function(r, a) {
-  return /* @__PURE__ */ I.createElement(T, _({}, r, {
+const Q = D;
+var I = function(o, a) {
+  return /* @__PURE__ */ v.createElement(O, T({}, o, {
     ref: a,
-    icon: F
+    icon: Q
   }));
 };
-process.env.NODE_ENV !== "production" && (U.displayName = "UsergroupAddOutlined");
-const Q = /* @__PURE__ */ I.forwardRef(U), h = "/api/usystem/role/list", K = () => {
-  const { message: c } = w.useApp(), { setPayload: r } = b(), a = V(), i = f(), n = async (l) => {
+process.env.NODE_ENV !== "production" && (I.displayName = "UsergroupAddOutlined");
+const H = /* @__PURE__ */ v.forwardRef(I), h = "/api/usystem/role/list", K = () => {
+  const { message: c } = f.useApp(), { setPayload: o } = y(), a = V(), n = b(), r = async (l) => {
     await a.trigger({
       name: `role_${l.name}`,
       permissions: l.permissions
-    }), r(h, { page: 1 }), c.success(i("RoleList.createSuccessfully"));
+    }), o(h, { page: 1 }), c.success(n("RoleList.createSuccessfully"));
   };
-  return L({
-    title: i("RoleList.createTitle"),
+  return S({
+    title: n("RoleList.createTitle"),
     width: "50vw",
-    content: (l) => /* @__PURE__ */ e.jsxs(m, { form: l, layout: "vertical", children: [
-      /* @__PURE__ */ e.jsx(m.Item, { label: i("global.name"), name: "name", rules: [{ required: !0 }], children: /* @__PURE__ */ e.jsx(A, { addonBefore: "role_" }) }),
-      /* @__PURE__ */ e.jsx(m.Item, { name: "permissions", children: /* @__PURE__ */ e.jsx(v, {}) })
+    layout: "vertical",
+    content: /* @__PURE__ */ e.jsxs(e.Fragment, { children: [
+      /* @__PURE__ */ e.jsx(g.Item, { label: n("global.name"), name: "name", rules: [{ required: !0 }], children: /* @__PURE__ */ e.jsx(L, { addonBefore: "role_" }) }),
+      /* @__PURE__ */ e.jsx(g.Item, { name: "permissions", children: /* @__PURE__ */ e.jsx(k, {}) })
     ] }),
-    onConfirm: n
+    onConfirm: r
   });
 }, J = () => {
-  const { message: c } = w.useApp(), { mutate: r } = b(), a = q(), i = f();
-  return L({
-    title: i("RoleList.updateTitle"),
+  const { message: c } = f.useApp(), { mutate: o } = y(), a = q(), n = b();
+  return S({
+    title: n("RoleList.updateTitle"),
     width: "50vw",
-    content: (n) => /* @__PURE__ */ e.jsxs(m, { form: n, children: [
-      /* @__PURE__ */ e.jsx(m.Item, { label: i("global.name"), name: "name", rules: [{ required: !0 }], children: /* @__PURE__ */ e.jsx(A, { readOnly: !0, addonBefore: "role_" }) }),
-      /* @__PURE__ */ e.jsx(m.Item, { name: "permissions", children: /* @__PURE__ */ e.jsx(v, {}) })
+    content: /* @__PURE__ */ e.jsxs(e.Fragment, { children: [
+      /* @__PURE__ */ e.jsx(g.Item, { label: n("global.name"), name: "name", rules: [{ required: !0 }], children: /* @__PURE__ */ e.jsx(L, { readOnly: !0, addonBefore: "role_" }) }),
+      /* @__PURE__ */ e.jsx(g.Item, { name: "permissions", children: /* @__PURE__ */ e.jsx(k, {}) })
     ] }),
-    onConfirm: async (n, l, p) => {
+    onConfirm: async (r, l) => {
       await a.trigger({
-        id: p.id,
-        name: `role_${n.name}`,
-        permissions: n.permissions
-      }), r(
+        id: l.id,
+        name: `role_${r.name}`,
+        permissions: r.permissions
+      }), o(
         h,
-        (x) => k(x, (u) => {
-          var t;
-          const g = (t = u == null ? void 0 : u.dataSource) == null ? void 0 : t.find((y) => y.id === p.id);
-          g && (g.permissions = n.permissions);
+        (x) => A(x, (m) => {
+          var p;
+          const u = (p = m == null ? void 0 : m.dataSource) == null ? void 0 : p.find((t) => t.id === l.id);
+          u && (u.permissions = r.permissions);
         }),
         { revalidate: !1 }
-      ), c.success(i("RoleList.updateSuccessfully"));
+      ), c.success(n("RoleList.updateSuccessfully"));
     }
   });
-}, oe = () => {
-  const { accessible: c } = M("200005", !0), { modal: r, message: a } = w.useApp(), { usePermissionApiV2: i } = N(), n = E(), { mutate: l } = b(), { show: p, contextHolder: x } = K(), { show: u, contextHolder: g } = J(), t = f(), y = [
+}, ie = () => {
+  const { accessible: c } = N("200005", !0), { modal: o, message: a } = f.useApp(), { usePermissionApiV2: n } = _(), r = E(), { mutate: l } = y(), { show: x, modal: m } = K(), { show: u, modal: p } = J(), t = b(), M = [
     {
       title: t("global.name"),
       key: "name",
@@ -79,7 +80,7 @@ const Q = /* @__PURE__ */ I.forwardRef(U), h = "/api/usystem/role/list", K = ()
       title: t("global.operation"),
       width: 150,
       align: "center",
-      render: (s) => /* @__PURE__ */ e.jsxs(H, { size: "small", children: [
+      render: (s) => /* @__PURE__ */ e.jsxs(F, { size: "small", children: [
         /* @__PURE__ */ e.jsx(
           j,
           {
@@ -88,17 +89,17 @@ const Q = /* @__PURE__ */ I.forwardRef(U), h = "/api/usystem/role/list", K = ()
             size: "small",
             type: "link",
             onClick: async () => {
-              const { data: o } = await z(
-                `/api/usystem/role/info${i ? "V2" : ""}?name=${s.name}`,
+              const { data: i } = await z(
+                `/api/usystem/role/info${n ? "V2" : ""}?name=${s.name}`,
                 { isGlobalNS: !0 }
               );
               u({
                 initialValues: {
-                  permissions: o == null ? void 0 : o.permissions,
-                  name: o == null ? void 0 : o.name.replace(/^role_/, "")
+                  permissions: i == null ? void 0 : i.permissions,
+                  name: i == null ? void 0 : i.name.replace(/^role_/, "")
                 },
                 extraValues: {
-                  id: o == null ? void 0 : o.id
+                  id: i == null ? void 0 : i.id
                 }
               });
             },
@@ -114,17 +115,17 @@ const Q = /* @__PURE__ */ I.forwardRef(U), h = "/api/usystem/role/list", K = ()
             size: "small",
             type: "link",
             onClick: () => {
-              r.confirm({
+              o.confirm({
                 title: t("RoleList.deleteTitle"),
                 content: /* @__PURE__ */ e.jsx(P, { texts: [s.name], children: t("RoleList.deleteContent", { role: s.name }) }),
                 async onOk() {
-                  await n.trigger({
+                  await r.trigger({
                     id: s.id,
                     name: s.name
-                  }), l(h, (o) => k(o, (d) => {
-                    var R, S;
-                    const C = (R = d == null ? void 0 : d.dataSource) == null ? void 0 : R.findIndex((O) => O.id === s.id);
-                    C && ((S = d == null ? void 0 : d.dataSource) == null || S.splice(C, 1));
+                  }), l(h, (i) => A(i, (d) => {
+                    var R, C;
+                    const w = (R = d == null ? void 0 : d.dataSource) == null ? void 0 : R.findIndex((U) => U.id === s.id);
+                    w && ((C = d == null ? void 0 : d.dataSource) == null || C.splice(w, 1));
                   })), a.success(t("RoleList.deleteSuccessfully"));
                 }
               });
@@ -135,42 +136,42 @@ const Q = /* @__PURE__ */ I.forwardRef(U), h = "/api/usystem/role/list", K = ()
       ] })
     }
   ];
-  return /* @__PURE__ */ e.jsxs(
-    G,
-    {
-      title: t("global.role"),
-      extra: /* @__PURE__ */ e.jsx(
-        j,
-        {
-          isGlobalNS: !0,
-          type: "primary",
-          code: "200002",
-          icon: /* @__PURE__ */ e.jsx(Q, {}),
-          onClick: () => {
-            p();
-          },
-          children: t("RoleList.createTitle")
-        }
-      ),
-      children: [
-        /* @__PURE__ */ e.jsx(
+  return /* @__PURE__ */ e.jsxs(e.Fragment, { children: [
+    /* @__PURE__ */ e.jsx(
+      G,
+      {
+        title: t("global.role"),
+        extra: /* @__PURE__ */ e.jsx(
+          j,
+          {
+            isGlobalNS: !0,
+            type: "primary",
+            code: "200002",
+            icon: /* @__PURE__ */ e.jsx(H, {}),
+            onClick: () => {
+              x();
+            },
+            children: t("RoleList.createTitle")
+          }
+        ),
+        children: /* @__PURE__ */ e.jsx(
           $,
           {
             isGlobalNS: !0,
             rowKey: "name",
-            columns: y,
+            columns: M,
             code: "200001",
             action: h,
             getTotal: (s) => s.Total,
             getDataSource: (s) => s.List
           }
-        ),
-        x,
-        g
-      ]
-    }
-  );
+        )
+      }
+    ),
+    m,
+    p
+  ] });
 };
 export {
-  oe as default
+  ie as default
 };

package/lib/index.d.ts

@@ -2,20 +2,21 @@ import type { ButtonProps } from 'antd';
 import type { ComponentType } from 'react';
 import type { FC } from 'react';
 import type { FormInstance } from 'antd';
+import type { FormProps } from 'antd';
 import { JSX as JSX_2 } from 'react/jsx-runtime';
 import type { Key } from 'react';
 import type { MenuDividerType } from 'antd/es/menu/hooks/useItems';
 import type { MenuItemGroupType } from 'antd/es/menu/hooks/useItems';
 import type { MenuItemType } from 'antd/es/menu/hooks/useItems';
 import type { Merge } from 'ts-essentials';
-import type { ModalFuncProps } from 'antd';
+import type { ModalProps } from 'antd';
 import type { MutatorCallback } from 'swr/_internal';
 import type { MutatorOptions } from 'swr/_internal';
 import { NamedExoticComponent } from 'react';
 import { PersistOptions } from 'zustand/middleware';
 import type { PropsWithChildren } from 'react';
 import type { ReactElement } from 'react';
-import type { ReactNode } from 'react';
+import { ReactNode } from 'react';
 import type { Ref } from 'react';
 import type { StateStorage } from 'zustand/middleware';
 import { StoreApi } from 'zustand';
@@ -227,6 +228,12 @@ declare type MenuItemType2 = Merge<MenuItemType, {
 
 export declare const mixedStorage: StateStorage;
 
+declare interface ModalState {
+    open: Map<string, boolean>;
+    getOpen: (id: string) => boolean;
+    setOpen: (id: string, open: boolean) => void;
+}
+
 export declare const NavMenu: NamedExoticComponent<object>;
 
 export declare type NavMenuItem = MenuItemType2 | SubMenuType2 | MenuItemGroupType2 | MenuDividerType | null;
@@ -354,23 +361,17 @@ export declare interface TokenState {
 }
 
 export declare function useFormModal<Values>(props: UseFormModalProps<Values>): {
-    show: (scopedProps?: Partial<Pick<UseFormModalProps<Values>, 'title'> & {
-        initialValues?: RecursivePartial<Values>;
+    show: (config?: {
+        initialValues?: RecursivePartial<Values> | undefined;
         extraValues?: any;
-    }>) => {
-        destroy: () => void;
-        update: (configUpdate: ModalFuncProps | ((prevConfig: ModalFuncProps) => ModalFuncProps)) => void;
-    } & {
-        then<T>(resolve: (confirmed: boolean) => T, reject: VoidFunction): Promise<T>;
-    };
-    form: FormInstance<Values>;
-    contextHolder: JSX_2.Element;
+    }) => void;
+    hide: () => void;
+    modal: JSX_2.Element;
 };
 
-export declare interface UseFormModalProps<Values> extends Omit<ModalFuncProps, 'icon' | 'className' | 'content' | 'type' | 'onOk' | 'onCancel'> {
-    content?: (form: FormInstance<Values>) => ReactNode;
-    onConfirm?: (values: Values, form: FormInstance<Values>, extraValues: any) => Promise<void>;
-    onCancel?: (form: FormInstance<Values>) => void;
+export declare interface UseFormModalProps<Values> extends Pick<ModalProps, 'title' | 'width' | 'maskClosable'>, Pick<FormProps, 'labelCol' | 'layout' | 'initialValues'> {
+    content?: ReactNode;
+    onConfirm?: (values: Values, extraValues: any) => Promise<void>;
 }
 
 export declare const useGameStore: UseBoundStore<Omit<StoreApi<GameState>, "persist"> & {
@@ -385,6 +386,8 @@ export declare const useGameStore: UseBoundStore<Omit<StoreApi<GameState>, "pers
     };
 }>;
 
+export declare const useModalStore: UseBoundStore<StoreApi<ModalState>>;
+
 export declare function usePermission(code: string | undefined, isGlobalNS?: boolean, config?: SWRConfiguration): {
     accessible: boolean;
     isValidating: boolean;

package/lib/index.js

@@ -1,4 +1,4 @@
-import { C as r, D as n, F as u, G as m, H as p, i as L, L as d, N as l, k as S, O as g, l as y, P, n as x, Q as c, o as F, R as G, p as T, S as h, q as k, t as q, v as Q, r as R, b as v, x as B, c as C, y as N, u as f, z as w, B as D, d as E, a as H, E as I, J as M } from "./index-2I_COrHX.chunk.js";
+import { C as r, D as n, F as u, G as m, H as d, i as l, L as p, N as L, k as S, O as g, l as y, P, n as x, Q as c, o as F, R as G, p as T, S as h, q as k, t as q, v as Q, r as R, b as v, x as B, y as C, c as M, z as N, u as f, B as w, E as D, d as E, a as H, J as I, K as O } from "./index-Tn0ScF_k.chunk.js";
 import "react";
 import "antd";
 import "react-dom";
@@ -8,10 +8,10 @@ export {
   n as DynamicTags,
   u as FilterFormWrapper,
   m as GameSelect,
-  p as Highlight,
-  L as InfiniteList,
-  d as Layout,
-  l as NavMenu,
+  d as Highlight,
+  l as InfiniteList,
+  p as Layout,
+  L as NavMenu,
   S as NotFound,
   g as OperationLogList,
   y as Permission,
@@ -28,7 +28,8 @@ export {
   R as request,
   v as useFormModal,
   B as useGameStore,
-  C as usePermission,
+  C as useModalStore,
+  M as usePermission,
   N as usePermissions,
   f as useQueryListStore,
   w as useTokenStore,
@@ -36,5 +37,5 @@ export {
   E as useToolkitsContext,
   H as useTranslation,
   I as withBaseRoutes,
-  M as withLayout
+  O as withLayout
 };

package/lib/style.css

@@ -1 +1 @@
-*,:before,:after{--tw-border-spacing-x: 0;--tw-border-spacing-y: 0;--tw-translate-x: 0;--tw-translate-y: 0;--tw-rotate: 0;--tw-skew-x: 0;--tw-skew-y: 0;--tw-scale-x: 1;--tw-scale-y: 1;--tw-pan-x: ;--tw-pan-y: ;--tw-pinch-zoom: ;--tw-scroll-snap-strictness: proximity;--tw-gradient-from-position: ;--tw-gradient-via-position: ;--tw-gradient-to-position: ;--tw-ordinal: ;--tw-slashed-zero: ;--tw-numeric-figure: ;--tw-numeric-spacing: ;--tw-numeric-fraction: ;--tw-ring-inset: ;--tw-ring-offset-width: 0px;--tw-ring-offset-color: #fff;--tw-ring-color: rgb(59 130 246 / .5);--tw-ring-offset-shadow: 0 0 #0000;--tw-ring-shadow: 0 0 #0000;--tw-shadow: 0 0 #0000;--tw-shadow-colored: 0 0 #0000;--tw-blur: ;--tw-brightness: ;--tw-contrast: ;--tw-grayscale: ;--tw-hue-rotate: ;--tw-invert: ;--tw-saturate: ;--tw-sepia: ;--tw-drop-shadow: ;--tw-backdrop-blur: ;--tw-backdrop-brightness: ;--tw-backdrop-contrast: ;--tw-backdrop-grayscale: ;--tw-backdrop-hue-rotate: ;--tw-backdrop-invert: ;--tw-backdrop-opacity: ;--tw-backdrop-saturate: ;--tw-backdrop-sepia: }::backdrop{--tw-border-spacing-x: 0;--tw-border-spacing-y: 0;--tw-translate-x: 0;--tw-translate-y: 0;--tw-rotate: 0;--tw-skew-x: 0;--tw-skew-y: 0;--tw-scale-x: 1;--tw-scale-y: 1;--tw-pan-x: ;--tw-pan-y: ;--tw-pinch-zoom: ;--tw-scroll-snap-strictness: proximity;--tw-gradient-from-position: ;--tw-gradient-via-position: ;--tw-gradient-to-position: ;--tw-ordinal: ;--tw-slashed-zero: ;--tw-numeric-figure: ;--tw-numeric-spacing: ;--tw-numeric-fraction: ;--tw-ring-inset: ;--tw-ring-offset-width: 0px;--tw-ring-offset-color: #fff;--tw-ring-color: rgb(59 130 246 / .5);--tw-ring-offset-shadow: 0 0 #0000;--tw-ring-shadow: 0 0 #0000;--tw-shadow: 0 0 #0000;--tw-shadow-colored: 0 0 #0000;--tw-blur: ;--tw-brightness: ;--tw-contrast: ;--tw-grayscale: ;--tw-hue-rotate: ;--tw-invert: ;--tw-saturate: ;--tw-sepia: ;--tw-drop-shadow: ;--tw-backdrop-blur: ;--tw-backdrop-brightness: ;--tw-backdrop-contrast: ;--tw-backdrop-grayscale: ;--tw-backdrop-hue-rotate: ;--tw-backdrop-invert: ;--tw-backdrop-opacity: ;--tw-backdrop-saturate: ;--tw-backdrop-sepia: }.container{width:100%}@media (min-width: 640px){.container{max-width:640px}}@media (min-width: 768px){.container{max-width:768px}}@media (min-width: 1024px){.container{max-width:1024px}}@media (min-width: 1280px){.container{max-width:1280px}}@media (min-width: 1536px){.container{max-width:1536px}}.fixed{position:fixed}.absolute{position:absolute}.relative{position:relative}.bottom-0{bottom:0}.left-0{left:0}.left-14{left:3.5rem}.right-0{right:0}.right-16{right:4rem}.top-0{top:0}.top-1\/2{top:50%}.top-16{top:4rem}.top-6{top:1.5rem}.z-10{z-index:10}.my-12{margin-top:3rem;margin-bottom:3rem}.-mb-0{margin-bottom:-0px}.-mb-0\.5{margin-bottom:-.125rem}.mb-12{margin-bottom:3rem}.mb-4{margin-bottom:1rem}.mb-6{margin-bottom:1.5rem}.ml-2{margin-left:.5rem}.ml-64{margin-left:16rem}.ml-8{margin-left:2rem}.mr-2{margin-right:.5rem}.mt-2{margin-top:.5rem}.mt-4{margin-top:1rem}.block{display:block}.inline{display:inline}.flex{display:flex}.h-10{height:2.5rem}.h-8{height:2rem}.h-full{height:100%}.h-screen{height:100vh}.max-h-32{max-height:8rem}.w-10\/12{width:83.333333%}.w-12{width:3rem}.w-8{width:2rem}.w-\[18px\]{width:18px}.w-\[650px\]{width:650px}.w-full{width:100%}.w-screen{width:100vw}.flex-1{flex:1 1 0%}.-translate-y-1\/2{--tw-translate-y: -50%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skew(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.-translate-y-10{--tw-translate-y: -2.5rem;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skew(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.flex-col{flex-direction:column}.items-center{align-items:center}.justify-center{justify-content:center}.justify-between{justify-content:space-between}.overflow-auto{overflow:auto}.bg-gray-50{--tw-bg-opacity: 1;background-color:rgb(249 250 251 / var(--tw-bg-opacity))}.bg-slate-50{--tw-bg-opacity: 1;background-color:rgb(248 250 252 / var(--tw-bg-opacity))}.p-6{padding:1.5rem}.px-36{padding-left:9rem;padding-right:9rem}.px-6{padding-left:1.5rem;padding-right:1.5rem}.py-4{padding-top:1rem;padding-bottom:1rem}.filter{filter:var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow)}html,body{padding:0;margin:0}.toolkits-modal .ant-modal-confirm .ant-modal-confirm-paragraph{max-width:100%!important}
+*,:before,:after{--tw-border-spacing-x: 0;--tw-border-spacing-y: 0;--tw-translate-x: 0;--tw-translate-y: 0;--tw-rotate: 0;--tw-skew-x: 0;--tw-skew-y: 0;--tw-scale-x: 1;--tw-scale-y: 1;--tw-pan-x: ;--tw-pan-y: ;--tw-pinch-zoom: ;--tw-scroll-snap-strictness: proximity;--tw-gradient-from-position: ;--tw-gradient-via-position: ;--tw-gradient-to-position: ;--tw-ordinal: ;--tw-slashed-zero: ;--tw-numeric-figure: ;--tw-numeric-spacing: ;--tw-numeric-fraction: ;--tw-ring-inset: ;--tw-ring-offset-width: 0px;--tw-ring-offset-color: #fff;--tw-ring-color: rgb(59 130 246 / .5);--tw-ring-offset-shadow: 0 0 #0000;--tw-ring-shadow: 0 0 #0000;--tw-shadow: 0 0 #0000;--tw-shadow-colored: 0 0 #0000;--tw-blur: ;--tw-brightness: ;--tw-contrast: ;--tw-grayscale: ;--tw-hue-rotate: ;--tw-invert: ;--tw-saturate: ;--tw-sepia: ;--tw-drop-shadow: ;--tw-backdrop-blur: ;--tw-backdrop-brightness: ;--tw-backdrop-contrast: ;--tw-backdrop-grayscale: ;--tw-backdrop-hue-rotate: ;--tw-backdrop-invert: ;--tw-backdrop-opacity: ;--tw-backdrop-saturate: ;--tw-backdrop-sepia: }::backdrop{--tw-border-spacing-x: 0;--tw-border-spacing-y: 0;--tw-translate-x: 0;--tw-translate-y: 0;--tw-rotate: 0;--tw-skew-x: 0;--tw-skew-y: 0;--tw-scale-x: 1;--tw-scale-y: 1;--tw-pan-x: ;--tw-pan-y: ;--tw-pinch-zoom: ;--tw-scroll-snap-strictness: proximity;--tw-gradient-from-position: ;--tw-gradient-via-position: ;--tw-gradient-to-position: ;--tw-ordinal: ;--tw-slashed-zero: ;--tw-numeric-figure: ;--tw-numeric-spacing: ;--tw-numeric-fraction: ;--tw-ring-inset: ;--tw-ring-offset-width: 0px;--tw-ring-offset-color: #fff;--tw-ring-color: rgb(59 130 246 / .5);--tw-ring-offset-shadow: 0 0 #0000;--tw-ring-shadow: 0 0 #0000;--tw-shadow: 0 0 #0000;--tw-shadow-colored: 0 0 #0000;--tw-blur: ;--tw-brightness: ;--tw-contrast: ;--tw-grayscale: ;--tw-hue-rotate: ;--tw-invert: ;--tw-saturate: ;--tw-sepia: ;--tw-drop-shadow: ;--tw-backdrop-blur: ;--tw-backdrop-brightness: ;--tw-backdrop-contrast: ;--tw-backdrop-grayscale: ;--tw-backdrop-hue-rotate: ;--tw-backdrop-invert: ;--tw-backdrop-opacity: ;--tw-backdrop-saturate: ;--tw-backdrop-sepia: }.container{width:100%}@media (min-width: 640px){.container{max-width:640px}}@media (min-width: 768px){.container{max-width:768px}}@media (min-width: 1024px){.container{max-width:1024px}}@media (min-width: 1280px){.container{max-width:1280px}}@media (min-width: 1536px){.container{max-width:1536px}}.fixed{position:fixed}.absolute{position:absolute}.relative{position:relative}.bottom-0{bottom:0}.left-0{left:0}.left-14{left:3.5rem}.right-0{right:0}.right-16{right:4rem}.top-0{top:0}.top-1\/2{top:50%}.top-16{top:4rem}.top-6{top:1.5rem}.z-10{z-index:10}.my-12{margin-top:3rem;margin-bottom:3rem}.-mb-0{margin-bottom:-0px}.-mb-0\.5{margin-bottom:-.125rem}.mb-12{margin-bottom:3rem}.mb-4{margin-bottom:1rem}.mb-6{margin-bottom:1.5rem}.ml-2{margin-left:.5rem}.ml-64{margin-left:16rem}.ml-8{margin-left:2rem}.mr-2{margin-right:.5rem}.mt-2{margin-top:.5rem}.mt-4{margin-top:1rem}.block{display:block}.inline{display:inline}.flex{display:flex}.h-10{height:2.5rem}.h-8{height:2rem}.h-full{height:100%}.h-screen{height:100vh}.max-h-32{max-height:8rem}.w-10\/12{width:83.333333%}.w-12{width:3rem}.w-8{width:2rem}.w-\[18px\]{width:18px}.w-\[650px\]{width:650px}.w-full{width:100%}.w-screen{width:100vw}.flex-1{flex:1 1 0%}.-translate-y-1\/2{--tw-translate-y: -50%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skew(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.-translate-y-10{--tw-translate-y: -2.5rem;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skew(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.flex-col{flex-direction:column}.items-center{align-items:center}.justify-center{justify-content:center}.justify-between{justify-content:space-between}.overflow-auto{overflow:auto}.bg-gray-50{--tw-bg-opacity: 1;background-color:rgb(249 250 251 / var(--tw-bg-opacity))}.bg-slate-50{--tw-bg-opacity: 1;background-color:rgb(248 250 252 / var(--tw-bg-opacity))}.p-6{padding:1.5rem}.px-36{padding-left:9rem;padding-right:9rem}.px-6{padding-left:1.5rem;padding-right:1.5rem}.py-4{padding-top:1rem;padding-bottom:1rem}.filter{filter:var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow)}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-toolkits",
-  "version": "0.8.21",
+  "version": "0.8.22",
   "packageManager": "^pnpm@8.7.5",
   "sideEffects": [
     "**/*.css"