@base-stone/hooks 1.0.4 → 1.0.6

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

@@ -10,6 +10,8 @@ import { TableProps as TableProps_2 } from 'antd';
  */
 export declare function configureTableOption(config: GlobalTableConfig): void;
 
+declare type DataType = 'Array' | 'Object';
+
 export declare interface DrawerProps {
     size: number | 'default' | 'large';
     title: string | ReactElement;
@@ -97,14 +99,15 @@ declare interface RequestFn {
     }>;
 }
 
-declare interface RequestQueryOptions<K extends string = string, T = Record<string, any>> {
+declare interface RequestQueryOptions<K extends string = string, T = Record<string, any> | Record<string, any>[] | undefined> {
     queryFn: (data: QueryParamsData_2) => Promise<QueryResponse_2<T>>;
-    initialValue?: T;
     params?: Record<string, any>;
+    dataType: DataType;
     dataKey: K;
+    initialValue: T;
 }
 
-declare type RequestQueryResult<K extends string = string, T = Record<string, any>> = {
+declare type RequestQueryResult<K extends string = string, T = Record<string, any> | Record<string, any>[]> = {
     loading: boolean;
     refresh: () => void;
 } & {
@@ -193,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>>({ queryFn, params, initialValue, 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 }: 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>;
 

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

@@ -1,37 +1,37 @@
-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 { useRef as x, useMemo as q, useState as v, useEffect as P, 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 q;
+var D = { exports: {} }, y = {};
+var N;
 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, s, n) {
+  if (N) return y;
+  N = 1;
+  var r = /* @__PURE__ */ Symbol.for("react.transitional.element"), o = /* @__PURE__ */ Symbol.for("react.fragment");
+  function t(e, a, 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), a.key !== void 0 && (p = "" + a.key), "key" in a) {
       n = {};
-      for (var d in s)
-        d !== "key" && (n[d] = s[d]);
-    } else n = s;
-    return s = n.ref, {
-      $$typeof: a,
+      for (var d in a)
+        d !== "key" && (n[d] = a[d]);
+    } else n = a;
+    return a = n.ref, {
+      $$typeof: r,
       type: e,
       key: p,
-      ref: s !== void 0 ? s : null,
+      ref: a !== void 0 ? a : null,
       props: n
     };
   }
   return y.Fragment = o, y.jsx = t, y.jsxs = t, y;
 }
-var A;
+var j;
 function ee() {
-  return A || (A = 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 = F(() => a, [a]);
+function M(r) {
+  const o = x(r);
+  o.current = q(() => r, [r]);
   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(a) {
-  Object.keys(a).forEach((o) => {
-    R[o] = a[o];
+function ne(r) {
+  Object.keys(r).forEach((o) => {
+    R[o] = r[o];
   });
 }
 function ie({
-  queryFn: a,
+  queryFn: r,
   params: o,
   rowSelection: t
 }) {
-  const e = R.pageSize, [s, n] = v({
+  const e = R.pageSize, [a, n] = v({
     pagination: {
       showSizeChanger: !0,
       showQuickJumper: !0,
@@ -66,20 +66,20 @@ function ie({
       pageSize: e,
       ...o
     }
-  }), { pagination: p, list: d, queryParams: l } = s, { pageNo: r, pageSize: c } = l, [g, i] = v(!0), S = x(l), [f, b] = v([]), E = F(() => {
+  }), { pagination: p, list: d, queryParams: i } = a, { pageNo: s, pageSize: c } = i, [g, l] = v(!0), S = x(i), [f, b] = v([]), E = q(() => {
     if (t)
       return {
         selectedRowKeys: f,
         onChange: (u) => b(u)
       };
   }, [t, f]), z = M(
-    (u) => `共 ${u} 条记录 第 ${r}/${Math.ceil(u / c)} 页 `
+    (u) => `共 ${u} 条记录 第 ${s}/${Math.ceil(u / c)} 页 `
   ), m = async (u) => {
     const { pageNo: O } = u;
-    i(!0);
+    l(!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 } = $ || {};
+    const { data: $ } = await r(h), { list: T = [], totalCount: w = 0 } = $ || {};
     t && b([]), n({
       list: T,
       queryParams: h,
@@ -89,18 +89,18 @@ function ie({
         pageSize: h.pageSize,
         total: w
       }
-    }), i(!1);
+    }), l(!1);
   }, k = (u) => {
-    m({ ...l, ...u, pageNo: 1 });
+    m({ ...i, ...u, pageNo: 1 });
+  }, F = (u) => {
+    m({ ...i, ...u });
   }, 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,
+        ...i,
         [G]: _ ? _ === "ascend" ? V : Y : void 0,
         [Q]: I,
         pageNo: w,
@@ -109,13 +109,13 @@ function ie({
       m(Z);
     }
   };
-  return D(() => {
+  return P(() => {
     k(S.current);
   }, []), {
-    queryParams: l,
+    queryParams: i,
     search: M(k),
-    refresh: M(L),
-    reset: M(j),
+    refresh: M(F),
+    reset: M(L),
     selectedRowKeys: f,
     tableProps: {
       bordered: !0,
@@ -127,14 +127,14 @@ function ie({
       pagination: { ...p, showTotal: z },
       onChange: M(J),
       locale: {
-        emptyText: g ? "" : /* @__PURE__ */ te.jsx(N, { image: N.PRESENTED_IMAGE_SIMPLE })
+        emptyText: g ? "" : /* @__PURE__ */ te.jsx(A, { image: A.PRESENTED_IMAGE_SIMPLE })
       }
     }
   };
 }
-const C = X((a) => ({
+const C = X((r) => ({
   modals: {},
-  toggleModal: (o, t) => a((e) => {
+  toggleModal: (o, t) => r((e) => {
     const n = e.modals[o]?.visible || !1;
     return {
       modals: {
@@ -146,73 +146,73 @@ const C = X((a) => ({
       }
     };
   }),
-  setModal: (o, t, e) => a((s) => ({
+  setModal: (o, t, e) => r((a) => ({
     modals: {
-      ...s.modals,
+      ...a.modals,
       [o]: {
         visible: t,
         data: t ? e || {} : {}
       }
     }
   })),
-  clearModals: (o) => a((t) => {
+  clearModals: (o) => r((t) => {
     const e = { ...t.modals };
-    return o.forEach((s) => {
-      delete e[s];
+    return o.forEach((a) => {
+      delete e[a];
     }), { 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 le(r) {
+  const o = C((s) => s.modals), t = C((s) => s.toggleModal), e = C((s) => s.setModal), a = C((s) => s.clearModals), n = B(), p = x([]), d = Object.keys(r);
+  P(() => (p.current = d.map(
+    (s) => `${n}-${s}`
   ), () => {
-    s(p.current);
+    a(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`] = {
+  const i = {};
+  return d.forEach((s) => {
+    const c = `${n}-${s}`, g = o[c] ?? { visible: !1, data: {} }, l = r[s], S = typeof l.title == "function" ? l.title(g.data) : l.title;
+    i[`${s}Modal`] = {
       visible: g.visible,
       data: g.data,
       modalProps: {
-        width: i.width,
+        width: l.width,
         title: S,
         open: g.visible,
-        maskClosable: i.maskClosable ?? !1,
-        centered: i.centered ?? !0,
-        destroyOnHidden: i.destroyOnHidden ?? !0,
-        onCancel: i.onCancel ?? (() => e(c, !1))
+        maskClosable: l.maskClosable ?? !1,
+        centered: l.centered ?? !0,
+        destroyOnHidden: l.destroyOnHidden ?? !0,
+        onCancel: l.onCancel ?? (() => e(c, !1))
       },
       drawerProps: {
-        size: i.width,
+        size: l.width,
         title: S,
         open: g.visible,
-        maskClosable: i.maskClosable ?? !0,
-        destroyOnHidden: i.destroyOnHidden ?? !0,
-        placement: i.placement ?? "right",
-        onClose: i.onClose ?? (() => e(c, !1))
+        maskClosable: l.maskClosable ?? !0,
+        destroyOnHidden: l.destroyOnHidden ?? !0,
+        placement: l.placement ?? "right",
+        onClose: l.onClose ?? (() => e(c, !1))
       },
       toggle: (f) => t(c, f),
       open: (f) => e(c, !0, f),
       close: () => e(c, !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;
+  }), i.toggle = (s, c) => {
+    t(`${n}-${s}`, c);
+  }, i.open = (s, c) => {
+    e(`${n}-${s}`, !0, c);
+  }, i.close = (s) => {
+    e(`${n}-${s}`, !1);
+  }, i;
 }
-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 = (r, o = "value", t = "label") => new Map(r.map((e) => [e[o], e[t]]));
+function ce({ queryFn: r, params: o, dataKey: t, fieldNames: e }) {
+  const [a, n] = v({
     list: [],
     mapData: /* @__PURE__ */ new Map()
-  }), [p, d] = v(!0), l = async () => {
+  }), [p, d] = v(!0), i = async () => {
     d(!0);
-    const { data: i } = await a(o), S = i || [];
+    const { data: l } = await r(o), S = l || [];
     if (e) {
       const { label: f, value: b } = e, E = S.map((m) => ({
         data: m,
@@ -223,43 +223,44 @@ function ce({ queryFn: a, params: o, dataKey: t, fieldNames: e }) {
     } else
       n((f) => ({ ...f, options: S }));
     d(!1);
-  }, r = M(void 0);
-  D(() => {
-    l();
+  }, s = M(void 0);
+  P(() => {
+    i();
   }, []);
-  const { list: c, mapData: g } = s;
+  const { list: c, mapData: g } = a;
   return {
     loading: p,
-    refresh: r,
+    refresh: s,
     [`${t}Options`]: c,
     [`${t}Map`]: g
   };
 }
-function ue(a, o) {
-  const [t, e] = v(!1), { message: s } = W.useApp(), n = U(async (p) => {
+function ue(r, o) {
+  const [t, e] = v(!1), { message: a } = 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 d = await r(p), { status: i, info: s } = d;
+      i == "success" && (o(d), a.success(s));
     } catch {
     }
     e(!1);
-  }, [a, o, s]);
+  }, [r, o, a]);
   return {
     loading: t,
     submit: n
   };
 }
 function de({
-  queryFn: a,
+  queryFn: r,
   params: o,
-  initialValue: t,
-  dataKey: e
+  dataType: t,
+  dataKey: e,
+  initialValue: a
 }) {
-  const [s, n] = v(t), [p, d] = v(!1);
+  const n = a || (t === "Array" ? [] : /* @__PURE__ */ Object.create({})), [p, d] = v(n), [i, s] = v(!1);
   return {
-    [e]: s,
-    loading: p,
+    [e]: p,
+    loading: i,
     refresh: M(void 0)
   };
 }

package/package.json

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