@base-stone/hooks 1.2.6 → 1.2.8

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

@@ -72,11 +72,11 @@ declare type PickFunction<T extends noop> = (this: ThisParameterType<T>, ...args
 
 declare type Placement = 'top' | 'bottom' | 'left' | 'right';
 
-declare interface QueryOptions<T = Record<string, any>> {
+declare interface QueryOptions<K extends string, T = Record<string, any>> {
     queryFn: (data: QueryParamsData_2) => Promise<QueryResponse_2<T>>;
     params?: Record<string, any> | undefined;
     dataType: DataType;
-    dataKey: string;
+    dataKey: K;
     transform?: (result: Record<string, any>) => Record<string, any>[];
     initialValue?: Record<string, any> | Record<string, any>[];
 }
@@ -101,11 +101,11 @@ declare interface QueryResponse_2<T> {
     data: T;
 }
 
-declare type QueryResult<T = Record<string, any>> = {
+declare type QueryResult<K extends string, T = Record<string, any>> = {
     loading: boolean;
     refresh: (params?: Record<string, any> | undefined) => void;
 } & {
-    [P in string]?: T;
+    [P in K]?: T;
 };
 
 declare interface RequestFn {
@@ -120,26 +120,26 @@ declare interface SelectConfig {
     params?: Record<string, any>;
     dataKey: string;
     transform?: (result: Record<string, any>) => Record<string, any>[];
-    fieldNames?: {
+    fieldNames: {
         label: string;
         value: string;
     };
 }
 
-declare type SelectOption<K extends string | number = string | number> = {
+declare type SelectOption<V extends string | number = string | number> = {
     label: string;
-    value: K;
+    value: V;
     data?: Record<string, unknown>;
     [key: string]: any;
 };
 
-declare type SelectOptionsResult<K extends string | number> = Readonly<{
+declare type SelectOptionsResult<K extends string, V extends string | number = string | number> = Readonly<{
     loading: boolean;
     refresh: () => void;
 } & {
-    [P in `${string}Options`]: (SelectOption<K> & Record<string, any>)[];
+    [P in `${K}Options`]: (SelectOption<V> & Record<string, any>)[];
 } & {
-    [P in `${string}Map`]?: MapData<K>;
+    [P in `${K}Map`]?: MapData<V>;
 }>;
 
 declare interface SuccessFn {
@@ -200,9 +200,9 @@ export declare function useFormSubmit(requestFn: RequestFn, successFn: SuccessFn
 
 export declare function useMemoizedFn<T extends noop>(fn: T): PickFunction<T>;
 
-export declare function useRequestQuery<T = Record<string, any> | Record<string, any>[] | undefined>({ queryFn, params, dataType, dataKey, initialValue, transform }: QueryOptions<T>): QueryResult<T>;
+export declare function useRequestQuery<T = Record<string, any> | Record<string, any>[] | undefined>({ queryFn, params, dataType, dataKey, initialValue, transform }: QueryOptions<typeof dataKey, T>): QueryResult<typeof dataKey, T>;
 
-export declare function useSelectOptions<K extends string | number = string | number>({ queryFn, params, dataKey, fieldNames, transform }: SelectConfig): SelectOptionsResult<K>;
+export declare function useSelectOptions<V extends string | number = string | number>({ queryFn, params, dataKey, fieldNames, transform }: SelectConfig): SelectOptionsResult<typeof dataKey, V>;
 
 export declare function useTableList<T extends Record<string, any> = Record<string, any>>({ queryFn, params: initParams, transform, rowSelection }: TableOptions<T>): TableResult<T>;
 

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

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

package/package.json

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