@trungkhai/dynamic-form 0.1.5 → 0.1.6

package/dist/index.es.js

@@ -1,6 +1,6 @@
-import { jsx as l, jsxs as ae, Fragment as V } from "react/jsx-runtime";
-import { Select as Ie, Form as X, Upload as qe, Button as Ae, Alert as N, Collapse as at, DatePicker as ct, Checkbox as lt, Radio as dt, InputNumber as ut, Input as Le, Row as ft, Col as mt, App as pt, Flex as Se, Spin as be, Table as yt } from "antd";
-import { createContext as ht, useContext as Be, memo as Q, useState as L, useMemo as C, useEffect as j, useRef as I, useCallback as D, forwardRef as _t, useImperativeHandle as bt } from "react";
+import { jsx as l, jsxs as ce, Fragment as V } from "react/jsx-runtime";
+import { Select as Ie, Form as Q, Upload as qe, Button as Ae, Alert as N, Collapse as at, DatePicker as ct, Checkbox as lt, Radio as dt, InputNumber as ut, Input as Le, Row as ft, Col as mt, App as pt, Flex as Se, Spin as be, Table as yt } from "antd";
+import { createContext as ht, useContext as Be, memo as Z, useState as L, useMemo as C, useEffect as j, useRef as q, useCallback as D, forwardRef as _t, useImperativeHandle as bt } from "react";
 import ge from "dayjs";
 import { FileImageOutlined as gt, UploadOutlined as wt, DeleteOutlined as vt, PlusOutlined as At } from "@ant-design/icons";
 const ke = ht(
@@ -93,12 +93,12 @@ const Rt = ({
       ...n
     }
   );
-}, xt = Q(Rt), Tt = ({
+}, xt = Z(Rt), Tt = ({
   fieldName: e,
   formInstance: t,
   ...n
 }) => {
-  const r = X.useWatch(e, t);
+  const r = Q.useWatch(e, t);
   return j(() => {
     if (r?.fileList?.length && r.fileList.some(
       (o) => !o.type?.startsWith("image/")
@@ -122,16 +122,16 @@ const Rt = ({
       children: /* @__PURE__ */ l(gt, {})
     }
   ) });
-}, Mt = Q(Tt), Dt = ({
+}, Mt = Z(Tt), Dt = ({
   fieldName: e,
   formInstance: t,
   ...n
 }) => {
-  const r = X.useWatch(e, t);
+  const r = Q.useWatch(e, t);
   return /* @__PURE__ */ l(qe, { fileList: r?.fileList, ...n, children: /* @__PURE__ */ l(Ae, { icon: /* @__PURE__ */ l(wt, {}) }) });
-}, Lt = Q(Dt);
+}, Lt = Z(Dt);
 function we(e, t, n = {}) {
-  const { enabled: r = !0 } = n, [i, s] = L(), [o, a] = L(!1), [m, f] = L(), y = I(t);
+  const { enabled: r = !0 } = n, [i, s] = L(), [o, a] = L(!1), [m, f] = L(), y = q(t);
   y.current = t;
   const u = D(async () => {
     if (r) {
@@ -193,7 +193,7 @@ function Pt(e, t) {
   const n = t.method || "GET", r = n.toUpperCase() === "GET";
   if (t.url_template)
     return (Array.isArray(e) ? e.filter((m) => m != null && m !== "") : e != null && e !== "" ? [e] : []).map((m) => {
-      const f = Pe(m), y = he(t.url, f), u = t.params ? ie(t.params, f) : void 0, c = t.data ? ie(t.data, f) : void 0;
+      const f = Pe(m), y = he(t.url, f), u = t.params ? oe(t.params, f) : void 0, c = t.data ? oe(t.data, f) : void 0;
       return {
         method: n,
         url: y,
@@ -201,7 +201,7 @@ function Pt(e, t) {
         data: r ? void 0 : c
       };
     });
-  const i = Pe(e), s = t.params ? ie(t.params, i) : void 0, o = t.data ? ie(t.data, i) : void 0;
+  const i = Pe(e), s = t.params ? oe(t.params, i) : void 0, o = t.data ? oe(t.data, i) : void 0;
   return [
     {
       method: n,
@@ -212,7 +212,7 @@ function Pt(e, t) {
   ];
 }
 function Ne(e, t) {
-  const n = t.data_path ? se(e, t.data_path) : e;
+  const n = t.data_path ? ae(e, t.data_path) : e;
   return (t.result_type ?? (Array.isArray(n) ? "array" : "object")) === "array" ? Array.isArray(n) ? n : n != null ? [n] : [] : Array.isArray(n) ? n.length ? [n[0]] : [] : n && typeof n == "object" ? [n] : [];
 }
 function We(e, t) {
@@ -265,7 +265,7 @@ function Ee(e, t) {
   const r = (Array.isArray(e) ? e : [e]).map((i) => t.find((s) => String(s.value) === String(i))?.label).filter((i) => !!i);
   return r.length ? r.join(", ") : null;
 }
-function oe(e, t, n) {
+function se(e, t, n) {
   if (W(e)) return null;
   const r = t.option_config?.value_attr || "value", i = Array.isArray(e) ? e : [e];
   if (t.is_option_api && n?.length) {
@@ -297,13 +297,13 @@ function Ot(e) {
 }
 function It(e, t) {
   return t?.length ? t.map((n) => {
-    const r = se(e, n) ?? e[n];
+    const r = ae(e, n) ?? e[n];
     return r != null ? String(r) : "";
   }).filter(Boolean).join(" - ") : JSON.stringify(e);
 }
 function qt(e, t) {
   return e ? e.replace(/\{\{(.+?)\}\}/g, (n, r) => {
-    const i = r.trim(), s = se(t, i) ?? t[i];
+    const i = r.trim(), s = ae(t, i) ?? t[i];
     return s != null ? String(s) : "";
   }) : null;
 }
@@ -346,7 +346,7 @@ function Bt(e, t, n) {
     case "select":
     case "radio":
     case "checkbox":
-      return oe(t, e, n.optionList);
+      return se(t, e, n.optionList);
     case "image":
     case "file":
       return Ot(t);
@@ -358,14 +358,14 @@ function Bt(e, t, n) {
       ) : W(t) ? null : String(t);
   }
 }
-function ce(e) {
+function le(e) {
   const t = e.additional_config?.default;
   return typeof t == "string" && t.trim() ? t : void 0;
 }
 function He(e, t, n) {
   if (!t || typeof t != "object" || Array.isArray(t))
     return {};
-  const r = n ?? ce(e), i = t;
+  const r = n ?? le(e), i = t;
   if (r && r in i) {
     const s = i[r];
     if (s && typeof s == "object" && !Array.isArray(s))
@@ -376,7 +376,7 @@ function He(e, t, n) {
 function Ye(e, t, n) {
   if (Array.isArray(t))
     return t;
-  const r = n ?? ce(e);
+  const r = n ?? le(e);
   if (!r || W(t))
     return [];
   if (t && typeof t == "object" && !Array.isArray(t)) {
@@ -432,7 +432,7 @@ function Je(e, t, n) {
   }
   return Array.isArray(i) ? i : [];
 }
-function se(e, t) {
+function ae(e, t) {
   return t.split(".").reduce((n, r) => {
     if (n && typeof n == "object")
       return n[r];
@@ -442,7 +442,7 @@ function Ut(e, t) {
   if (typeof e != "string") return e;
   const n = e.match(/^\{\{(.+?)\}\}$/);
   if (!n) return e;
-  const r = n[1].trim(), i = se(t, r);
+  const r = n[1].trim(), i = ae(t, r);
   return i !== void 0 ? i : e;
 }
 function Nt(e, t) {
@@ -489,12 +489,12 @@ function Xe(e, t) {
         break;
       }
       case "form": {
-        const o = ce(r);
+        const o = le(r);
         n[r.code] = He(r, i, o);
         break;
       }
       case "multiple-form": {
-        const o = ce(r);
+        const o = le(r);
         n[r.code] = Ye(r, i, o);
         break;
       }
@@ -507,7 +507,7 @@ function Wt(e) {
   ).map((s) => s.slice(2, -2).trim());
   return Array.from(/* @__PURE__ */ new Set([...r(t), ...r(n)]));
 }
-function ie(e, t) {
+function oe(e, t) {
   const n = {};
   for (const r in e) {
     const i = e[r];
@@ -553,7 +553,7 @@ const zt = (e) => ({
   readOnly: i = !1,
   registerNestedForm: s
 }) => {
-  const o = U(), [a] = X.useForm(), m = I(null), f = e.additional_config?.form?.config_url, y = e.additional_config?.form?.method ?? "GET", {
+  const o = U(), [a] = Q.useForm(), m = q(null), f = e.additional_config?.form?.config_url, y = e.additional_config?.form?.method ?? "GET", {
     data: u,
     isLoading: c,
     error: d
@@ -613,7 +613,7 @@ const zt = (e) => ({
     }
   ) : /* @__PURE__ */ l(N, { type: "warning", message: "Missing nested form config_url", showIcon: !0 });
 };
-function le(e) {
+function de(e) {
   return JSON.stringify(e);
 }
 function Yt(e, t) {
@@ -629,7 +629,7 @@ function Yt(e, t) {
 function Jt(e, t, n, r) {
   e.set(t, { data: n, expiresAt: Date.now() + r });
 }
-async function de(e, t, n, r, i) {
+async function ue(e, t, n, r, i) {
   const s = e[t];
   if (e.cache.enabled) {
     const f = Yt(s, n);
@@ -651,7 +651,7 @@ async function Qt(e, t, n, r, i) {
   if (s)
     return s;
   if (t.is_option_api && t.option_config?.url) {
-    const o = Ce(t, r), a = t.option_config.method?.toUpperCase() === "GET" || !t.option_config.method, f = { [t.option_config.value_attr || "value"]: n }, y = le([
+    const o = Ce(t, r), a = t.option_config.method?.toUpperCase() === "GET" || !t.option_config.method, f = { [t.option_config.value_attr || "value"]: n }, y = de([
       "collapseTitle",
       t.code,
       t.option_config.url,
@@ -660,7 +660,7 @@ async function Qt(e, t, n, r, i) {
       n
     ]);
     try {
-      const u = await de(
+      const u = await ue(
         e,
         "optionCache",
         y,
@@ -686,7 +686,7 @@ async function Qt(e, t, n, r, i) {
           });
           return e.parsers.optionResponse(p.data, t);
         }
-      ), c = oe(
+      ), c = se(
         n,
         t,
         u
@@ -695,7 +695,7 @@ async function Qt(e, t, n, r, i) {
     } catch {
     }
   }
-  return oe(n, t) ?? i;
+  return se(n, t) ?? i;
 }
 function Zt(e, t, n, r, i) {
   const s = U(), [o, a] = L({});
@@ -748,7 +748,7 @@ function en({
   registerItemRef: s,
   onValuesChange: o
 }) {
-  const [a] = X.useForm(), m = I(null);
+  const [a] = Q.useForm(), m = q(null);
   return j(() => (s(e, m), () => {
     s(e, null);
   }), [e, s]), j(() => {
@@ -778,12 +778,12 @@ const tn = ({
   readOnly: i = !1,
   registerNestedForm: s
 }) => {
-  const o = U(), a = e.additional_config?.multiple_form, m = a?.config_url, f = a?.method ?? "GET", y = a?.primary_field, u = I(0), [c, d] = L([{ key: u.current++ }]), [p, h] = L(
+  const o = U(), a = e.additional_config?.multiple_form, m = a?.config_url, f = a?.method ?? "GET", y = a?.primary_field, u = q(0), [c, d] = L([{ key: u.current++ }]), [p, h] = L(
     {}
-  ), _ = I(p), A = I(c), [w, S] = L(
+  ), _ = q(p), A = q(c), [g, S] = L(
     String(c[0]?.key ?? "")
-  ), b = I(/* @__PURE__ */ new Map()), {
-    data: v,
+  ), b = q(/* @__PURE__ */ new Map()), {
+    data: w,
     isLoading: T,
     error: F
   } = we(
@@ -791,11 +791,11 @@ const tn = ({
     async () => {
       if (!m)
         throw new Error("Missing additional_config.multiple_form.config_url");
-      const g = await o.client.request({
+      const v = await o.client.request({
         method: f,
         url: m
       });
-      return o.parsers.formConfigResponse(g.data);
+      return o.parsers.formConfigResponse(v.data);
     },
     { enabled: !!m }
   );
@@ -804,58 +804,59 @@ const tn = ({
   }, [p]), j(() => {
     A.current = c;
   }, [c]), j(() => {
-    const g = v?.code ?? ce(e), k = Ye(e, t, g);
+    if (t === void 0) return;
+    const v = w?.code ?? le(e), k = Ye(e, t, v);
     d((E) => {
       if (E.length === k.length && E.length > 0) {
-        const J = E.reduce(
-          (te, re, me) => (te[re.key] = k[me] ?? {}, te),
+        const X = E.reduce(
+          (te, ie, me) => (te[ie.key] = k[me] ?? {}, te),
           {}
         );
-        return h(J), E;
+        return h(X), E;
       }
-      const M = k.length > 0 ? k : [{}], O = M.map(() => ({ key: u.current++ })), ne = O.reduce(
-        (J, te, re) => (J[te.key] = M[re] ?? {}, J),
+      const M = k.length > 0 ? k : [{}], I = M.map(() => ({ key: u.current++ })), re = I.reduce(
+        (X, te, ie) => (X[te.key] = M[ie] ?? {}, X),
         {}
       );
-      return h(ne), S(String(O[0]?.key ?? "")), O;
+      return h(re), S(String(I[0]?.key ?? "")), I;
     });
-  }, [e, v?.code, t]);
-  const R = C(
-    () => v ? Gt(v) : void 0,
-    [v]
-  ), $ = C(
-    () => v?.field_groups.find((g) => g.code === y),
-    [v, y]
-  ), z = Zt(
-    $,
+  }, [e, w?.code, t]);
+  const x = C(
+    () => w ? Gt(w) : void 0,
+    [w]
+  ), z = C(
+    () => w?.field_groups.find((v) => v.code === y),
+    [w, y]
+  ), H = Zt(
+    z,
     y,
     c,
     p,
     e.label
-  ), q = D(
-    (g, k) => {
-      const E = g.map((M) => k[M.key] ?? {});
+  ), B = D(
+    (v, k) => {
+      const E = v.map((M) => k[M.key] ?? {});
       n?.(E);
     },
     [n]
-  ), H = D(
-    (g, k) => {
+  ), Y = D(
+    (v, k) => {
       if (k) {
-        b.current.set(g, k);
+        b.current.set(v, k);
         return;
       }
-      b.current.delete(g);
+      b.current.delete(v);
     },
     []
   ), ee = D(
-    (g, k) => {
+    (v, k) => {
       h((E) => {
-        const M = { ...E, [g]: k };
-        return q(A.current, M), M;
+        const M = { ...E, [v]: k };
+        return B(A.current, M), M;
       });
     },
-    [q]
-  ), P = I({
+    [B]
+  ), P = q({
     submit: async () => {
     },
     isSubmitting: () => !1,
@@ -869,58 +870,58 @@ const tn = ({
       })
     ));
   }, []), j(() => {
-    if (v)
+    if (w)
       return s?.(e.code, P, {
-        formCode: v.code,
+        formCode: w.code,
         fieldType: "multiple-form"
       }), () => {
         s?.(e.code, null);
       };
-  }, [e.code, v, s]);
-  const Z = D(() => {
-    const g = { key: u.current++ };
+  }, [e.code, w, s]);
+  const G = D(() => {
+    const v = { key: u.current++ };
     d((k) => {
-      const E = [...k, g];
+      const E = [...k, v];
       return h((M) => {
-        const O = { ...M, [g.key]: {} };
-        return q(E, O), O;
+        const I = { ...M, [v.key]: {} };
+        return B(E, I), I;
       }), E;
-    }), S(String(g.key));
-  }, [q]), B = D(
-    (g) => {
+    }), S(String(v.key));
+  }, [B]), K = D(
+    (v) => {
       d((k) => {
-        const E = k.filter((M) => M.key !== g);
+        const E = k.filter((M) => M.key !== v);
         return h((M) => {
-          const O = { ...M };
-          return delete O[g], q(E, O), O;
+          const I = { ...M };
+          return delete I[v], B(E, I), I;
         }), S(String(E[0]?.key ?? "")), E;
       });
     },
-    [q]
-  ), fe = C(() => c.map((g, k) => {
-    const E = p[g.key] ?? {}, M = z[g.key] ?? `${e.label} ${k + 1}`;
+    [B]
+  ), ne = C(() => c.map((v, k) => {
+    const E = p[v.key] ?? {}, M = H[v.key] ?? `${e.label} ${k + 1}`;
     return {
-      key: String(g.key),
-      label: /* @__PURE__ */ ae("div", { style: { display: "flex", justifyContent: "space-between", width: "100%" }, children: [
+      key: String(v.key),
+      label: /* @__PURE__ */ ce("div", { style: { display: "flex", justifyContent: "space-between", width: "100%" }, children: [
         /* @__PURE__ */ l("span", { children: M }),
         !r && !i ? /* @__PURE__ */ l(
           vt,
           {
-            onClick: (O) => {
-              O.preventDefault(), O.stopPropagation(), B(g.key);
+            onClick: (I) => {
+              I.preventDefault(), I.stopPropagation(), K(v.key);
             }
           }
         ) : null
       ] }),
-      children: R ? /* @__PURE__ */ l(
+      children: x ? /* @__PURE__ */ l(
         en,
         {
-          itemKey: g.key,
-          nestedFormConfig: R,
+          itemKey: v.key,
+          nestedFormConfig: x,
           value: E,
           disabled: r,
           readOnly: i,
-          registerItemRef: H,
+          registerItemRef: Y,
           onValuesChange: ee
         }
       ) : null
@@ -928,23 +929,23 @@ const tn = ({
   }), [
     r,
     e.label,
-    B,
+    K,
     c,
-    R,
+    x,
     ee,
     i,
+    Y,
     H,
-    z,
     p
   ]);
-  return m ? y ? T ? /* @__PURE__ */ l(N, { type: "info", message: "Loading...", showIcon: !0 }) : F || !R ? /* @__PURE__ */ l(N, { type: "error", message: "Failed to load nested form", showIcon: !0 }) : /* @__PURE__ */ ae("div", { children: [
+  return m ? y ? T ? /* @__PURE__ */ l(N, { type: "info", message: "Loading...", showIcon: !0 }) : F || !x ? /* @__PURE__ */ l(N, { type: "error", message: "Failed to load nested form", showIcon: !0 }) : /* @__PURE__ */ ce("div", { children: [
     /* @__PURE__ */ l(
       at,
       {
         accordion: !0,
-        activeKey: w,
-        onChange: (g) => S(Array.isArray(g) ? String(g[0] ?? "") : String(g)),
-        items: fe
+        activeKey: g,
+        onChange: (v) => S(Array.isArray(v) ? String(v[0] ?? "") : String(v)),
+        items: ne
       }
     ),
     !r && !i ? /* @__PURE__ */ l(
@@ -953,7 +954,7 @@ const tn = ({
         style: { marginTop: 12 },
         block: !0,
         type: "dashed",
-        onClick: Z,
+        onClick: G,
         icon: /* @__PURE__ */ l(At, {}),
         children: "Add item"
       }
@@ -982,7 +983,7 @@ const tn = ({
     if (i.upload) return i.upload;
     const c = t ?? i.uploadUrl;
     if (c)
-      return async ({ file: d, signal: p, onProgress: h, fieldCode: _, fieldGroup: A, metadata: w }) => {
+      return async ({ file: d, signal: p, onProgress: h, fieldCode: _, fieldGroup: A, metadata: g }) => {
         const S = i.getPayload ? i.getPayload({
           file: d,
           fieldCode: _,
@@ -990,13 +991,13 @@ const tn = ({
           uploadUrl: c,
           signal: p,
           onProgress: h,
-          metadata: w
+          metadata: g
         }) : (() => {
           const T = new FormData();
-          return T.append("file", d), w && Object.entries(w).forEach(([F, R]) => {
-            T.append(F, String(R));
+          return T.append("file", d), g && Object.entries(g).forEach(([F, x]) => {
+            T.append(F, String(x));
           }), T;
-        })(), v = (await r.request({
+        })(), w = (await r.request({
           method: "POST",
           url: c,
           data: S,
@@ -1010,28 +1011,28 @@ const tn = ({
         })).data;
         return {
           uid: d.uid,
-          ...v,
-          path: String(v.path ?? "")
+          ...w,
+          path: String(w.path ?? "")
         };
       };
   }, [r, i, t]), f = D(
     (c, d) => (p) => {
-      const { file: h, onProgress: _, onError: A, onSuccess: w } = p, S = new AbortController(), b = m();
+      const { file: h, onProgress: _, onError: A, onSuccess: g } = p, S = new AbortController(), b = m();
       return b ? (b({
         file: h,
         fieldCode: c,
         fieldGroup: d,
         uploadUrl: t ?? i.uploadUrl,
         signal: S.signal,
-        onProgress: (v) => _?.({ percent: v })
+        onProgress: (w) => _?.({ percent: w })
       }).then(
-        (v) => w?.({
-          ...v,
-          uid: v.uid ?? h.uid,
-          path: v.path,
+        (w) => g?.({
+          ...w,
+          uid: w.uid ?? h.uid,
+          path: w.path,
           upload_date: ge().format("YYYY-MM-DD HH:mm:ss")
         })
-      ).catch((v) => A?.(v)), { abort: () => S.abort() }) : (A?.(new Error(a.uploadError ?? "Upload not configured")), { abort() {
+      ).catch((w) => A?.(w)), { abort: () => S.abort() }) : (A?.(new Error(a.uploadError ?? "Upload not configured")), { abort() {
       } });
     },
     [a.uploadError, m, i.uploadUrl, t]
@@ -1048,26 +1049,26 @@ const tn = ({
       optionsLoading: h,
       optionsError: _,
       onSearchKeyword: A,
-      readOnly: w = !1,
+      readOnly: g = !1,
       registerNestedForm: S
     }) => {
-      const { additional_config: b, field: v } = c, T = v?.type?.code, F = w || c.is_readonly || d?.disabled, R = kt(
+      const { additional_config: b, field: w } = c, T = w?.type?.code, F = g || c.is_readonly || d?.disabled, x = kt(
         c,
         o.fields
       );
-      if (R)
-        return R(c, {
+      if (x)
+        return x(c, {
           state: d,
           options: p,
           optionsLoading: h,
           optionsError: _,
           onSearchKeyword: A,
-          readOnly: w,
+          readOnly: g,
           formInstance: e,
           disabled: !!F,
           setFieldState: n
         });
-      const $ = Ct(p, c);
+      const z = Ct(p, c);
       switch (T) {
         case "text":
           return b?.text?.textarea ? /* @__PURE__ */ l(
@@ -1096,9 +1097,9 @@ const tn = ({
             }
           );
         case "select": {
-          const z = {
+          const H = {
             disabled: F,
-            options: $,
+            options: z,
             placeholder: a.selectPlaceholder(c.label),
             allowClear: !0,
             loading: h,
@@ -1108,16 +1109,16 @@ const tn = ({
           return A ? /* @__PURE__ */ l(
             xt,
             {
-              ...z,
+              ...H,
               onSearchKeyword: A,
               searchDebounceMs: b?.select?.searchDebounceMs ?? 500
             }
-          ) : /* @__PURE__ */ l(Ie, { ...z, showSearch: !0, optionFilterProp: "label" });
+          ) : /* @__PURE__ */ l(Ie, { ...H, showSearch: !0, optionFilterProp: "label" });
         }
         case "radio":
-          return /* @__PURE__ */ l(dt.Group, { disabled: F, options: $ });
+          return /* @__PURE__ */ l(dt.Group, { disabled: F, options: z });
         case "checkbox":
-          return /* @__PURE__ */ l(lt.Group, { disabled: F, options: $ });
+          return /* @__PURE__ */ l(lt.Group, { disabled: F, options: z });
         case "datetime":
           return /* @__PURE__ */ l(
             ct,
@@ -1162,7 +1163,7 @@ const tn = ({
             {
               group: c,
               disabled: !!F,
-              readOnly: w,
+              readOnly: g,
               registerNestedForm: S
             }
           );
@@ -1172,7 +1173,7 @@ const tn = ({
             {
               group: c,
               disabled: !!F,
-              readOnly: w,
+              readOnly: g,
               registerNestedForm: S
             }
           );
@@ -1195,7 +1196,7 @@ function rn(e, t) {
   const n = C(
     () => Wt(e),
     [e]
-  ), r = X.useWatch(
+  ), r = Q.useWatch(
     n.length > 0 ? n : void 0,
     t
   );
@@ -1213,19 +1214,19 @@ function on({
   searchKeyword: n = "",
   searchDebounceMs: r = 500
 }) {
-  const i = U(), s = rn(e, t), o = X.useWatch(e.code, t), [a, m] = L(), [f, y] = L(!1), [u, c] = L(), d = I(null), [p, h] = L(n), _ = e.additional_config?.select?.search_keyword ?? !1, A = C(
+  const i = U(), s = rn(e, t), o = Q.useWatch(e.code, t), [a, m] = L(), [f, y] = L(!1), [u, c] = L(), d = q(null), [p, h] = L(n), _ = e.additional_config?.select?.search_keyword ?? !1, A = C(
     () => Fe((b) => h(b), r),
     [r]
   );
   j(() => {
     _ ? A(n) : h("");
   }, [n, _, A]);
-  const w = C(() => {
-    const b = e.option_config?.api_options?.params, v = e.option_config?.api_options?.data;
-    if (!(!b && !v))
+  const g = C(() => {
+    const b = e.option_config?.api_options?.params, w = e.option_config?.api_options?.data;
+    if (!(!b && !w))
       return {
-        params: b ? ie(b, s) : void 0,
-        data: v ? ie(v, s) : void 0
+        params: b ? oe(b, s) : void 0,
+        data: w ? oe(w, s) : void 0
       };
   }, [s, e]), S = D(async () => {
     if (!e.option_config || !e.is_option_api || !e.option_config.url)
@@ -1233,67 +1234,67 @@ function on({
     d.current?.abort();
     const b = new AbortController();
     d.current = b;
-    const v = e.option_config.method?.toUpperCase() === "GET" || !e.option_config.method, T = _ ? p : "", F = le([
+    const w = e.option_config.method?.toUpperCase() === "GET" || !e.option_config.method, T = _ ? p : "", F = de([
       e.code,
       e.option_config.url,
       e.option_config.method,
-      w,
+      g,
       T
     ]);
     y(!0), c(void 0);
     try {
-      const R = await de(
+      const x = await ue(
         i,
         "optionCache",
         F,
         async (P) => {
-          const Z = await i.client.request({
+          const G = await i.client.request({
             method: e.option_config?.method || "GET",
             url: e.option_config?.url,
-            params: v && _ ? { ...w?.params, keywords: T } : w?.params,
-            data: !v && _ ? { ...w?.data, keywords: T } : w?.data,
+            params: w && _ ? { ...g?.params, keywords: T } : g?.params,
+            data: !w && _ ? { ...g?.data, keywords: T } : g?.data,
             signal: P
           });
-          return i.parsers.optionResponse(Z.data, e);
+          return i.parsers.optionResponse(G.data, e);
         },
         b.signal
-      ), $ = Array.isArray(o) ? o : o == null ? [] : [o], z = new Set(
-        R.map((P) => String(Ke(P, e)))
-      ), q = $.filter((P) => P == null || P === "" ? !1 : !z.has(String(P)));
-      let H = [];
-      q.length > 0 && (H = (await Promise.all(
-        q.map(async (P) => {
-          const Z = le([
+      ), z = Array.isArray(o) ? o : o == null ? [] : [o], H = new Set(
+        x.map((P) => String(Ke(P, e)))
+      ), B = z.filter((P) => P == null || P === "" ? !1 : !H.has(String(P)));
+      let Y = [];
+      B.length > 0 && (Y = (await Promise.all(
+        B.map(async (P) => {
+          const G = de([
             e.code,
             e.option_config?.url,
             e.option_config?.method,
-            w,
+            g,
             "selected",
             P
           ]);
-          return de(
+          return ue(
             i,
             "optionCache",
-            Z,
-            async (B) => {
-              const g = { [e.option_config?.value_attr || "value"]: P }, k = await i.client.request({
+            G,
+            async (K) => {
+              const v = { [e.option_config?.value_attr || "value"]: P }, k = await i.client.request({
                 method: e.option_config?.method || "GET",
                 url: e.option_config?.url,
-                params: v ? {
-                  ...w?.params,
+                params: w ? {
+                  ...g?.params,
                   filter: {
-                    ...w?.params?.filter,
-                    ...g
+                    ...g?.params?.filter,
+                    ...v
                   }
-                } : w?.params,
-                data: v ? w?.data : {
-                  ...w?.data,
+                } : g?.params,
+                data: w ? g?.data : {
+                  ...g?.data,
                   filter: {
-                    ...w?.data?.filter,
-                    ...g
+                    ...g?.data?.filter,
+                    ...v
                   }
                 },
-                signal: B
+                signal: K
               });
               return i.parsers.optionResponse(k.data, e);
             },
@@ -1302,17 +1303,17 @@ function on({
         })
       )).flat());
       const ee = Et(
-        [...R, ...H],
+        [...x, ...Y],
         e
       );
       b.signal.aborted || m(ee);
-    } catch (R) {
-      b.signal.aborted || c(R);
+    } catch (x) {
+      b.signal.aborted || c(x);
     } finally {
       b.signal.aborted || y(!1);
     }
   }, [
-    w,
+    g,
     i,
     p,
     e,
@@ -1336,7 +1337,7 @@ const sn = ({
     formInstance: t,
     uploadUrl: i,
     setFieldState: r
-  }), y = X.useWatch(e.code, t), [u, c] = L(""), d = e.additional_config?.select?.search_keyword ?? !1, { options: p, isLoading: h, error: _ } = on({
+  }), y = Q.useWatch(e.code, t), [u, c] = L(""), d = e.additional_config?.select?.search_keyword ?? !1, { options: p, isLoading: h, error: _ } = on({
     group: e,
     formInstance: t,
     searchKeyword: u,
@@ -1349,15 +1350,15 @@ const sn = ({
       r(S, { disabled: !y });
     });
   }, [y, t, e, r]);
-  const w = o === "small" ? 4 : 12;
+  const g = o === "small" ? 4 : 12;
   return /* @__PURE__ */ l(
-    X.Item,
+    Q.Item,
     {
       label: e.label,
       name: e.code,
       hidden: n?.hidden,
       rules: [{ required: n?.required || !1 }],
-      style: { marginBottom: w, ...m.style },
+      style: { marginBottom: g, ...m.style },
       ...m,
       children: f(e, {
         state: n,
@@ -1374,7 +1375,7 @@ const sn = ({
 function an(e, t) {
   return e.group.id === t.group.id && e.readOnly === t.readOnly && e.uploadUrl === t.uploadUrl && e.size === t.size && e.registerNestedForm === t.registerNestedForm && e.fieldState?.disabled === t.fieldState?.disabled && e.fieldState?.hidden === t.fieldState?.hidden && e.fieldState?.required === t.fieldState?.required;
 }
-const cn = Q(sn, an);
+const cn = Z(sn, an);
 function ln({
   fieldGroups: e,
   fieldStates: t,
@@ -1391,7 +1392,9 @@ function dn(e) {
   return C(() => {
     const t = e?.form?.field_groups ?? [], n = /* @__PURE__ */ new Map(), r = {};
     t.forEach((s) => {
-      n.set(s.code, s), s.additional_config?.default !== void 0 && (r[s.code] = s.additional_config.default);
+      n.set(s.code, s);
+      const o = s.field?.type?.code;
+      s.additional_config?.default !== void 0 && o !== "form" && o !== "multiple-form" && (r[s.code] = s.additional_config.default);
     });
     const i = t.filter((s) => !s.is_hidden);
     return { fieldGroups: t, fieldByCode: n, visibleFieldGroups: i, initialValues: r };
@@ -1505,100 +1508,105 @@ const xe = _t(
     submitDebounceMs: h,
     gutter: _ = [8, 0],
     defaultColSpan: A = 12,
-    submitButtonLabel: w,
+    submitButtonLabel: g,
     disableHtmlFormWrapper: S = !1
   }, b) => {
-    const { message: v } = pt.useApp(), T = U(), { i18n: F, client: R, parsers: $, redirectHandler: z, renderers: q, transformers: H } = T, ee = r ?? i, P = h ?? T.submitDebounceMs, Z = w ?? F.messages.submit, { fieldGroups: B, fieldByCode: fe, initialValues: g } = dn(e), { fieldStates: k, setFieldState: E } = un(B), M = I(/* @__PURE__ */ new Map()), O = D(
-      (x, Y, G) => {
-        if (Y && G) {
-          M.current.set(x, { ref: Y, ...G });
+    const { message: w } = pt.useApp(), T = U(), { i18n: F, client: x, parsers: z, redirectHandler: H, renderers: B, transformers: Y } = T, ee = r ?? i, P = h ?? T.submitDebounceMs, G = g ?? F.messages.submit, { fieldGroups: K, fieldByCode: ne, initialValues: v } = dn(e), { fieldStates: k, setFieldState: E } = un(K), M = q(/* @__PURE__ */ new Map()), I = D(
+      (R, $, J) => {
+        if ($ && J) {
+          M.current.set(R, { ref: $, ...J });
           return;
         }
-        M.current.delete(x);
+        M.current.delete(R);
       },
       []
-    ), { buildProcessedValues: ne } = mn({
+    ), { buildProcessedValues: re } = mn({
       formInstance: t,
-      fieldByCode: fe,
+      fieldByCode: ne,
       relatedData: n,
-      transformers: H,
+      transformers: Y,
       nestedFormRefs: M
-    }), J = I(!1), [te, re] = L(!1), [me, Te] = L(!1);
+    }), X = q(!1), [te, ie] = L(!1), [me, Te] = L(!1);
     j(() => {
-      if (Object.keys(g).length > 0) {
-        const x = H.normalizeInitialValues ? H.normalizeInitialValues(g, B) : g;
-        t.setFieldsValue(x);
-      }
-    }, [B, t, g, H]);
+      const R = Object.fromEntries(
+        Object.entries(v).filter(([J]) => {
+          const O = ne.get(J)?.field?.type?.code;
+          return O !== "form" && O !== "multiple-form";
+        })
+      );
+      if (Object.keys(R).length === 0) return;
+      const $ = Y.normalizeInitialValues ? Y.normalizeInitialValues(R, K) : R;
+      t.setFieldsValue($);
+    }, [ne, K, t, v, Y]);
     const pe = D(async () => {
-      if (!J.current) {
-        J.current = !0, re(!0);
+      if (!X.current) {
+        X.current = !0, ie(!0);
         try {
-          let x = await ne();
+          let R = await re();
           try {
-            s && (Te(!0), await R.request({
+            s && (Te(!0), await x.request({
               method: "POST",
               url: s,
-              data: x
+              data: R
             }));
-            const K = await o?.(x);
-            if (K === !1) return;
-            K && typeof K == "object" && (x = K);
-          } catch (K) {
-            console.error(K);
+            const O = await o?.(R);
+            if (O === !1) return;
+            O && typeof O == "object" && (R = O);
+          } catch (O) {
+            console.error(O);
             return;
           } finally {
             Te(!1);
           }
-          const Y = await R.request({
+          const $ = await x.request({
             method: e.method,
             url: e.action,
-            data: x
+            data: R
           });
           t.resetFields(
-            B.filter((K) => !K.is_hidden).map((K) => K.code)
+            K.filter((O) => !O.is_hidden).map((O) => O.code)
           );
-          const G = $.submitResponse(Y.data);
-          f && G.redirectUrl && (y ?? z)(G.redirectUrl, "_blank"), a?.({
-            values: x,
-            response: Y.data,
-            data: G.data ?? Y.data
+          const J = z.submitResponse($.data);
+          f && J.redirectUrl && (y ?? H)(J.redirectUrl, "_blank"), a?.({
+            values: R,
+            response: $.data,
+            data: J.data ?? $.data
           });
-        } catch (x) {
-          const Y = x;
-          v.error(
-            Y?.response?.data?.message ?? F.messages.submitError
-          ), m?.(x);
+        } catch (R) {
+          const $ = R;
+          w.error(
+            $?.response?.data?.message ?? F.messages.submitError
+          ), m?.(R);
         } finally {
-          J.current = !1, re(!1);
+          X.current = !1, ie(!1);
         }
       }
     }, [
-      ne,
-      R,
-      B,
+      re,
+      x,
+      K,
       e.action,
       e.method,
       t,
       F.messages.submitError,
       f,
-      v,
+      w,
       o,
       y,
       m,
       a,
-      $,
       z,
+      H,
       s
     ]);
     bt(
       b,
       () => ({
         submit: pe,
-        getProcessedValues: ne,
-        isSubmitting: () => J.current
+        getProcessedValues: re,
+        isSubmitting: () => X.current
       }),
-      [ne, pe]
+      [re, pe]
     );
     const Me = C(
       () => Fe(() => {
@@ -1606,43 +1614,43 @@ const xe = _t(
       }, P),
       [pe, P]
     ), it = D(
-      (x, Y) => {
-        Object.keys(x).forEach((G) => {
-          const K = $t(
-            G,
-            B,
+      (R, $) => {
+        Object.keys(R).forEach((J) => {
+          const O = $t(
+            J,
+            K,
             t.getFieldsValue()
           );
-          K.length > 0 && t.resetFields(K);
-        }), d?.(x, Y);
+          O.length > 0 && t.resetFields(O);
+        }), d?.(R, $);
       },
-      [B, t, d]
+      [K, t, d]
     ), De = D(
-      (x) => /* @__PURE__ */ l(
+      (R) => /* @__PURE__ */ l(
         cn,
         {
-          group: x,
+          group: R,
           formInstance: t,
-          fieldState: k[x.code],
+          fieldState: k[R.code],
           setFieldState: E,
           uploadUrl: ee,
           readOnly: p,
           size: u,
-          registerNestedForm: O
+          registerNestedForm: I
         },
-        x.id
+        R.id
       ),
       [
         k,
         t,
-        O,
+        I,
         p,
         ee,
         E,
         u
       ]
-    ), ot = q.layout ? q.layout({
-      fieldGroups: B,
+    ), ot = B.layout ? B.layout({
+      fieldGroups: K,
       fieldStates: k,
       renderField: De,
       gutter: _,
@@ -1651,28 +1659,28 @@ const xe = _t(
     }) : /* @__PURE__ */ l(
       ln,
       {
-        fieldGroups: B,
+        fieldGroups: K,
         fieldStates: k,
         renderField: De,
         gutter: _,
         defaultColSpan: A,
         size: u
       }
-    ), st = !c && !p && (q.submitActions ? q.submitActions({
+    ), st = !c && !p && (B.submitActions ? B.submitActions({
       onSubmit: Me,
       loading: te || me,
-      label: Z
+      label: G
     }) : /* @__PURE__ */ l(Se, { justify: "flex-end", children: /* @__PURE__ */ l(
       Ae,
       {
         type: "primary",
         onClick: Me,
         loading: te || me,
-        children: Z
+        children: G
       }
     ) }));
-    return /* @__PURE__ */ ae(
-      X,
+    return /* @__PURE__ */ ce(
+      Q,
       {
         layout: "vertical",
         form: t,
@@ -1705,10 +1713,10 @@ function Oe(e, t) {
     expiresAt: Date.now() + pn
   });
 }
-function ue(e, t, n = !0) {
-  const r = U(), [i, s] = L(), [o, a] = L(!1), [m, f] = L(), y = I(t), u = I(r);
+function fe(e, t, n = !0) {
+  const r = U(), [i, s] = L(), [o, a] = L(!1), [m, f] = L(), y = q(t), u = q(r);
   y.current = t, u.current = r;
-  const c = le(e);
+  const c = de(e);
   return j(() => {
     if (!n) {
       s(void 0), f(void 0), a(!1);
@@ -1722,11 +1730,11 @@ function ue(e, t, n = !0) {
     const h = new AbortController();
     return a(!0), f(void 0), (async () => {
       try {
-        const A = await de(
+        const A = await ue(
           u.current,
           "viewCache",
           c,
-          (w) => y.current(w),
+          (g) => y.current(g),
           h.signal
         );
         h.signal.aborted || (s(A), f(void 0));
@@ -1741,7 +1749,7 @@ function ue(e, t, n = !0) {
     const p = new AbortController();
     a(!0), f(void 0);
     try {
-      const h = await de(
+      const h = await ue(
         u.current,
         "viewCache",
         c,
@@ -1764,7 +1772,7 @@ const hn = ({ value: e, code: t, modeConfig: n }) => {
     data: a,
     isLoading: m,
     error: f
-  } = ue(
+  } = fe(
     ["api_detail", t, o, n?.url, n?.method],
     async (c) => (await Promise.all(
       o.map(async (p) => {
@@ -1786,12 +1794,12 @@ const hn = ({ value: e, code: t, modeConfig: n }) => {
     return d;
   };
   return m ? /* @__PURE__ */ l(V, { children: i.viewLoading?.() ?? /* @__PURE__ */ l(be, { size: "small" }) }) : f ? /* @__PURE__ */ l(V, { children: i.viewError?.(f) ?? s.messages.viewError }) : a?.length ? /* @__PURE__ */ l(V, { children: a.map((c, d) => /* @__PURE__ */ l("div", { children: u(c) }, d)) }) : /* @__PURE__ */ l(V, { children: i.viewEmpty?.() ?? s.messages.viewEmpty });
-}, Qe = Q(hn), _n = ({ value: e, code: t, modeConfig: n }) => {
+}, Qe = Z(hn), _n = ({ value: e, code: t, modeConfig: n }) => {
   const { client: r, renderers: i, i18n: s } = U(), {
     data: o,
     isLoading: a,
     error: m
-  } = ue(
+  } = fe(
     ["api_ids", t, e, n?.url, n?.method],
     async (u) => {
       const c = n?.method || "GET", d = c.toUpperCase() === "POST", p = Array.isArray(e) ? e : [e], _ = (await r.request({
@@ -1800,7 +1808,7 @@ const hn = ({ value: e, code: t, modeConfig: n }) => {
         data: d ? { ids: p } : void 0,
         params: d ? void 0 : { ids: p },
         signal: u
-      })).data, A = n?.data_path ? se(_, n.data_path) : _;
+      })).data, A = n?.data_path ? ae(_, n.data_path) : _;
       return Array.isArray(A) ? A : _;
     },
     !!(e && n?.url)
@@ -1815,7 +1823,7 @@ const hn = ({ value: e, code: t, modeConfig: n }) => {
   return a ? /* @__PURE__ */ l(V, { children: i.viewLoading?.() ?? /* @__PURE__ */ l(be, { size: "small" }) }) : m ? /* @__PURE__ */ l(V, { children: i.viewError?.(m) ?? s.messages.viewError }) : o ? Array.isArray(e) ? /* @__PURE__ */ l(Se, { vertical: !0, children: (Array.isArray(o) ? o : [o]).map((u, c) => /* @__PURE__ */ l("div", { children: y(u) }, u.id ?? c)) }) : y(
     Array.isArray(o) ? o[0] : o
   ) : /* @__PURE__ */ l(V, { children: i.viewEmpty?.() ?? s.messages.viewEmpty });
-}, Ze = Q(_n), bn = ({
+}, Ze = Z(_n), bn = ({
   value: e,
   code: t,
   modeConfig: n,
@@ -1834,13 +1842,13 @@ const hn = ({ value: e, code: t, modeConfig: n }) => {
       (_) => i.request({ ..._, signal: h })
     ) : [],
     [i, a, e]
-  ), { data: y, isLoading: u, error: c } = ue(m, f, !!(e && a?.url)), d = (h, _, A) => s.link ? s.link({ url: h, label: _, data: A }) : /* @__PURE__ */ l("a", { href: h, target: "_blank", rel: "noreferrer", children: _ }), p = (h, _) => {
+  ), { data: y, isLoading: u, error: c } = fe(m, f, !!(e && a?.url)), d = (h, _, A) => s.link ? s.link({ url: h, label: _, data: A }) : /* @__PURE__ */ l("a", { href: h, target: "_blank", rel: "noreferrer", children: _ }), p = (h, _) => {
     if (!a) return null;
-    const A = We(h, a), w = $e(h, a), S = w ? d(w, A, h) : A;
+    const A = We(h, a), g = $e(h, a), S = g ? d(g, A, h) : A;
     return /* @__PURE__ */ l("div", { children: S }, h.id ?? _);
   };
   return u ? /* @__PURE__ */ l(V, { children: s.viewLoading?.() ?? /* @__PURE__ */ l(be, { size: "small" }) }) : c ? /* @__PURE__ */ l(V, { children: s.viewError?.(c) ?? o.messages.viewError }) : y?.length ? a?.result_type === "object" && y.length === 1 ? p(y[0], 0) : /* @__PURE__ */ l(Se, { vertical: !0, children: y.map(p) }) : /* @__PURE__ */ l(V, { children: s.viewEmpty?.() ?? o.messages.viewEmpty });
-}, Ge = Q(bn), gn = {
+}, Ge = Z(bn), gn = {
   whiteSpace: "normal",
   wordBreak: "break-word",
   verticalAlign: "top"
@@ -1947,7 +1955,7 @@ const hn = ({ value: e, code: t, modeConfig: n }) => {
     data: m,
     isLoading: f,
     error: y
-  } = ue(
+  } = fe(
     [
       "selectLikeView",
       t.code,
@@ -1980,8 +1988,8 @@ const hn = ({ value: e, code: t, modeConfig: n }) => {
     },
     a
   );
-  return W(e) ? /* @__PURE__ */ l(V, { children: i.viewEmpty?.() ?? "-" }) : s ? /* @__PURE__ */ l(V, { children: s }) : o ? f ? /* @__PURE__ */ l(V, { children: i.viewLoading?.() ?? /* @__PURE__ */ l(be, { size: "small" }) }) : y ? /* @__PURE__ */ l(V, { children: i.viewError?.(y) ?? oe(e, t) ?? String(e) }) : /* @__PURE__ */ l(V, { children: oe(e, t, m) ?? String(e) }) : /* @__PURE__ */ l(V, { children: oe(e, t) ?? String(e) });
-}, vn = Q(wn), An = ({
+  return W(e) ? /* @__PURE__ */ l(V, { children: i.viewEmpty?.() ?? "-" }) : s ? /* @__PURE__ */ l(V, { children: s }) : o ? f ? /* @__PURE__ */ l(V, { children: i.viewLoading?.() ?? /* @__PURE__ */ l(be, { size: "small" }) }) : y ? /* @__PURE__ */ l(V, { children: i.viewError?.(y) ?? se(e, t) ?? String(e) }) : /* @__PURE__ */ l(V, { children: se(e, t, m) ?? String(e) }) : /* @__PURE__ */ l(V, { children: se(e, t) ?? String(e) });
+}, vn = Z(wn), An = ({
   code: e,
   value: t,
   fieldGroup: n,
@@ -2034,7 +2042,7 @@ const hn = ({ value: e, code: t, modeConfig: n }) => {
     default:
       return a;
   }
-}, tt = Q(An), Sn = {
+}, tt = Z(An), Sn = {
   flexShrink: 0,
   whiteSpace: "nowrap",
   color: "rgba(0, 0, 0, 0.45)"
@@ -2067,8 +2075,8 @@ const hn = ({ value: e, code: t, modeConfig: n }) => {
       }
     )
   })), [e, t]);
-  return n.length === 0 ? /* @__PURE__ */ l(V, { children: "-" }) : /* @__PURE__ */ l("div", { style: { width: "100%" }, children: n.map((r) => /* @__PURE__ */ ae("div", { style: Fn, children: [
-    /* @__PURE__ */ ae("div", { style: Sn, children: [
+  return n.length === 0 ? /* @__PURE__ */ l(V, { children: "-" }) : /* @__PURE__ */ l("div", { style: { width: "100%" }, children: n.map((r) => /* @__PURE__ */ ce("div", { style: Fn, children: [
+    /* @__PURE__ */ ce("div", { style: Sn, children: [
       r.label,
       ":"
     ] }),
@@ -2124,11 +2132,11 @@ function En(e) {
   return !!(e.option_config && e.is_option_api);
 }
 function Rn(e, t) {
-  const n = U(), r = le([
+  const n = U(), r = de([
     "viewModeOptions",
     e.map((s) => s.code),
     t
-  ]), { data: i } = ue(
+  ]), { data: i } = fe(
     [r],
     async (s) => {
       const o = {};
@@ -2271,7 +2279,7 @@ const Kn = ({
 }, Tn = (e) => ({
   redirectUrl: e?.redirect_after_create,
   data: e
-}), Mn = (e, t) => t?.dataPath ? se(e, t.dataPath) : e, Dn = (e) => e, ye = {
+}), Mn = (e, t) => t?.dataPath ? ae(e, t.dataPath) : e, Dn = (e) => e, ye = {
   optionResponse: xn,
   submitResponse: Tn,
   viewResponse: Mn,
@@ -2303,15 +2311,15 @@ function Nn({
   optionResponseParser: p,
   customFieldRenderers: h
 }) {
-  const _ = I(/* @__PURE__ */ new Map()), A = I(/* @__PURE__ */ new Map()), w = C(() => {
+  const _ = q(/* @__PURE__ */ new Map()), A = q(/* @__PURE__ */ new Map()), g = C(() => {
     const S = t ?? {
       request: y ?? (() => {
         throw new Error("DynamicFormProvider requires client or requestClient");
       })
-    }, b = h ? Object.entries(h).map(([F, R]) => ({
+    }, b = h ? Object.entries(h).map(([F, x]) => ({
       match: F,
-      render: R
-    })) : [], v = {
+      render: x
+    })) : [], w = {
       ...rt,
       ...r?.messages,
       ...d
@@ -2324,7 +2332,7 @@ function Nn({
     return {
       client: S,
       upload: T,
-      i18n: { messages: v },
+      i18n: { messages: w },
       parsers: {
         optionResponse: i?.optionResponse ?? p ?? ye.optionResponse,
         submitResponse: i?.submitResponse ?? ye.submitResponse,
@@ -2366,7 +2374,7 @@ function Nn({
     m,
     f
   ]);
-  return /* @__PURE__ */ l(ke.Provider, { value: w, children: e });
+  return /* @__PURE__ */ l(ke.Provider, { value: g, children: e });
 }
 function Wn(e) {
   return {
@@ -2395,8 +2403,8 @@ export {
   Ht as NestedForm,
   nt as NestedFormView,
   Pt as buildApiViewRequests,
-  le as buildCacheKey,
-  de as cachedRequest,
+  de as buildCacheKey,
+  ue as cachedRequest,
   Wn as createAxiosDynamicFormClient,
   Bn as createNestedDynamicFormData,
   Fe as debounce,
@@ -2414,11 +2422,11 @@ export {
   Ne as extractViewData,
   Vt as fetchApiViewItems,
   he as fillTemplate,
-  se as getByPath,
+  ae as getByPath,
   Yt as getCached,
   We as getMappedLabel,
   $e as getMappedLink,
-  ce as getNestedFormCodeHint,
+  le as getNestedFormCodeHint,
   Re as getNestedSubmitContainerKey,
   W as isEmptyValue,
   Ft as mapOptionToSelectItem,
@@ -2426,7 +2434,7 @@ export {
   Ue as normalizeApiViewConfig,
   Xe as normalizeMetaForForm,
   Nt as parseFormValues,
-  ie as replaceTemplateInObject,
+  oe as replaceTemplateInObject,
   Ce as resolveApiOptionMeta,
   St as resolveFieldRenderer,
   kt as resolveFieldRendererFromMap,
@@ -2435,7 +2443,7 @@ export {
   Jt as setCache,
   Ye as unwrapMultipleFormValueForEdit,
   He as unwrapSingleFormValueForEdit,
-  ue as useCachedViewRequest,
+  fe as useCachedViewRequest,
   rn as useDependencyValues,
   nn as useDynamicField,
   U as useDynamicFormContext,