@base-stone/hooks 1.0.0 → 1.0.1

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

@@ -78,6 +78,11 @@ export declare interface QueryParamsData {
     [key: string]: any;
 }
 
+declare interface QueryResponse {
+    status: string;
+    data: Record<string, any>[];
+}
+
 declare interface RequestFn {
     (val?: unknown): Promise<{
         status: string;
@@ -85,14 +90,17 @@ declare interface RequestFn {
     }>;
 }
 
-declare type SelectConfig<K extends string> = Readonly<{
-    params?: Record<string, any>;
-    selectKey: K;
-    fieldNames?: {
-        label: string;
-        value: string;
+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;
+        };
     };
-}>;
+}
 
 declare type SelectOption<T extends string | number = string | number> = {
     label: string;
@@ -113,17 +121,12 @@ declare interface SuccessFn {
     (data: Record<string, any>): void;
 }
 
-declare interface TableListResult<T> {
-    /** 查询参数 */
-    queryParams: QueryParamsData;
-    /** 执行查询方法 */
-    search: (params?: Record<string, any>) => void;
-    refresh: (params?: Record<string, any>) => void;
-    reset: (params?: Record<string, any>) => void;
-    /** 选中的行 keys */
-    selectedRowKeys: Key[];
-    /** 表格属性 */
-    tableProps: TableProps<T>;
+declare interface TableOptions<T, P = Record<string, any>> {
+    queryFn: (data: QueryParamsData) => Promise<TableResponse<T>>;
+    options?: {
+        params: P;
+        rowSelection: boolean;
+    };
 }
 
 export declare interface TableProps<T> {
@@ -148,6 +151,19 @@ declare interface TableResponse<T> {
     };
 }
 
+declare interface TableResult<T> {
+    /** 查询参数 */
+    queryParams: QueryParamsData;
+    /** 执行查询方法 */
+    search: (params?: Record<string, any>) => void;
+    refresh: (params?: Record<string, any>) => void;
+    reset: (params?: Record<string, any>) => void;
+    /** 选中的行 keys */
+    selectedRowKeys: Key[];
+    /** 表格属性 */
+    tableProps: TableProps<T>;
+}
+
 export declare function useCreateModal<const T extends Record<string, ModalConfig>>(configs: T): {
     [K in keyof T as `${string & K}Modal`]: ModalInstance;
 } & {
@@ -160,8 +176,8 @@ 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>(getRequestFn: (params: Record<string, any>) => Promise<any>, selectConfig: SelectConfig<K>): SelectOptionsResult<K, 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 useTableList<T extends Record<string, any> = Record<string, any>>(getRequestFn: (data: QueryParamsData) => Promise<TableResponse<T>>, initParams?: Record<string, any>): TableListResult<T>;
+export declare function useTableList<T extends Record<string, any> = Record<string, any>>({ queryFn, options }: TableOptions<T>): TableResult<T>;
 
 export { }

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

@@ -1,15 +1,15 @@
-import { useRef as w, useMemo as F, useState as M, useEffect as D, useId as W, useCallback as q } from "react";
+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: {} }, y = {};
-var L;
+var k = { exports: {} }, b = {};
+var j;
 function ee() {
-  if (L) return y;
-  L = 1;
+  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 d = null;
-    if (n !== void 0 && (d = "" + n), r.key !== void 0 && (d = "" + r.key), "key" in r) {
+    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]);
@@ -17,21 +17,21 @@ function ee() {
     return r = n.ref, {
       $$typeof: s,
       type: t,
-      key: d,
+      key: u,
       ref: r !== void 0 ? r : null,
       props: n
     };
   }
-  return y.Fragment = a, y.jsx = o, y.jsxs = o, y;
+  return b.Fragment = a, b.jsx = o, b.jsxs = o, b;
 }
-var j;
+var F;
 function te() {
-  return j || (j = 1, k.exports = ee()), k.exports;
+  return F || (F = 1, k.exports = ee()), k.exports;
 }
 var oe = te();
-function b(s) {
+function M(s) {
   const a = w(s);
-  a.current = F(() => s, [s]);
+  a.current = L(() => s, [s]);
   const o = w(void 0);
   return o.current || (o.current = function(...t) {
     return a.current.apply(this, t);
@@ -47,8 +47,11 @@ function ie(s) {
     x[a] = s[a];
   });
 }
-function le(s, a = {}) {
-  const { rowSelection: o, ...t } = a, r = x.pageSize, [n, d] = M({
+function le({
+  queryFn: s,
+  options: a
+}) {
+  const { rowSelection: o, params: t } = a || {}, r = x.pageSize, [n, u] = y({
     pagination: {
       showSizeChanger: !0,
       showQuickJumper: !0,
@@ -62,21 +65,21 @@ function le(s, a = {}) {
       pageSize: r,
       ...t
     }
-  }), { pagination: c, list: p, queryParams: e } = n, { pageNo: u, pageSize: f } = e, [i, S] = M(!0), g = w(e), [v, E] = M([]), C = F(() => {
+  }), { 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)
       return {
         selectedRowKeys: v,
         onChange: (l) => E(l)
       };
-  }, [o, v]), z = b(
-    (l) => `共 ${l} 条记录 第 ${u}/${Math.ceil(l / f)} 页 `
+  }, [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([]), d({
+    o && E([]), u({
       list: P,
       queryParams: h,
       pagination: {
@@ -88,30 +91,30 @@ function le(s, a = {}) {
     }), S(!1);
   }, N = (l) => {
     m({ ...e, ...l, pageNo: 1 });
-  }, I = (l) => {
+  }, 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: G } = l, { field: V, order: _ } = h, [Q, Y] = x.sortField, [Z, B] = x.sortOrder, U = {
+      const { current: T, pageSize: I } = l, { field: G, order: _ } = h, [V, Q] = x.sortField, [Y, Z] = x.sortOrder, B = {
         ...e,
-        [Q]: _ ? _ === "ascend" ? Z : B : void 0,
-        [Y]: V,
+        [V]: _ ? _ === "ascend" ? Y : Z : void 0,
+        [Q]: G,
         pageNo: T,
-        pageSize: G
+        pageSize: I
       };
-      m(U);
+      m(B);
     }
   };
   return D(() => {
     N(g.current);
   }, []), {
     queryParams: e,
-    search: b(N),
-    refresh: b(I),
-    reset: b(J),
+    search: M(N),
+    refresh: M(q),
+    reset: M(J),
     selectedRowKeys: v,
     tableProps: {
       bordered: !0,
@@ -121,7 +124,7 @@ function le(s, a = {}) {
       loading: i,
       dataSource: p,
       pagination: { ...c, showTotal: z },
-      onChange: b(H),
+      onChange: M(H),
       locale: {
         emptyText: i ? "" : /* @__PURE__ */ oe.jsx(A, { image: A.PRESENTED_IMAGE_SIMPLE })
       }
@@ -159,15 +162,15 @@ const R = K((s) => ({
   })
 }));
 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 = W(), d = w([]), c = Object.keys(s);
-  D(() => (d.current = c.map(
+  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}`
   ), () => {
-    r(d.current);
+    r(u.current);
   }), []);
   const p = {};
   return c.forEach((e) => {
-    const u = `${n}-${e}`, f = a[u] ?? { visible: !1, data: {} }, i = s[e], S = typeof i.title == "function" ? i.title(f.data) : i.title;
+    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,
@@ -178,7 +181,7 @@ function ce(s) {
         maskClosable: i.maskClosable ?? !1,
         centered: i.centered ?? !0,
         destroyOnHidden: i.destroyOnHidden ?? !0,
-        onCancel: i.onCancel ?? (() => t(u, !1))
+        onCancel: i.onCancel ?? (() => t(d, !1))
       },
       drawerProps: {
         size: i.width,
@@ -187,28 +190,28 @@ function ce(s) {
         maskClosable: i.maskClosable ?? !0,
         destroyOnHidden: i.destroyOnHidden ?? !0,
         placement: i.placement ?? "right",
-        onClose: i.onClose ?? (() => t(u, !1))
+        onClose: i.onClose ?? (() => t(d, !1))
       },
-      toggle: (g) => o(u, g),
-      open: (g) => t(u, !0, g),
-      close: () => t(u, !1)
+      toggle: (g) => o(d, g),
+      open: (g) => t(d, !0, g),
+      close: () => t(d, !1)
     };
-  }), p.toggle = (e, u) => {
-    o(`${n}-${e}`, u);
-  }, p.open = (e, u) => {
-    t(`${n}-${e}`, !0, u);
+  }), 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;
 }
 const ae = (s, a = "value", o = "label") => new Map(s.map((t) => [t[a], t[o]]));
-function ue(s, a) {
-  const [o, t] = M({
-    options: [],
+function de({ queryFn: s, options: a }) {
+  const [o, t] = y({
+    list: [],
     mapData: /* @__PURE__ */ new Map()
-  }), [r, n] = M(!0), { params: d, selectKey: c, fieldNames: p } = a, e = async () => {
+  }), [r, n] = y(!0), { params: u, selectKey: c, fieldNames: p } = a, e = async () => {
     n(!0);
-    const { data: S } = await s(d), g = S || [];
+    const { data: S } = await s(u), g = S || [];
     if (p) {
       const { label: v, value: E } = p, C = g.map((m) => ({
         data: m,
@@ -219,25 +222,23 @@ function ue(s, a) {
     } else
       t((v) => ({ ...v, options: g }));
     n(!1);
-  }, u = q(() => {
-    e();
-  }, [e]);
+  }, d = M(void 0);
   D(() => {
-    u();
+    e();
   }, []);
-  const { options: f, mapData: i } = o;
+  const { list: f, mapData: i } = o;
   return {
     loading: r,
-    refresh: u,
+    refresh: d,
     [`${c}Options`]: f,
     [`${c}Map`]: i
   };
 }
-function de(s, a) {
-  const [o, t] = M(!1), { message: r } = X.useApp(), n = q(async (d) => {
+function ue(s, a) {
+  const [o, t] = y(!1), { message: r } = X.useApp(), n = W(async (u) => {
     try {
       t(!0);
-      const c = await s(d), { status: p, info: e } = c;
+      const c = await s(u), { status: p, info: e } = c;
       p == "success" && (a(c), r.success(e));
     } catch {
     }
@@ -251,8 +252,8 @@ function de(s, a) {
 export {
   ie as configureTableOption,
   ce as useCreateModal,
-  de as useFormSubmit,
-  b as useMemoizedFn,
-  ue as useSelectOptions,
+  ue as useFormSubmit,
+  M as useMemoizedFn,
+  de as useSelectOptions,
   le as useTableList
 };

package/package.json

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