@base-stone/hooks 1.0.3 → 1.0.4

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

@@ -97,22 +97,24 @@ declare interface RequestFn {
     }>;
 }
 
-declare interface RequestQueryOptions<T, P = Record<string, any>> {
+declare interface RequestQueryOptions<K extends string = string, T = Record<string, any>> {
     queryFn: (data: QueryParamsData_2) => Promise<QueryResponse_2<T>>;
     initialValue?: T;
-    params?: P;
+    params?: Record<string, any>;
+    dataKey: K;
 }
 
-declare interface RequestQueryResult<T> {
-    data: T;
+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>;
-    selectKey: K;
+    dataKey: K;
     fieldNames?: {
         label: string;
         value: string;
@@ -191,9 +193,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, P = Record<string, any>>({ queryFn, params, initialValue }: RequestQueryOptions<T, P>): RequestQueryResult<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 useSelectOptions<T extends string | number = string | number, K extends string = string>({ queryFn, params, selectKey, fieldNames }: SelectConfig<K>): SelectOptionsResult<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>;
 
 export declare function useTableList<T extends Record<string, any> = Record<string, any>>({ queryFn, params: initParams, rowSelection }: TableOptions<T>): TableResult<T>;
 

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

@@ -7,19 +7,19 @@ 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, n, s) {
+  function t(e, s, n) {
     var p = null;
-    if (s !== void 0 && (p = "" + s), n.key !== void 0 && (p = "" + n.key), "key" in n) {
-      s = {};
-      for (var d in n)
-        d !== "key" && (s[d] = n[d]);
-    } else s = n;
-    return n = s.ref, {
+    if (n !== void 0 && (p = "" + n), s.key !== void 0 && (p = "" + s.key), "key" in s) {
+      n = {};
+      for (var d in s)
+        d !== "key" && (n[d] = s[d]);
+    } else n = s;
+    return s = n.ref, {
       $$typeof: a,
       type: e,
       key: p,
-      ref: n !== void 0 ? n : null,
-      props: s
+      ref: s !== void 0 ? s : null,
+      props: n
     };
   }
   return y.Fragment = o, y.jsx = t, y.jsxs = t, y;
@@ -52,7 +52,7 @@ function ie({
   params: o,
   rowSelection: t
 }) {
-  const e = R.pageSize, [n, s] = v({
+  const e = R.pageSize, [s, n] = v({
     pagination: {
       showSizeChanger: !0,
       showQuickJumper: !0,
@@ -66,7 +66,7 @@ function ie({
       pageSize: e,
       ...o
     }
-  }), { pagination: p, list: d, queryParams: l } = n, { pageNo: r, pageSize: c } = l, [g, i] = v(!0), S = x(l), [f, b] = v([]), E = F(() => {
+  }), { pagination: p, list: d, queryParams: l } = s, { pageNo: r, pageSize: c } = l, [g, i] = v(!0), S = x(l), [f, b] = v([]), E = F(() => {
     if (t)
       return {
         selectedRowKeys: f,
@@ -80,7 +80,7 @@ function ie({
     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([]), s({
+    t && b([]), n({
       list: T,
       queryParams: h,
       pagination: {
@@ -135,20 +135,20 @@ function ie({
 const C = X((a) => ({
   modals: {},
   toggleModal: (o, t) => a((e) => {
-    const s = e.modals[o]?.visible || !1;
+    const n = e.modals[o]?.visible || !1;
     return {
       modals: {
         ...e.modals,
         [o]: {
-          visible: !s,
-          data: s ? {} : t || {}
+          visible: !n,
+          data: n ? {} : t || {}
         }
       }
     };
   }),
-  setModal: (o, t, e) => a((n) => ({
+  setModal: (o, t, e) => a((s) => ({
     modals: {
-      ...n.modals,
+      ...s.modals,
       [o]: {
         visible: t,
         data: t ? e || {} : {}
@@ -157,21 +157,21 @@ const C = X((a) => ({
   })),
   clearModals: (o) => a((t) => {
     const e = { ...t.modals };
-    return o.forEach((n) => {
-      delete e[n];
+    return o.forEach((s) => {
+      delete e[s];
     }), { modals: e };
   })
 }));
 function le(a) {
-  const o = C((r) => r.modals), t = C((r) => r.toggleModal), e = C((r) => r.setModal), n = C((r) => r.clearModals), s = B(), p = x([]), d = Object.keys(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) => `${s}-${r}`
+    (r) => `${n}-${r}`
   ), () => {
-    n(p.current);
+    s(p.current);
   }), []);
   const l = {};
   return d.forEach((r) => {
-    const c = `${s}-${r}`, g = o[c] ?? { visible: !1, data: {} }, i = a[r], S = typeof i.title == "function" ? i.title(g.data) : i.title;
+    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,
@@ -198,16 +198,16 @@ function le(a) {
       close: () => e(c, !1)
     };
   }), l.toggle = (r, c) => {
-    t(`${s}-${r}`, c);
+    t(`${n}-${r}`, c);
   }, l.open = (r, c) => {
-    e(`${s}-${r}`, !0, c);
+    e(`${n}-${r}`, !0, c);
   }, l.close = (r) => {
-    e(`${s}-${r}`, !1);
+    e(`${n}-${r}`, !1);
   }, l;
 }
 const oe = (a, o = "value", t = "label") => new Map(a.map((e) => [e[o], e[t]]));
-function ce({ queryFn: a, params: o, selectKey: t, fieldNames: e }) {
-  const [n, s] = v({
+function ce({ queryFn: a, params: o, dataKey: t, fieldNames: e }) {
+  const [s, n] = v({
     list: [],
     mapData: /* @__PURE__ */ new Map()
   }), [p, d] = v(!0), l = async () => {
@@ -219,15 +219,15 @@ function ce({ queryFn: a, params: o, selectKey: t, fieldNames: e }) {
         label: m[f],
         value: m[b]
       })), z = oe(E);
-      s((m) => ({ ...m, options: E, mapData: z }));
+      n((m) => ({ ...m, options: E, mapData: z }));
     } else
-      s((f) => ({ ...f, options: S }));
+      n((f) => ({ ...f, options: S }));
     d(!1);
   }, r = M(void 0);
   D(() => {
     l();
   }, []);
-  const { list: c, mapData: g } = n;
+  const { list: c, mapData: g } = s;
   return {
     loading: p,
     refresh: r,
@@ -236,29 +236,30 @@ function ce({ queryFn: a, params: o, selectKey: t, fieldNames: e }) {
   };
 }
 function ue(a, o) {
-  const [t, e] = v(!1), { message: n } = W.useApp(), s = U(async (p) => {
+  const [t, e] = v(!1), { message: s } = W.useApp(), n = U(async (p) => {
     try {
       e(!0);
       const d = await a(p), { status: l, info: r } = d;
-      l == "success" && (o(d), n.success(r));
+      l == "success" && (o(d), s.success(r));
     } catch {
     }
     e(!1);
-  }, [a, o, n]);
+  }, [a, o, s]);
   return {
     loading: t,
-    submit: s
+    submit: n
   };
 }
 function de({
   queryFn: a,
   params: o,
-  initialValue: t
+  initialValue: t,
+  dataKey: e
 }) {
-  const [e, n] = v(t), [s, p] = v(!1);
+  const [s, n] = v(t), [p, d] = v(!1);
   return {
-    data: e,
-    loading: s,
+    [e]: s,
+    loading: p,
     refresh: M(void 0)
   };
 }

package/package.json

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