@base-stone/hooks 1.0.2 → 1.0.4

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,10 +97,24 @@ declare interface RequestFn {
     }>;
 }
 
+declare interface RequestQueryOptions<K extends string = string, T = Record<string, any>> {
+    queryFn: (data: QueryParamsData_2) => Promise<QueryResponse_2<T>>;
+    initialValue?: T;
+    params?: Record<string, any>;
+    dataKey: K;
+}
+
+declare type RequestQueryResult<K extends string = string, T = Record<string, any>> = {
+    loading: boolean;
+    refresh: () => void;
+} & {
+    [P in K]?: T;
+};
+
 declare interface SelectConfig<K extends string> {
     queryFn: (data: Record<string, any>) => Promise<QueryResponse>;
     params?: Record<string, any>;
-    selectKey: K;
+    dataKey: K;
     fieldNames?: {
         label: string;
         value: string;
@@ -172,7 +193,9 @@ 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, params, selectKey, fieldNames }: SelectConfig<K>): SelectOptionsResult<K, T>;
+export declare function useRequestQuery<K extends string = string, T = Record<string, any>>({ queryFn, params, initialValue, dataKey }: RequestQueryOptions<K, T>): RequestQueryResult<K, T>;
+
+export declare function useSelectOptions<T extends string | number = string | number, K extends string = string>({ queryFn, params, dataKey, fieldNames }: SelectConfig<K>): SelectOptionsResult<K, T>;
 
 export declare function useTableList<T extends Record<string, any> = Record<string, any>>({ queryFn, params: initParams, rowSelection }: TableOptions<T>): TableResult<T>;
 

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

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