@base-stone/hooks 1.1.2 → 1.1.4

package/README.md

@@ -15,11 +15,14 @@
 
 ```
 
-  const { tableProps, reload } = useTableList<ListItemData>(getCooperateList, {
-    orderField: 'createDate',
-    orderType: 'DESC',
-    taskStatuses: taskStatusesArr,
-    scope: scopeType
+  const { tableProps, reload } = useTableList<ListItemData>({
+    queryFn: getCooperateList,
+    params: {
+      orderField: 'createDate',
+      orderType: 'DESC',
+      taskStatuses: taskStatusesArr,
+      scope: scopeType
+    }
   })
   
   <Table rowKey="id" scroll={{ x: 'max-content' }} columns={columns} {...tableProps} />
@@ -33,9 +36,7 @@
 
   const { editModal, infoModal, memberModal, toggle } = useCreateModal(['edit', 'member', 'info'])
 
-  const onSetModalData = (type: string, data?: any) => {
-    toggle(type, data)
-  }
+  toggle(type, data)
 
 ```
 
@@ -44,9 +45,25 @@
 
 
 ```
-  const { sceneOptions, sceneMap } = useSelectOptions<string>(getRecruitSceneList, {
-    selectKey: 'scene',
+  const { sceneOptions, sceneMap } = useSelectOptions<string>({
+    queryFn: getRecruitSceneList,
+    dataKey: 'scene',
     fieldNames: { label: 'recruitTypeName', value: 'recruitEncrypt' }
   })
 
 ```
+
+### useRequestQuery 使用
+
+```
+
+  const { settlementInfo, refresh } = useRequestQuery<string, ListItemData>({
+    queryFn: getSettlementInfo,
+    dataKey: 'settlementInfo',
+    dataType: 'Object',
+    params: {
+      taskId
+    }
+  })
+
+```

package/dist/design-hooks.es.prod.d.ts

