@base-stone/hooks 1.2.5 → 1.2.7

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 {
@@ -133,13 +133,13 @@ declare type SelectOption<K extends string | number = string | number> = {
     [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 `${K}Options`]: (SelectOption<K> & Record<string, any>)[];
+    [P in `${K}Options`]: (SelectOption<V> & Record<string, any>)[];
 } & {
-    [P in `${K}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,4 +1,4 @@
-import { useRef as _, useMemo as I, useState as v, 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 P, 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 = {};
@@ -53,7 +53,7 @@ function ce({
   transform: s,
   rowSelection: t
 }) {
-  const o = T.pageSize, [n, u] = v({
+  const o = T.pageSize, [n, u] = S({
     pagination: {
       showSizeChanger: !0,
       showQuickJumper: !0,
@@ -67,7 +67,7 @@ function ce({
       pageSize: o,
       ...a
     }
-  }), { pagination: c, list: f, queryParams: e } = n, { pageNo: l, pageSize: p } = e, [i, m] = v(!0), [g, y] = v([]), b = I(() => {
+  }), { pagination: c, list: f, queryParams: e } = n, { pageNo: l, pageSize: p } = e, [i, m] = S(!0), [g, y] = S([]), b = I(() => {
     if (t)
       return {
         selectedRowKeys: g,
@@ -75,7 +75,7 @@ function ce({
       };
   }, [t, g]), x = E(
     (d) => `共 ${d} 条记录 第 ${l}/${Math.ceil(d / p)} 页 `
-  ), S = async (d) => {
+  ), h = async (d) => {
     const { pageNo: A } = d;
     m(!0);
     const M = { ...a, pageSize: p, ...d };
@@ -92,13 +92,13 @@ function ce({
       }
     }), m(!1);
   }, z = j(() => {
-    S({ ...e, pageNo: 1 });
+    h({ ...e, pageNo: 1 });
   }), C = (d) => {
-    S({ ...e, ...d, pageNo: 1 });
-  }, h = (d) => {
-    S({ ...e, ...d });
+    h({ ...e, ...d, pageNo: 1 });
+  }, v = (d) => {
+    h({ ...e, ...d });
   }, D = (d) => {
-    S({ ...d, pageSize: p, pageNo: 1 });
+    h({ ...d, pageSize: p, pageNo: 1 });
   }, V = (d, A, M, $) => {
     const { action: k } = $;
     if (["paginate", "sort"].includes(k)) {
@@ -109,7 +109,7 @@ function ce({
         pageNo: O,
         pageSize: F
       };
-      S(U);
+      h(U);
     }
   };
   return P(() => {
@@ -117,7 +117,7 @@ function ce({
   }, []), {
     queryParams: e,
     search: E(C),
-    refresh: E(h),
+    refresh: E(v),
     reset: E(D),
     selectedRowKeys: g,
     tableProps: {
@@ -209,22 +209,22 @@ function le(r) {
   }, f;
 }
 function de({ queryFn: r, params: a, dataKey: s, fieldNames: t, transform: o }) {
-  const [n, u] = v({
+  const [n, u] = S({
     list: [],
     mapData: /* @__PURE__ */ new Map()
-  }), [c, f] = v(!0), e = async () => {
+  }), [c, f] = S(!0), e = async () => {
     f(!0);
-    const { data: g } = await r(a), b = (o ? o(g) : g) || [], { label: x, value: S } = t, z = /* @__PURE__ */ new Map([]);
+    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((h) => {
-        const D = h[S];
-        return z.set(D, x), {
-          label: h[x],
+      const C = b.map((v) => {
+        const D = v[h];
+        return z.set(D, v[x]), {
+          label: v[x],
           value: D,
-          data: h
+          data: v
         };
       });
-      u((h) => ({ ...h, list: C, mapData: z }));
+      u((v) => ({ ...v, list: C, mapData: z }));
     } else
       u((C) => ({ ...C, list: b }));
     f(!1);
@@ -243,7 +243,7 @@ function de({ queryFn: r, params: a, dataKey: s, fieldNames: t, transform: o })
   };
 }
 function ue(r, a) {
-  const [s, t] = v(!1), { message: o } = K.useApp(), n = X(async (u) => {
+  const [s, t] = S(!1), { message: o } = K.useApp(), n = X(async (u) => {
     try {
       t(!0);
       const c = await r(u), { status: f, info: e } = c;
@@ -265,7 +265,7 @@ function pe({
   initialValue: o,
   transform: n
 }) {
-  const u = o || (s === "Array" ? [] : /* @__PURE__ */ Object.create({})), [c, f] = v(u), [e, l] = v(!1), p = async (g) => {
+  const u = o || (s === "Array" ? [] : /* @__PURE__ */ Object.create({})), [c, f] = S(u), [e, l] = S(!1), p = async (g) => {
     l(!0);
     const { data: y } = await r(g ?? a), b = n ? n(y) : y;
     f(b), l(!1);

package/package.json

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