@base-stone/hooks 1.0.5 → 1.0.7

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

@@ -72,6 +72,14 @@ declare type PickFunction<T extends noop> = (this: ThisParameterType<T>, ...args
 
 declare type Placement = 'top' | 'bottom' | 'left' | 'right';
 
+declare interface QueryOptions<K extends string = string, T = Record<string, any> | Record<string, any>[] | undefined> {
+    queryFn: (data: QueryParamsData_2) => Promise<QueryResponse_2<T>>;
+    params?: Record<string, any> | undefined;
+    dataType: DataType;
+    dataKey: K;
+    initialValue: T;
+}
+
 export declare interface QueryParamsData {
     pageNo: number;
     pageSize: number;
@@ -92,6 +100,13 @@ declare interface QueryResponse_2<T> {
     data: T;
 }
 
+declare type QueryResult<K extends string = string, T = Record<string, any> | Record<string, any>[]> = {
+    loading: boolean;
+    refresh: () => void;
+} & {
+    [P in K]?: T;
+};
+
 declare interface RequestFn {
     (val?: unknown): Promise<{
         status: string;
@@ -99,20 +114,6 @@ declare interface RequestFn {
     }>;
 }
 
-declare interface RequestQueryOptions<K extends string = string, T = Record<string, any> | Record<string, any>[]> {
-    queryFn: (data: QueryParamsData_2) => Promise<QueryResponse_2<T>>;
-    params?: Record<string, any>;
-    dataType: DataType;
-    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>;
@@ -195,7 +196,7 @@ export declare function useFormSubmit(requestFn: RequestFn, successFn: SuccessFn
 
 export declare function useMemoizedFn<T extends noop>(fn: T): PickFunction<T>;
 
-export declare function useRequestQuery<K extends string = string, T = Record<string, any> | Record<string, any>[]>({ queryFn, params, dataType, dataKey }: RequestQueryOptions<K, T>): RequestQueryResult<K, T>;
+export declare function useRequestQuery<K extends string = string, T = Record<string, any> | Record<string, any>[] | undefined>({ queryFn, params, dataType, dataKey, initialValue }: QueryOptions<K, T>): QueryResult<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>;
 

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

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

package/package.json

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