@@ -128,6 +128,7 @@ declare type SelectOption<T extends string | number = string | number> = {
     label: string;
     value: T;
     data?: Record<string, unknown>;
+    [key: string]: any;
 };
 
 declare type SelectOptionsResult<K extends string, T extends string | number> = Readonly<{

package/dist/design-hooks.es.prod.js

@@ -1,58 +1,58 @@
-import { useRef as b, useMemo as L, useState as S, useEffect as z, useId as B, useCallback as U } from "react";
-import { Empty as A, App as W } from "antd";
-import { create as X } from "zustand";
-var D = { exports: {} }, y = {};
-var N;
-function K() {
-  if (N) return y;
-  N = 1;
-  var s = /* @__PURE__ */ Symbol.for("react.transitional.element"), t = /* @__PURE__ */ Symbol.for("react.fragment");
-  function o(e, r, n) {
+import { useRef as k, useMemo as L, useState as S, useEffectEvent as O, useEffect as x, useId as U, useCallback as W } from "react";
+import { Empty as _, App as X } from "antd";
+import { create as K } from "zustand";
+var P = { exports: {} }, b = {};
+var A;
+function ee() {
+  if (A) return b;
+  A = 1;
+  var s = /* @__PURE__ */ Symbol.for("react.transitional.element"), o = /* @__PURE__ */ Symbol.for("react.fragment");
+  function t(e, n, r) {
     var p = null;
-    if (n !== void 0 && (p = "" + n), r.key !== void 0 && (p = "" + r.key), "key" in r) {
-      n = {};
-      for (var u in r)
-        u !== "key" && (n[u] = r[u]);
-    } else n = r;
-    return r = n.ref, {
+    if (r !== void 0 && (p = "" + r), n.key !== void 0 && (p = "" + n.key), "key" in n) {
+      r = {};
+      for (var u in n)
+        u !== "key" && (r[u] = n[u]);
+    } else r = n;
+    return n = r.ref, {
       $$typeof: s,
       type: e,
       key: p,
-      ref: r !== void 0 ? r : null,
-      props: n
+      ref: n !== void 0 ? n : null,
+      props: r
     };
   }
-  return y.Fragment = t, y.jsx = o, y.jsxs = o, y;
+  return b.Fragment = o, b.jsx = t, b.jsxs = t, b;
 }
 var j;
-function ee() {
-  return j || (j = 1, D.exports = K()), D.exports;
+function te() {
+  return j || (j = 1, P.exports = ee()), P.exports;
 }
-var te = ee();
-function M(s) {
-  const t = b(s);
-  t.current = L(() => s, [s]);
-  const o = b(void 0);
-  return o.current || (o.current = function(...e) {
-    return t.current.apply(this, e);
-  }), o.current;
+var oe = te();
+function y(s) {
+  const o = k(s);
+  o.current = L(() => s, [s]);
+  const t = k(void 0);
+  return t.current || (t.current = function(...e) {
+    return o.current.apply(this, e);
+  }), t.current;
 }
-const x = {
+const R = {
   sortField: ["orderType", "orderField"],
   sortOrder: ["ASC", "DESC"],
   pageSize: 10
 };
-function ne(s) {
-  Object.keys(s).forEach((t) => {
-    x[t] = s[t];
+function ie(s) {
+  Object.keys(s).forEach((o) => {
+    R[o] = s[o];
   });
 }
-function ie({
+function ce({
   queryFn: s,
-  params: t,
-  rowSelection: o
+  params: o,
+  rowSelection: t
 }) {
-  const e = x.pageSize, [r, n] = S({
+  const e = R.pageSize, [n, r] = S({
     pagination: {
       showSizeChanger: !0,
       showQuickJumper: !0,
@@ -64,224 +64,226 @@ function ie({
     queryParams: {
       pageNo: 1,
       pageSize: e,
-      ...t
+      ...o
     }
-  }), { pagination: p, list: u, queryParams: c } = r, { pageNo: a, pageSize: l } = c, [f, i] = S(!0), v = b(c), [g, E] = S([]), C = L(() => {
-    if (o)
+  }), { pagination: p, list: u, queryParams: l } = n, { pageNo: a, pageSize: i } = l, [f, c] = S(!0), [m, g] = S([]), E = L(() => {
+    if (t)
       return {
-        selectedRowKeys: g,
-        onChange: (d) => E(d)
+        selectedRowKeys: m,
+        onChange: (d) => g(d)
       };
-  }, [o, g]), $ = M(
-    (d) => `共 ${d} 条记录 第 ${a}/${Math.ceil(d / l)} 页 `
-  ), m = async (d) => {
-    const { pageNo: O } = d;
-    i(!0);
-    const h = { ...t, pageSize: l, ...d };
-    d.pageNo === void 0 && (h.pageNo = 1), d.pageSize === void 0 && (h.pageSize = l);
-    const { data: w } = await s(h), { list: P = [], totalCount: T = 0 } = w || {};
-    o && E([]), n({
-      list: P,
-      queryParams: h,
+  }, [t, m]), z = y(
+    (d) => `共 ${d} 条记录 第 ${a}/${Math.ceil(d / i)} 页 `
+  ), v = async (d) => {
+    const { pageNo: F } = d;
+    c(!0);
+    const M = { ...o, pageSize: i, ...d };
+    d.pageNo === void 0 && (M.pageNo = 1), d.pageSize === void 0 && (M.pageSize = i);
+    const { data: w } = await s(M), { list: T = [], totalCount: D = 0 } = w || {};
+    t && g([]), r({
+      list: T,
+      queryParams: M,
       pagination: {
         ...p,
-        current: O,
-        pageSize: h.pageSize,
-        total: T
+        current: F,
+        pageSize: M.pageSize,
+        total: D
       }
-    }), i(!1);
-  }, k = (d) => {
-    m({ ...c, ...d, pageNo: 1 });
+    }), c(!1);
+  }, $ = O(() => {
+    v({ ...l, pageNo: 1 });
+  }), h = (d) => {
+    v({ ...l, ...d, pageNo: 1 });
   }, q = (d) => {
-    m({ ...c, ...d });
-  }, F = (d) => {
-    m({ ...d, pageSize: l, pageNo: 1 });
-  }, J = (d, O, h, w) => {
-    const { action: P } = w;
-    if (["paginate", "sort"].includes(P)) {
-      const { current: T, pageSize: H } = d, { field: I, order: _ } = h, [G, V] = x.sortField, [Q, Y] = x.sortOrder, Z = {
-        ...c,
-        [G]: _ ? _ === "ascend" ? Q : Y : void 0,
-        [V]: I,
-        pageNo: T,
-        pageSize: H
+    v({ ...l, ...d });
+  }, J = (d) => {
+    v({ ...d, pageSize: i, pageNo: 1 });
+  }, H = (d, F, M, w) => {
+    const { action: T } = w;
+    if (["paginate", "sort"].includes(T)) {
+      const { current: D, pageSize: I } = d, { field: G, order: N } = M, [V, Q] = R.sortField, [Y, Z] = R.sortOrder, B = {
+        ...l,
+        [V]: N ? N === "ascend" ? Y : Z : void 0,
+        [Q]: G,
+        pageNo: D,
+        pageSize: I
       };
-      m(Z);
+      v(B);
     }
   };
-  return z(() => {
-    k(v.current);
+  return x(() => {
+    $();
   }, []), {
-    queryParams: c,
-    search: M(k),
-    refresh: M(q),
-    reset: M(F),
-    selectedRowKeys: g,
+    queryParams: l,
+    search: y(h),
+    refresh: y(q),
+    reset: y(J),
+    selectedRowKeys: m,
     tableProps: {
       bordered: !0,
       size: "middle",
       sticky: !0,
-      rowSelection: C,
+      rowSelection: E,
       loading: f,
       dataSource: u,
-      pagination: { ...p, showTotal: $ },
-      onChange: M(J),
+      pagination: { ...p, showTotal: z },
+      onChange: y(H),
       locale: {
-        emptyText: f ? "" : /* @__PURE__ */ te.jsx(A, { image: A.PRESENTED_IMAGE_SIMPLE })
+        emptyText: f ? "" : /* @__PURE__ */ oe.jsx(_, { image: _.PRESENTED_IMAGE_SIMPLE })
       }
     }
   };
 }
-const R = X((s) => ({
+const C = K((s) => ({
   modals: {},
-  toggleModal: (t, o) => s((e) => {
-    const n = e.modals[t]?.visible || !1;
+  toggleModal: (o, t) => s((e) => {
+    const r = e.modals[o]?.visible || !1;
     return {
       modals: {
         ...e.modals,
-        [t]: {
-          visible: !n,
-          data: n ? {} : o || {}
+        [o]: {
+          visible: !r,
+          data: r ? {} : t || {}
         }
       }
     };
   }),
-  setModal: (t, o, e) => s((r) => ({
+  setModal: (o, t, e) => s((n) => ({
     modals: {
-      ...r.modals,
-      [t]: {
-        visible: o,
-        data: o ? e || {} : {}
+      ...n.modals,
+      [o]: {
+        visible: t,
+        data: t ? e || {} : {}
       }
     }
   })),
-  clearModals: (t) => s((o) => {
-    const e = { ...o.modals };
-    return t.forEach((r) => {
-      delete e[r];
+  clearModals: (o) => s((t) => {
+    const e = { ...t.modals };
+    return o.forEach((n) => {
+      delete e[n];
     }), { modals: e };
   })
 }));
-function ce(s) {
-  const t = R((a) => a.modals), o = R((a) => a.toggleModal), e = R((a) => a.setModal), r = R((a) => a.clearModals), n = B(), p = b([]), u = Object.keys(s);
-  z(() => (p.current = u.map(
-    (a) => `${n}-${a}`
+function le(s) {
+  const o = C((a) => a.modals), t = C((a) => a.toggleModal), e = C((a) => a.setModal), n = C((a) => a.clearModals), r = U(), p = k([]), u = Object.keys(s);
+  x(() => (p.current = u.map(
+    (a) => `${r}-${a}`
   ), () => {
-    r(p.current);
+    n(p.current);
   }), []);
-  const c = {};
+  const l = {};
   return u.forEach((a) => {
-    const l = `${n}-${a}`, f = t[l] ?? { visible: !1, data: {} }, i = s[a], v = typeof i.title == "function" ? i.title(f.data) : i.title;
-    c[`${a}Modal`] = {
+    const i = `${r}-${a}`, f = o[i] ?? { visible: !1, data: {} }, c = s[a], m = typeof c.title == "function" ? c.title(f.data) : c.title;
+    l[`${a}Modal`] = {
       visible: f.visible,
       data: f.data,
       modalProps: {
-        width: i.width,
-        title: v,
+        width: c.width,
+        title: m,
         open: f.visible,
-        maskClosable: i.maskClosable ?? !1,
-        centered: i.centered ?? !0,
-        destroyOnHidden: i.destroyOnHidden ?? !0,
-        onCancel: i.onCancel ?? (() => e(l, !1))
+        maskClosable: c.maskClosable ?? !1,
+        centered: c.centered ?? !0,
+        destroyOnHidden: c.destroyOnHidden ?? !0,
+        onCancel: c.onCancel ?? (() => e(i, !1))
       },
       drawerProps: {
-        size: i.width,
-        title: v,
+        size: c.width,
+        title: m,
         open: f.visible,
-        maskClosable: i.maskClosable ?? !0,
-        destroyOnHidden: i.destroyOnHidden ?? !0,
-        placement: i.placement ?? "right",
-        onClose: i.onClose ?? (() => e(l, !1))
+        maskClosable: c.maskClosable ?? !0,
+        destroyOnHidden: c.destroyOnHidden ?? !0,
+        placement: c.placement ?? "right",
+        onClose: c.onClose ?? (() => e(i, !1))
       },
-      toggle: (g) => o(l, g),
-      open: (g) => e(l, !0, g),
-      close: () => e(l, !1)
+      toggle: (g) => t(i, g),
+      open: (g) => e(i, !0, g),
+      close: () => e(i, !1)
     };
-  }), c.toggle = (a, l) => {
-    o(`${n}-${a}`, l);
-  }, c.open = (a, l) => {
-    e(`${n}-${a}`, !0, l);
-  }, c.close = (a) => {
-    e(`${n}-${a}`, !1);
-  }, c;
+  }), l.toggle = (a, i) => {
+    t(`${r}-${a}`, i);
+  }, l.open = (a, i) => {
+    e(`${r}-${a}`, !0, i);
+  }, l.close = (a) => {
+    e(`${r}-${a}`, !1);
+  }, l;
 }
-const oe = (s, t = "value", o = "label") => new Map(s.map((e) => [e[t], e[o]]));
-function le({ queryFn: s, params: t, dataKey: o, fieldNames: e }) {
-  const [r, n] = S({
+const ae = (s, o = "value", t = "label") => new Map(s.map((e) => [e[o], e[t]]));
+function ue({ queryFn: s, params: o, dataKey: t, fieldNames: e }) {
+  const [n, r] = S({
     list: [],
     mapData: /* @__PURE__ */ new Map()
-  }), [p, u] = S(!0), c = async () => {
+  }), [p, u] = S(!0), l = async () => {
     u(!0);
-    const { data: i } = await s(t), v = i || [];
+    const { data: m } = await s(o), g = m || [];
     if (e) {
-      const { label: g, value: E } = e, C = v.map((m) => ({
-        data: m,
-        label: m[g],
-        value: m[E]
-      })), $ = oe(C);
-      n((m) => ({ ...m, options: C, mapData: $ }));
+      const { label: E, value: z } = e, v = g.map((h) => ({
+        data: h,
+        label: h[E],
+        value: h[z]
+      })), $ = ae(v);
+      r((h) => ({ ...h, list: v, mapData: $ }));
     } else
-      n((g) => ({ ...g, options: v }));
+      r((E) => ({ ...E, list: g }));
     u(!1);
-  }, a = M(() => {
-    c();
+  }, a = O(l), i = y(() => {
+    l();
   });
-  z(() => {
-    c();
+  x(() => {
+    a();
   }, []);
-  const { list: l, mapData: f } = r;
+  const { list: f, mapData: c } = n;
   return {
     loading: p,
-    refresh: a,
-    [`${o}Options`]: l,
-    [`${o}Map`]: f
+    refresh: i,
+    [`${t}Options`]: f,
+    [`${t}Map`]: c
   };
 }
-function ue(s, t) {
-  const [o, e] = S(!1), { message: r } = W.useApp(), n = U(async (p) => {
+function de(s, o) {
+  const [t, e] = S(!1), { message: n } = X.useApp(), r = W(async (p) => {
     try {
       e(!0);
-      const u = await s(p), { status: c, info: a } = u;
-      c == "success" && (t(u), r.success(a));
+      const u = await s(p), { status: l, info: a } = u;
+      l == "success" && (o(u), n.success(a));
     } catch {
     }
     e(!1);
-  }, [s, t, r]);
+  }, [s, o, n]);
   return {
-    loading: o,
-    submit: n
+    loading: t,
+    submit: r
   };
 }
-function de({
+function pe({
   queryFn: s,
-  params: t,
-  dataType: o,
+  params: o,
+  dataType: t,
   dataKey: e,
-  initialValue: r
+  initialValue: n
 }) {
-  const n = r || (o === "Array" ? [] : /* @__PURE__ */ Object.create({})), [p, u] = S(n), [c, a] = S(!1), l = b(t), f = async (v) => {
+  const r = n || (t === "Array" ? [] : /* @__PURE__ */ Object.create({})), [p, u] = S(r), [l, a] = S(!1), i = async (m) => {
     a(!0);
-    const g = await s(v ?? t);
+    const g = await s(m ?? o);
     u(g.data);
-  };
-  z(() => {
-    f(l.current);
-  }, []);
-  const i = M(() => {
+  }, f = O(i);
+  x(() => {
     f();
+  }, []);
+  const c = y(() => {
+    i();
   });
   return {
     [e]: p,
-    loading: c,
-    refresh: i
+    loading: l,
+    refresh: c
   };
 }
 export {
-  ne as configureTableOption,
-  ce as useCreateModal,
-  ue as useFormSubmit,
-  M as useMemoizedFn,
-  de as useRequestQuery,
-  le as useSelectOptions,
-  ie as useTableList
+  ie as configureTableOption,
+  le as useCreateModal,
+  de as useFormSubmit,
+  y as useMemoizedFn,
+  pe as useRequestQuery,
+  ue as useSelectOptions,
+  ce as useTableList
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@base-stone/hooks",
   "license": "MIT",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "author": {
     "name": "leafront",
     "email": "leafront@126.com"
@@ -37,8 +37,8 @@
   },
   "devDependencies": {
     "@eslint/js": "^9.39.2",
-    "@types/node": "^25.0.3",
-    "@types/react": "^19.2.7",
+    "@types/node": "^25.0.6",
+    "@types/react": "^19.2.8",
     "@vitejs/plugin-react-swc": "^4.2.2",
     "classnames": "^2.5.1",
     "eslint": "^9.39.2",
@@ -55,6 +55,6 @@
   "dependencies": {
     "antd": "^6.1.4",
     "react": "^19.2.3",
-    "zustand": "^5.0.9"
+    "zustand": "^5.0.10"
   }
 }