@base-stone/hooks 1.0.1 → 1.0.3

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

@@ -78,11 +78,18 @@ export declare interface QueryParamsData {
     [key: string]: any;
 }
 
+declare type QueryParamsData_2 = Record<string, any>;
+
 declare interface QueryResponse {
     status: string;
     data: Record<string, any>[];
 }
 
+declare interface QueryResponse_2<T> {
+    status: string;
+    data: T;
+}
+
 declare interface RequestFn {
     (val?: unknown): Promise<{
         status: string;
@@ -90,15 +97,25 @@ declare interface RequestFn {
     }>;
 }
 
+declare interface RequestQueryOptions<T, P = Record<string, any>> {
+    queryFn: (data: QueryParamsData_2) => Promise<QueryResponse_2<T>>;
+    initialValue?: T;
+    params?: P;
+}
+
+declare interface RequestQueryResult<T> {
+    data: T;
+    loading: boolean;
+    refresh: () => void;
+}
+
 declare interface SelectConfig<K extends string> {
     queryFn: (data: Record<string, any>) => Promise<QueryResponse>;
-    options: {
-        params?: Record<string, any>;
-        selectKey: K;
-        fieldNames?: {
-            label: string;
-            value: string;
-        };
+    params?: Record<string, any>;
+    selectKey: K;
+    fieldNames?: {
+        label: string;
+        value: string;
     };
 }
 
@@ -123,10 +140,8 @@ declare interface SuccessFn {
 
 declare interface TableOptions<T, P = Record<string, any>> {
     queryFn: (data: QueryParamsData) => Promise<TableResponse<T>>;
-    options?: {
-        params: P;
-        rowSelection: boolean;
-    };
+    params?: P;
+    rowSelection?: boolean;
 }
 
 export declare interface TableProps<T> {
@@ -176,8 +191,10 @@ export declare function useFormSubmit(requestFn: RequestFn, successFn: SuccessFn
 
 export declare function useMemoizedFn<T extends noop>(fn: T): PickFunction<T>;
 
-export declare function useSelectOptions<T extends string | number = string | number, K extends string = string>({ queryFn, options }: SelectConfig<K>): SelectOptionsResult<K, T>;
+export declare function useRequestQuery<T, P = Record<string, any>>({ queryFn, params, initialValue }: RequestQueryOptions<T, P>): RequestQueryResult<T>;
+
+export declare function useSelectOptions<T extends string | number = string | number, K extends string = string>({ queryFn, params, selectKey, fieldNames }: SelectConfig<K>): SelectOptionsResult<K, T>;
 
-export declare function useTableList<T extends Record<string, any> = Record<string, any>>({ queryFn, options }: TableOptions<T>): TableResult<T>;
+export declare function useTableList<T extends Record<string, any> = Record<string, any>>({ queryFn, params: initParams, rowSelection }: TableOptions<T>): TableResult<T>;
 
 export { }

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

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@base-stone/hooks",
   "license": "MIT",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "author": {
     "name": "leafront",
     "email": "leafront@126.com"