react-toolkits 0.8.23 → 0.8.25

package/lib/{index-vgp1WaSO.chunk.js → index-f0Xm0D7d.chunk.js}

@@ -1,74 +1,77 @@
-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-Jf-VYQNs.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 { A as T, _ as N, u as j, a as b, j as e, P as h, H as R, Q as z, b as w } from "./index-DnAJsWzB.chunk.js";
+import { App as U, Row as F, Col as P, Tag as A, Space as E, Card as G, Form as g, 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-AkY1QPaq.chunk.js";
+import { Link as D } from "react-router-dom";
+import { u as Q, a as _, b as k, c as $ } from "./index-2qsDFI2l.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) {
+var q = { 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 B = q;
+var O = function(i, l) {
   return /* @__PURE__ */ M.createElement(T, N({}, i, {
-    ref: o,
-    icon: q
+    ref: l,
+    icon: B
   }));
 };
 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" },
+const H = /* @__PURE__ */ M.forwardRef(O), { Option: K } = y, x = "/api/usystem/user/list";
+function J() {
+  const { message: d } = U.useApp(), i = _(), { data: l, isLoading: u } = k(), { setPayload: m } = j(), a = b();
+  return w({
+    title: a("UserList.createTitle"),
+    formProps: {
+      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)) }) })
+      /* @__PURE__ */ e.jsx(g.Item, { label: a("global.name"), name: "name", rules: [{ required: !0 }], children: /* @__PURE__ */ e.jsx(L, {}) }),
+      /* @__PURE__ */ e.jsx(g.Item, { label: a("global.role"), name: "roles", children: /* @__PURE__ */ e.jsx(y, { allowClear: !0, mode: "multiple", loading: u, children: (l ?? []).map((t) => /* @__PURE__ */ e.jsx(K, { value: t.name, children: t.name }, t.id)) }) })
     ] }),
     async onConfirm(t) {
-      await i.trigger(t), m(g, { page: 1 }), d.success(n("UserList.createSuccessfully"));
+      await i.trigger(t), m(x, { page: 1 }), d.success(a("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" },
+function W() {
+  const { message: d } = U.useApp(), i = $(), { data: l, isLoading: u } = k(), { mutate: m } = j(), a = b();
+  return w({
+    title: a("UserList.updateTitle"),
+    formProps: {
+      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(
+      /* @__PURE__ */ e.jsx(g.Item, { label: a("global.name"), name: "name", rules: [{ required: !0 }], children: /* @__PURE__ */ e.jsx(L, { readOnly: !0 }) }),
+      /* @__PURE__ */ e.jsx(g.Item, { label: a("global.role"), name: "roles", children: /* @__PURE__ */ e.jsx(
         y,
         {
           allowClear: !0,
           mode: "multiple",
           loading: u,
-          options: o == null ? void 0 : o.map((t) => ({
+          options: l == null ? void 0 : l.map((t) => ({
             label: t.name,
             value: t.name
-          })),
-          dropdownStyle: { zIndex: 9999 }
+          }))
         }
       ) })
     ] }),
-    async onConfirm(t, x) {
+    async onConfirm(t, p) {
       await i.trigger(t), m(
-        g,
-        (a) => I(a, (c) => {
+        x,
+        (n) => I(n, (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);
+            const o = (s = c.dataSource) == null ? void 0 : s.findIndex((r) => r.id === (p == null ? void 0 : p.id));
+            o !== -1 && (c.dataSource[o].roles = t.roles);
           }
         }),
         { revalidate: !1 }
-      ), d.success(n("UserList.updateSuccessfully"));
+      ), d.success(a("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 = [
+  const { modal: d, message: i } = U.useApp(), l = Q(), { mutate: u } = j(), { show: m, modal: a } = J(), { show: t, modal: p } = W(), n = b(), c = [
     {
-      title: a("global.name"),
+      title: n("global.name"),
       dataIndex: "name",
       key: "name"
     },
@@ -78,24 +81,24 @@ const te = () => {
       key: "id"
     },
     {
-      title: a("global.role"),
+      title: n("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)) });
+        return /* @__PURE__ */ e.jsx(F, { gutter: [4, 4], children: (s || []).map((o) => /* @__PURE__ */ e.jsx(P, { children: o === "root" ? /* @__PURE__ */ e.jsx(A, { color: "#f50", children: o }) : /* @__PURE__ */ e.jsx(A, { color: "#ff5a00", children: /* @__PURE__ */ e.jsx(D, { to: `/permission/role/${o}`, children: o }) }) }, o)) });
       }
     },
     {
-      title: a("global.creationTime"),
+      title: n("global.creationTime"),
       dataIndex: "Ctime",
       key: "ctime"
     },
     {
-      title: a("global.operation"),
+      title: n("global.operation"),
       width: 150,
       align: "center",
-      render: (s) => /* @__PURE__ */ e.jsxs(G, { children: [
+      render: (s) => /* @__PURE__ */ e.jsxs(E, { children: [
         /* @__PURE__ */ e.jsx(
           h,
           {
@@ -114,7 +117,7 @@ const te = () => {
                 }
               });
             },
-            children: a("global.update")
+            children: n("global.update")
           }
         ),
         /* @__PURE__ */ e.jsx(
@@ -127,21 +130,21 @@ const te = () => {
             type: "link",
             onClick: () => {
               d.confirm({
-                title: a("UserList.deleteTitle"),
-                content: /* @__PURE__ */ e.jsx(z, { texts: [s.name], children: a("UserList.deleteContent", { user: s.name }) }),
+                title: n("UserList.deleteTitle"),
+                content: /* @__PURE__ */ e.jsx(R, { texts: [s.name], children: n("UserList.deleteContent", { user: s.name }) }),
                 async onOk() {
-                  await o.trigger({
+                  await l.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"));
+                  }), u(x, (o) => I(o, (r) => {
+                    var C, S;
+                    const f = (C = r == null ? void 0 : r.dataSource) == null ? void 0 : C.findIndex((v) => v.id === s.id);
+                    f && ((S = r == null ? void 0 : r.dataSource) == null || S.splice(f, 1));
+                  })), i.success(n("UserList.deleteSuccessfully"));
                 }
               });
             },
-            children: a("global.delete")
+            children: n("global.delete")
           }
         )
       ] })
@@ -149,28 +152,28 @@ const te = () => {
   ];
   return /* @__PURE__ */ e.jsxs(e.Fragment, { children: [
     /* @__PURE__ */ e.jsx(
-      D,
+      G,
       {
-        title: a("global.user"),
+        title: n("global.user"),
         extra: /* @__PURE__ */ e.jsx(
           h,
           {
             isGlobalNS: !0,
             type: "primary",
-            icon: /* @__PURE__ */ e.jsx(B, {}),
+            icon: /* @__PURE__ */ e.jsx(H, {}),
             code: "100002",
             onClick: () => {
               m();
             },
-            children: a("UserList.createTitle")
+            children: n("UserList.createTitle")
           }
         ),
         children: /* @__PURE__ */ e.jsx(
-          R,
+          z,
           {
             isGlobalNS: !0,
             code: "100001",
-            action: g,
+            action: x,
             rowKey: "id",
             columns: c,
             getTotal: (s) => s.Total,
@@ -179,11 +182,11 @@ const te = () => {
         )
       }
     ),
-    n,
-    x
+    a,
+    p
   ] });
 };
 export {
-  g as action,
+  x as action,
   te as default
 };

package/lib/{index-b_N_y6ns.chunk.js → index-vlq8NNiF.chunk.js}

@@ -1,6 +1,6 @@
-import { a as S, j as e, d as $ } from "./index-Jf-VYQNs.chunk.js";
+import { a as S, j as e, d as $ } from "./index-DnAJsWzB.chunk.js";
 import { Collapse as D, Checkbox as k, Row as G, Col as _, Skeleton as T, Typography as A, Divider as w, Card as K, Space as M, Select as E, Button as N, Empty as O } from "antd";
-import { h as R, i as B } from "./index-AkY1QPaq.chunk.js";
+import { h as R, i as B } from "./index-2qsDFI2l.chunk.js";
 import { useState as P, useCallback as F, useEffect as b } from "react";
 const q = (x) => {
   const { permissions: l, readonly: t, expand: d, value: a, onChange: r } = x, [m, p] = P([]), [g, u] = P({}), [c, f] = P(a ?? []), C = S(), h = F((s) => {

package/lib/index.d.ts

@@ -230,8 +230,8 @@ export declare const mixedStorage: StateStorage;
 
 declare interface ModalState {
     open: Map<string, boolean>;
-    getOpen: (id: string) => boolean;
-    setOpen: (id: string, open: boolean) => void;
+    getOpen: (uuid: string) => boolean;
+    setOpen: (uuid: string, open: boolean) => void;
 }
 
 export declare const NavMenu: NamedExoticComponent<object>;
@@ -360,18 +360,18 @@ export declare interface TokenState {
     clearToken: () => void;
 }
 
-export declare function useFormModal<Values>(props: UseFormModalProps<Values>): {
+export declare function useFormModal<Values, ExtraValues = any>(props: UseFormModalProps<Values, ExtraValues>): {
     show: (config?: {
-        initialValues?: RecursivePartial<Values> | undefined;
-        extraValues?: any;
+        initialValues?: RecursivePartial<Values>;
+        extraValues?: ExtraValues;
     }) => void;
     hide: () => void;
     modal: JSX_2.Element;
 };
 
-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 interface UseFormModalProps<Values, ExtraValues> extends Omit<UseModalProps, 'afterClose' | 'onConfirm'> {
+    formProps?: Omit<FormProps, 'form'>;
+    onConfirm?: (values: Values, extraValues?: ExtraValues) => void | Promise<void>;
 }
 
 export declare const useGameStore: UseBoundStore<Omit<StoreApi<GameState>, "persist"> & {
@@ -392,8 +392,9 @@ export declare function useModal(props: UseModalProps): {
     modal: JSX_2.Element;
 };
 
-declare interface UseModalProps extends Pick<ModalProps, 'title' | 'width' | 'maskClosable' | 'onOk' | 'afterClose'> {
+declare interface UseModalProps extends Omit<ModalProps, 'open' | 'confirmLoading' | 'onOk' | 'onCancel'> {
     content?: ReactNode;
+    onConfirm?: () => void | Promise<void>;
 }
 
 export declare const useModalStore: UseBoundStore<StoreApi<ModalState>>;

package/lib/index.js

@@ -1,4 +1,4 @@
-import { C as r, D as u, F as n, 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 M, S as T, q as h, t as k, v as q, r as Q, b as R, x as v, y as B, z as C, c as N, B as f, u as w, E as D, J as E, d as H, a as I, K as O, M as W } from "./index-Jf-VYQNs.chunk.js";
+import { C as r, D as u, F as n, 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 M, S as T, q as h, t as k, v as q, r as Q, b as R, x as v, y as B, z as C, c as N, B as f, u as w, E as D, J as E, d as H, a as I, K as O, M as W } from "./index-DnAJsWzB.chunk.js";
 import "react";
 import "antd";
 import "react-dom";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-toolkits",
-  "version": "0.8.23",
+  "version": "0.8.25",
   "packageManager": "^pnpm@8.7.5",
   "sideEffects": [
     "**/*.css"
@@ -70,8 +70,8 @@
     "vite": "^5.0.10",
     "vite-plugin-dts": "^3.6.4",
     "@flow97/eslint-config-mono": "0.0.4",
-    "tailwind-config": "0.1.1",
-    "tsconfig": "0.0.5"
+    "tsconfig": "0.0.5",
+    "tailwind-config": "0.1.1"
   },
   "peerDependencies": {
     "antd": "^5.12.2",