@trungkhai/dynamic-form 0.1.2 → 0.1.3

package/dist/index.es.js

@@ -1,9 +1,9 @@
-import { jsx as f, jsxs as Ue, Fragment as L } from "react/jsx-runtime";
-import { Select as Fe, Form as q, Upload as ke, Button as Ee, DatePicker as Ie, Checkbox as Be, Radio as We, InputNumber as Ge, Input as ve, Row as Ke, Col as $e, App as ze, Flex as ie, Spin as ae } from "antd";
-import { createContext as He, useContext as Re, memo as T, useState as D, useMemo as E, useEffect as C, useCallback as x, useRef as U, forwardRef as Ne, useImperativeHandle as Ye } from "react";
-import X from "dayjs";
-import { FileImageOutlined as Je, UploadOutlined as Qe } from "@ant-design/icons";
-const oe = He(
+import { jsx as f, jsxs as Be, Fragment as x } from "react/jsx-runtime";
+import { Select as Fe, Form as U, Upload as ke, Button as Ee, DatePicker as Ge, Checkbox as Ie, Radio as We, InputNumber as Ke, Input as ve, Row as $e, Col as ze, App as He, Flex as ie, Spin as ae } from "antd";
+import { createContext as Ye, useContext as Re, memo as C, useState as P, useMemo as R, useEffect as V, useCallback as T, useRef as B, forwardRef as Ne, useImperativeHandle as Je } from "react";
+import Z from "dayjs";
+import { FileImageOutlined as Qe, UploadOutlined as Xe } from "@ant-design/icons";
+const oe = Ye(
   null
 );
 function M() {
@@ -14,10 +14,10 @@ function M() {
     );
   return e;
 }
-function Xt() {
+function en() {
   return Re(oe);
 }
-function Xe(e, t = []) {
+function Ze(e, t = []) {
   for (const r of t) {
     if (typeof r == "function")
       continue;
@@ -32,10 +32,10 @@ function Xe(e, t = []) {
   for (const r of t)
     ;
 }
-function Ze(e, t = [], n = {}) {
-  return Xe(e, t) ?? n[e.code] ?? n[e.field?.type?.code ?? ""];
+function et(e, t = [], n = {}) {
+  return Ze(e, t) ?? n[e.code] ?? n[e.field?.type?.code ?? ""];
 }
-function et(e, t) {
+function tt(e, t) {
   const n = t.option_config?.label_attr, r = t.option_config?.value_attr || "value";
   let i;
   if (n?.length) {
@@ -48,8 +48,8 @@ function et(e, t) {
     value: e[r]
   };
 }
-function tt(e, t) {
-  return t.option_config && t.is_option_api ? e?.map((n) => et(n, t)) : t.metas?.map((n) => ({
+function nt(e, t) {
+  return t.option_config && t.is_option_api ? e?.map((n) => tt(n, t)) : t.metas?.map((n) => ({
     label: n.label,
     value: n.value
   }));
@@ -60,12 +60,12 @@ function se(e, t) {
     n && clearTimeout(n), n = setTimeout(() => e(...r), t);
   };
 }
-const nt = ({
+const rt = ({
   onSearchKeyword: e,
   searchDebounceMs: t = 500,
   ...n
 }) => {
-  const [r, i] = D(""), a = E(
+  const [r, i] = P(""), a = R(
     () => se((o) => e?.(o), t),
     [e, t]
   );
@@ -82,13 +82,13 @@ const nt = ({
       ...n
     }
   );
-}, rt = T(nt), it = ({
+}, it = C(rt), at = ({
   fieldName: e,
   formInstance: t,
   ...n
 }) => {
-  const r = q.useWatch(e, t);
-  return C(() => {
+  const r = U.useWatch(e, t);
+  return V(() => {
     if (r?.fileList?.length && r.fileList.some(
       (s) => !s.type?.startsWith("image/")
     )) {
@@ -108,45 +108,45 @@ const nt = ({
     {
       style: { border: 0, background: "none", cursor: "pointer" },
       type: "button",
-      children: /* @__PURE__ */ f(Je, {})
+      children: /* @__PURE__ */ f(Qe, {})
     }
   ) });
-}, at = T(it), ot = ({
+}, ot = C(at), st = ({
   fieldName: e,
   formInstance: t,
   ...n
 }) => {
-  const r = q.useWatch(e, t);
-  return /* @__PURE__ */ f(ke, { fileList: r?.fileList, ...n, children: /* @__PURE__ */ f(Ee, { icon: /* @__PURE__ */ f(Qe, {}) }) });
-}, st = T(ot), lt = ({
+  const r = U.useWatch(e, t);
+  return /* @__PURE__ */ f(ke, { fileList: r?.fileList, ...n, children: /* @__PURE__ */ f(Ee, { icon: /* @__PURE__ */ f(Xe, {}) }) });
+}, lt = C(st), ct = ({
   formInstance: e,
   uploadUrl: t,
   setFieldState: n
 }) => {
-  const { client: r, upload: i, i18n: a, renderers: s } = M(), { messages: o } = a, d = x(() => {
+  const { client: r, upload: i, i18n: a, renderers: s } = M(), { messages: o } = a, d = T(() => {
     if (i.upload) return i.upload;
     const l = t ?? i.uploadUrl;
     if (l)
-      return async ({ file: p, signal: y, onProgress: u, fieldCode: v, fieldGroup: b, metadata: w }) => {
-        const h = i.getPayload ? i.getPayload({
+      return async ({ file: p, signal: h, onProgress: u, fieldCode: v, fieldGroup: _, metadata: w }) => {
+        const b = i.getPayload ? i.getPayload({
           file: p,
           fieldCode: v,
-          fieldGroup: b,
+          fieldGroup: _,
           uploadUrl: l,
-          signal: y,
+          signal: h,
           onProgress: u,
           metadata: w
         }) : (() => {
           const g = new FormData();
-          return g.append("file", p), w && Object.entries(w).forEach(([F, R]) => {
-            g.append(F, String(R));
+          return g.append("file", p), w && Object.entries(w).forEach(([k, D]) => {
+            g.append(k, String(D));
           }), g;
         })(), A = (await r.request({
           method: "POST",
           url: l,
-          data: h,
-          headers: h instanceof FormData ? { "Content-Type": "multipart/form-data" } : void 0,
-          signal: y,
+          data: b,
+          headers: b instanceof FormData ? { "Content-Type": "multipart/form-data" } : void 0,
+          signal: h,
           onUploadProgress: (g) => {
             u?.(
               Math.round(g.loaded * 100 / (g.total || 1))
@@ -159,67 +159,67 @@ const nt = ({
           path: String(A.path ?? "")
         };
       };
-  }, [r, i, t]), c = x(
-    (l, p) => (y) => {
-      const { file: u, onProgress: v, onError: b, onSuccess: w } = y, h = new AbortController(), S = d();
+  }, [r, i, t]), c = T(
+    (l, p) => (h) => {
+      const { file: u, onProgress: v, onError: _, onSuccess: w } = h, b = new AbortController(), S = d();
       return S ? (S({
         file: u,
         fieldCode: l,
         fieldGroup: p,
         uploadUrl: t ?? i.uploadUrl,
-        signal: h.signal,
+        signal: b.signal,
         onProgress: (A) => v?.({ percent: A })
       }).then(
         (A) => w?.({
           ...A,
           uid: A.uid ?? u.uid,
           path: A.path,
-          upload_date: X().format("YYYY-MM-DD HH:mm:ss")
+          upload_date: Z().format("YYYY-MM-DD HH:mm:ss")
         })
-      ).catch((A) => b?.(A)), { abort: () => h.abort() }) : (b?.(new Error(o.uploadError ?? "Upload not configured")), { abort() {
+      ).catch((A) => _?.(A)), { abort: () => b.abort() }) : (_?.(new Error(o.uploadError ?? "Upload not configured")), { abort() {
       } });
     },
     [o.uploadError, d, i.uploadUrl, t]
-  ), _ = x(
-    (l, p) => async (y) => {
-      const u = y.response?.path;
+  ), y = T(
+    (l, p) => async (h) => {
+      const u = h.response?.path;
       return u ? i.remove({ path: u, fieldCode: l, fieldGroup: p }) : !0;
     },
     [i]
-  ), m = x(
+  ), m = T(
     (l, {
       state: p,
-      options: y,
+      options: h,
       optionsLoading: u,
       optionsError: v,
-      onSearchKeyword: b,
+      onSearchKeyword: _,
       readOnly: w = !1
     }) => {
-      const { additional_config: h, field: S } = l, A = S?.type?.code, g = w || l.is_readonly || p?.disabled, F = Ze(
+      const { additional_config: b, field: S } = l, A = S?.type?.code, g = w || l.is_readonly || p?.disabled, k = et(
         l,
         s.fields
       );
-      if (F)
-        return F(l, {
+      if (k)
+        return k(l, {
           state: p,
-          options: y,
+          options: h,
           optionsLoading: u,
           optionsError: v,
-          onSearchKeyword: b,
+          onSearchKeyword: _,
           readOnly: w,
           formInstance: e,
           disabled: !!g,
           setFieldState: n
         });
-      const R = tt(y, l);
+      const D = nt(h, l);
       switch (A) {
         case "text":
-          return h?.text?.textarea ? /* @__PURE__ */ f(
+          return b?.text?.textarea ? /* @__PURE__ */ f(
             ve.TextArea,
             {
               disabled: g,
               placeholder: o.inputPlaceholder(l.label),
-              rows: h?.text?.rows
+              rows: b?.text?.rows
             }
           ) : /* @__PURE__ */ f(
             ve,
@@ -230,74 +230,74 @@ const nt = ({
           );
         case "number":
           return /* @__PURE__ */ f(
-            Ge,
+            Ke,
             {
               style: { width: "100%" },
               disabled: g,
               placeholder: o.inputPlaceholder(l.label),
-              min: h?.number?.min,
-              max: h?.number?.max
+              min: b?.number?.min,
+              max: b?.number?.max
             }
           );
         case "select": {
           const j = {
             disabled: g,
-            options: R,
+            options: D,
             placeholder: o.selectPlaceholder(l.label),
             allowClear: !0,
             loading: u,
-            mode: h?.select?.multiple ? "multiple" : void 0,
+            mode: b?.select?.multiple ? "multiple" : void 0,
             notFoundContent: v ? o.optionError : u ? o.optionLoading : void 0
           };
-          return b ? /* @__PURE__ */ f(
-            rt,
+          return _ ? /* @__PURE__ */ f(
+            it,
             {
               ...j,
-              onSearchKeyword: b,
-              searchDebounceMs: h?.select?.searchDebounceMs ?? 500
+              onSearchKeyword: _,
+              searchDebounceMs: b?.select?.searchDebounceMs ?? 500
             }
           ) : /* @__PURE__ */ f(Fe, { ...j, showSearch: !0, optionFilterProp: "label" });
         }
         case "radio":
-          return /* @__PURE__ */ f(We.Group, { disabled: g, options: R });
+          return /* @__PURE__ */ f(We.Group, { disabled: g, options: D });
         case "checkbox":
-          return /* @__PURE__ */ f(Be.Group, { disabled: g, options: R });
+          return /* @__PURE__ */ f(Ie.Group, { disabled: g, options: D });
         case "datetime":
           return /* @__PURE__ */ f(
-            Ie,
+            Ge,
             {
               style: { width: "100%" },
               disabled: g,
-              showTime: h?.datetime?.showTime,
-              format: h?.datetime?.format
+              showTime: b?.datetime?.showTime,
+              format: b?.datetime?.format
             }
           );
         case "file":
           return /* @__PURE__ */ f(
-            st,
+            lt,
             {
               disabled: g,
               fieldName: l.code,
               formInstance: e,
-              multiple: h?.file?.multiple || !1,
-              maxCount: h?.file?.max,
-              accept: h?.file?.accept,
+              multiple: b?.file?.multiple || !1,
+              maxCount: b?.file?.max,
+              accept: b?.file?.accept,
               customRequest: c(l.code, l),
-              onRemove: _(l.code, l)
+              onRemove: y(l.code, l)
             }
           );
         case "image":
           return /* @__PURE__ */ f(
-            at,
+            ot,
             {
               disabled: g,
               fieldName: l.code,
               formInstance: e,
-              multiple: h?.image?.multiple || !1,
-              maxCount: h?.image?.max,
-              accept: h?.image?.accept ?? "image/*",
+              multiple: b?.image?.multiple || !1,
+              maxCount: b?.image?.max,
+              accept: b?.image?.accept ?? "image/*",
               customRequest: c(l.code, l),
-              onRemove: _(l.code, l)
+              onRemove: y(l.code, l)
             }
           );
         default:
@@ -306,19 +306,19 @@ const nt = ({
     },
     [
       c,
-      _,
+      y,
       e,
       o,
       s.fields,
       n
     ]
   );
-  return E(() => ({ getDynamicField: m }), [m]);
+  return R(() => ({ getDynamicField: m }), [m]);
 };
 function le(e) {
   return JSON.stringify(e);
 }
-function ct(e, t) {
+function dt(e, t) {
   const n = e.get(t);
   if (n) {
     if (Date.now() > n.expiresAt) {
@@ -328,48 +328,48 @@ function ct(e, t) {
     return n.data;
   }
 }
-function dt(e, t, n, r) {
+function ut(e, t, n, r) {
   e.set(t, { data: n, expiresAt: Date.now() + r });
 }
 async function re(e, t, n, r, i) {
   const a = e[t];
   if (e.cache.enabled) {
-    const c = ct(a, n);
+    const c = dt(a, n);
     if (c !== void 0) return c;
   }
   const s = new AbortController(), o = i ? AbortSignal.any([i, s.signal]) : s.signal, d = await r(o);
-  return e.cache.enabled && dt(a, n, d, e.cache.ttlMs), d;
+  return e.cache.enabled && ut(a, n, d, e.cache.ttlMs), d;
 }
-function B(e, t) {
+function I(e, t) {
   return t.split(".").reduce((n, r) => {
     if (n && typeof n == "object")
       return n[r];
   }, e);
 }
-function ut(e, t) {
+function ft(e, t) {
   if (typeof e != "string") return e;
   const n = e.match(/^\{\{(.+?)\}\}$/);
   if (!n) return e;
-  const r = n[1].trim(), i = B(t, r);
+  const r = n[1].trim(), i = I(t, r);
   return i !== void 0 ? i : e;
 }
-function ft(e, t) {
+function mt(e, t) {
   const n = {};
   for (const r in e)
-    n[r] = ut(
+    n[r] = ft(
       e[r],
       t
     );
   return n;
 }
-function Zt(e, t) {
+function tn(e, t) {
   const n = { ...e };
   return t.forEach((r) => {
     const i = e[r.code];
     if (i == null) return;
     switch (r.field?.type?.code) {
       case "datetime": {
-        const s = X(i);
+        const s = Z(i);
         s.isValid() && (n[r.code] = s);
         break;
       }
@@ -395,13 +395,13 @@ function Zt(e, t) {
     }
   }), n;
 }
-function mt(e) {
+function pt(e) {
   const t = e.option_config?.api_options?.params || {}, n = e.option_config?.api_options?.data || {}, r = (i) => Object.values(i).filter(
     (a) => typeof a == "string" && a.startsWith("{{") && a.endsWith("}}")
   ).map((a) => a.slice(2, -2).trim());
   return Array.from(/* @__PURE__ */ new Set([...r(t), ...r(n)]));
 }
-function O(e, t) {
+function q(e, t) {
   const n = {};
   for (const r in e) {
     const i = e[r];
@@ -413,21 +413,27 @@ function O(e, t) {
   }
   return n;
 }
-function J(e, t) {
+function Q(e, t) {
   return e.replace(/\{\{\s*(\w+)\s*\}\}/g, (n, r) => {
     const i = t?.[r];
     return i != null ? String(i) : "";
   });
 }
-function pt(e, t) {
-  const n = E(
-    () => mt(e),
+function ht(e, t, n) {
+  const i = t.find((a) => a.code === e)?.additional_config?.on_field_change?.clear ?? [];
+  return i.length === 0 ? [] : i.filter(
+    (a) => n?.[a] !== void 0 && n?.[a] !== null
+  );
+}
+function yt(e, t) {
+  const n = R(
+    () => pt(e),
     [e]
-  ), r = q.useWatch(
+  ), r = U.useWatch(
     n.length > 0 ? n : void 0,
     t
   );
-  return E(() => {
+  return R(() => {
     if (!n.length) return {};
     const i = {};
     return n.forEach((a, s) => {
@@ -435,67 +441,67 @@ function pt(e, t) {
     }), i;
   }, [n, r]);
 }
-function ht({
+function bt({
   group: e,
   formInstance: t,
   searchKeyword: n = "",
   searchDebounceMs: r = 500
 }) {
-  const i = M(), a = pt(e, t), [s, o] = D(), [d, c] = D(!1), [_, m] = D(), l = U(null), [p, y] = D(n), u = e.additional_config?.select?.search_keyword ?? !1, v = E(
-    () => se((h) => y(h), r),
+  const i = M(), a = yt(e, t), [s, o] = P(), [d, c] = P(!1), [y, m] = P(), l = B(null), [p, h] = P(n), u = e.additional_config?.select?.search_keyword ?? !1, v = R(
+    () => se((b) => h(b), r),
     [r]
   );
-  C(() => {
-    u ? v(n) : y("");
+  V(() => {
+    u ? v(n) : h("");
   }, [n, u, v]);
-  const b = E(() => {
-    const h = e.option_config?.api_options?.params, S = e.option_config?.api_options?.data;
-    if (!(!h && !S))
+  const _ = R(() => {
+    const b = e.option_config?.api_options?.params, S = e.option_config?.api_options?.data;
+    if (!(!b && !S))
       return {
-        params: h ? O(h, a) : void 0,
-        data: S ? O(S, a) : void 0
+        params: b ? q(b, a) : void 0,
+        data: S ? q(S, a) : void 0
       };
-  }, [a, e]), w = x(async () => {
+  }, [a, e]), w = T(async () => {
     if (!e.option_config || !e.is_option_api || !e.option_config.url)
       return;
     l.current?.abort();
-    const h = new AbortController();
-    l.current = h;
+    const b = new AbortController();
+    l.current = b;
     const S = e.option_config.method?.toUpperCase() === "GET" || !e.option_config.method, A = u ? p : "", g = le([
       e.code,
       e.option_config.url,
       e.option_config.method,
-      b,
+      _,
       A
     ]);
     c(!0), m(void 0);
     try {
-      const F = await re(
+      const k = await re(
         i,
         "optionCache",
         g,
-        async (R) => {
+        async (D) => {
           const j = await i.client.request({
             method: e.option_config?.method || "GET",
             url: e.option_config?.url,
-            params: S && u ? { ...b?.params, keywords: A } : b?.params,
-            data: !S && u ? { ...b?.data, keywords: A } : b?.data,
-            signal: R
+            params: S && u ? { ..._?.params, keywords: A } : _?.params,
+            data: !S && u ? { ..._?.data, keywords: A } : _?.data,
+            signal: D
           });
           return i.parsers.optionResponse(j.data, e);
         },
-        h.signal
+        b.signal
       );
-      h.signal.aborted || o(F);
-    } catch (F) {
-      h.signal.aborted || m(F);
+      b.signal.aborted || o(k);
+    } catch (k) {
+      b.signal.aborted || m(k);
     } finally {
-      h.signal.aborted || c(!1);
+      b.signal.aborted || c(!1);
     }
-  }, [b, i, p, e, u]);
-  return C(() => (e.option_config && e.is_option_api && w(), () => l.current?.abort()), [w, e]), { options: s, isLoading: d, error: _, refetch: w };
+  }, [_, i, p, e, u]);
+  return V(() => (e.option_config && e.is_option_api && w(), () => l.current?.abort()), [w, e]), { options: s, isLoading: d, error: y, refetch: w };
 }
-const yt = ({
+const _t = ({
   group: e,
   formInstance: t,
   fieldState: n,
@@ -505,45 +511,37 @@ const yt = ({
   size: s = "middle",
   ...o
 }) => {
-  const { getDynamicField: d } = lt({
+  const { getDynamicField: d } = ct({
     formInstance: t,
     uploadUrl: i,
     setFieldState: r
-  }), c = q.useWatch(e.code, t), [_, m] = D(""), l = e.additional_config?.select?.search_keyword ?? !1, { options: p, isLoading: y, error: u } = ht({
+  }), c = U.useWatch(e.code, t), [y, m] = P(""), l = e.additional_config?.select?.search_keyword ?? !1, { options: p, isLoading: h, error: u } = bt({
     group: e,
     formInstance: t,
-    searchKeyword: _,
+    searchKeyword: y,
     searchDebounceMs: e.additional_config?.select?.searchDebounceMs ?? 500
-  }), v = x((w) => {
+  }), v = T((w) => {
     m(w);
   }, []);
-  C(() => {
-    if (e.additional_config?.on_field_change?.clear?.length) {
-      const w = t.getFieldsValue(
-        e.additional_config.on_field_change.clear
-      ), h = e.additional_config.on_field_change.clear.filter(
-        (S) => w?.[S]
-      );
-      h.length && t.resetFields(h);
-    }
+  V(() => {
     e.additional_config?.on_field_empty?.disable?.length && e.additional_config.on_field_empty.disable.forEach((w) => {
       r(w, { disabled: !c });
     });
   }, [c, t, e, r]);
-  const b = s === "small" ? 4 : 12;
+  const _ = s === "small" ? 4 : 12;
   return /* @__PURE__ */ f(
-    q.Item,
+    U.Item,
     {
       label: e.label,
       name: e.code,
       hidden: n?.hidden,
       rules: [{ required: n?.required || !1 }],
-      style: { marginBottom: b, ...o.style },
+      style: { marginBottom: _, ...o.style },
       ...o,
       children: d(e, {
         state: n,
         options: p,
-        optionsLoading: y,
+        optionsLoading: h,
         optionsError: u,
         onSearchKeyword: l ? v : void 0,
         readOnly: a
@@ -551,24 +549,24 @@ const yt = ({
     }
   );
 };
-function _t(e, t) {
+function vt(e, t) {
   return e.group.id === t.group.id && e.readOnly === t.readOnly && e.uploadUrl === t.uploadUrl && e.size === t.size && e.fieldState?.disabled === t.fieldState?.disabled && e.fieldState?.hidden === t.fieldState?.hidden && e.fieldState?.required === t.fieldState?.required;
 }
-const bt = T(yt, _t);
-function vt({
+const wt = C(_t, vt);
+function gt({
   fieldGroups: e,
   fieldStates: t,
   renderField: n,
   gutter: r,
   defaultColSpan: i
 }) {
-  return /* @__PURE__ */ f(Ke, { gutter: r, children: e.map((a) => {
+  return /* @__PURE__ */ f($e, { gutter: r, children: e.map((a) => {
     const s = t[a.code]?.hidden ? 0 : Number(a.additional_config?.field_col_span) || i;
-    return /* @__PURE__ */ f($e, { xs: s, children: n(a) }, a.id);
+    return /* @__PURE__ */ f(ze, { xs: s, children: n(a) }, a.id);
   }) });
 }
-function wt(e) {
-  return E(() => {
+function At(e) {
+  return R(() => {
     const t = e?.form?.field_groups ?? [], n = /* @__PURE__ */ new Map(), r = {};
     t.forEach((a) => {
       n.set(a.code, a), a.additional_config?.default !== void 0 && (r[a.code] = a.additional_config.default);
@@ -587,14 +585,14 @@ function we(e) {
     };
   }), t;
 }
-function gt(e) {
-  const [t, n] = D(
+function St(e) {
+  const [t, n] = P(
     () => we(e)
   );
-  C(() => {
+  V(() => {
     n(we(e));
   }, [e]);
-  const r = x((i, a) => {
+  const r = T((i, a) => {
     n((s) => ({
       ...s,
       [i]: { ...s[i], ...a }
@@ -602,23 +600,23 @@ function gt(e) {
   }, []);
   return { fieldStates: t, setFieldStates: n, setFieldState: r };
 }
-function At({
+function Ft({
   formInstance: e,
   fieldByCode: t,
   relatedData: n,
   transformers: r
 }) {
-  return { buildProcessedValues: x(async () => {
+  return { buildProcessedValues: T(async () => {
     await e.validateFields();
     const a = e.getFieldsValue(), s = {};
     for (const c of Object.keys(a)) {
-      const _ = t.get(c);
-      if (!_) continue;
+      const y = t.get(c);
+      if (!y) continue;
       let m;
-      switch (_.field?.type?.code) {
+      switch (y.field?.type?.code) {
         case "datetime":
-          m = a[c] ? X(a[c]).format(
-            _.additional_config?.datetime?.format
+          m = a[c] ? Z(a[c]).format(
+            y.additional_config?.datetime?.format
           ) : null;
           break;
         case "image":
@@ -633,17 +631,17 @@ function At({
         default:
           m = a[c];
       }
-      r.transformFieldValue && (m = r.transformFieldValue(c, m, _)), s[c] = m;
+      r.transformFieldValue && (m = r.transformFieldValue(c, m, y)), s[c] = m;
     }
     let o = s;
     return r.transformSubmitValues && (o = r.transformSubmitValues(
       o,
       Array.from(t.values()),
       n
-    )), (r.parseRelatedDataTemplates ?? ft)(o, n ?? {});
+    )), (r.parseRelatedDataTemplates ?? mt)(o, n ?? {});
   }, [t, e, n, r]) };
 }
-const St = Ne(
+const kt = Ne(
   ({
     formConfig: e,
     formInstance: t,
@@ -655,75 +653,75 @@ const St = Ne(
     onSubmitSuccess: o,
     onSubmitError: d,
     isRedirectAfterCreate: c,
-    onRedirect: _,
+    onRedirect: y,
     size: m = "middle",
     manualSubmit: l = !1,
     onValuesChange: p,
-    readOnly: y = !1,
+    readOnly: h = !1,
     submitDebounceMs: u,
     gutter: v = [8, 0],
-    defaultColSpan: b = 12,
+    defaultColSpan: _ = 12,
     submitButtonLabel: w
-  }, h) => {
-    const { message: S } = ze.useApp(), A = M(), { i18n: g, client: F, parsers: R, redirectHandler: j, renderers: G, transformers: K } = A, ce = r ?? i, de = u ?? A.submitDebounceMs, ue = w ?? g.messages.submit, { fieldGroups: V, fieldByCode: Ce, initialValues: $ } = wt(e), { fieldStates: z, setFieldState: fe } = gt(V), { buildProcessedValues: H } = At({
+  }, b) => {
+    const { message: S } = He.useApp(), A = M(), { i18n: g, client: k, parsers: D, redirectHandler: j, renderers: K, transformers: $ } = A, ce = r ?? i, de = u ?? A.submitDebounceMs, ue = w ?? g.messages.submit, { fieldGroups: L, fieldByCode: Oe, initialValues: z } = At(e), { fieldStates: H, setFieldState: fe } = St(L), { buildProcessedValues: Y } = Ft({
       formInstance: t,
-      fieldByCode: Ce,
+      fieldByCode: Oe,
       relatedData: n,
-      transformers: K
-    }), N = U(!1), [me, pe] = D(!1), [he, ye] = D(!1);
-    C(() => {
-      if (Object.keys($).length > 0) {
-        const k = K.normalizeInitialValues ? K.normalizeInitialValues($, V) : $;
-        t.setFieldsValue(k);
+      transformers: $
+    }), N = B(!1), [me, pe] = P(!1), [he, ye] = P(!1);
+    V(() => {
+      if (Object.keys(z).length > 0) {
+        const F = $.normalizeInitialValues ? $.normalizeInitialValues(z, L) : z;
+        t.setFieldsValue(F);
       }
-    }, [V, t, $, K]);
-    const Y = x(async () => {
+    }, [L, t, z, $]);
+    const J = T(async () => {
       if (!N.current) {
         N.current = !0, pe(!0);
         try {
-          let k = await H();
+          let F = await Y();
           try {
-            a && (ye(!0), await F.request({
+            a && (ye(!0), await k.request({
               method: "POST",
               url: a,
-              data: k
+              data: F
             }));
-            const P = await s?.(k);
-            if (P === !1) return;
-            P && typeof P == "object" && (k = P);
-          } catch (P) {
-            console.error(P);
+            const E = await s?.(F);
+            if (E === !1) return;
+            E && typeof E == "object" && (F = E);
+          } catch (E) {
+            console.error(E);
             return;
           } finally {
             ye(!1);
           }
-          const W = await F.request({
+          const O = await k.request({
             method: e.method,
             url: e.action,
-            data: k
+            data: F
           });
           t.resetFields(
-            V.filter((P) => !P.is_hidden).map((P) => P.code)
+            L.filter((E) => !E.is_hidden).map((E) => E.code)
           );
-          const ee = R.submitResponse(W.data);
-          c && ee.redirectUrl && (_ ?? j)(ee.redirectUrl, "_blank"), o?.({
-            values: k,
-            response: W.data,
-            data: ee.data ?? W.data
+          const W = D.submitResponse(O.data);
+          c && W.redirectUrl && (y ?? j)(W.redirectUrl, "_blank"), o?.({
+            values: F,
+            response: O.data,
+            data: W.data ?? O.data
           });
-        } catch (k) {
-          const W = k;
+        } catch (F) {
+          const O = F;
           S.error(
-            W?.response?.data?.message ?? g.messages.submitError
-          ), d?.(k);
+            O?.response?.data?.message ?? g.messages.submitError
+          ), d?.(F);
         } finally {
           N.current = !1, pe(!1);
         }
       }
     }, [
-      H,
-      F,
-      V,
+      Y,
+      k,
+      L,
       e.action,
       e.method,
       t,
@@ -731,95 +729,107 @@ const St = Ne(
       c,
       S,
       s,
-      _,
+      y,
       d,
       o,
-      R,
+      D,
       j,
       a
     ]);
-    Ye(
-      h,
+    Je(
+      b,
       () => ({
-        submit: Y,
-        getProcessedValues: H,
+        submit: J,
+        getProcessedValues: Y,
         isSubmitting: () => N.current
       }),
-      [H, Y]
+      [Y, J]
     );
-    const _e = E(
+    const be = R(
       () => se(() => {
-        Y();
+        J();
       }, de),
-      [Y, de]
-    ), be = x(
-      (k) => /* @__PURE__ */ f(
-        bt,
+      [J, de]
+    ), Ve = T(
+      (F, O) => {
+        Object.keys(F).forEach((W) => {
+          const E = ht(
+            W,
+            L,
+            t.getFieldsValue()
+          );
+          E.length > 0 && t.resetFields(E);
+        }), p?.(F, O);
+      },
+      [L, t, p]
+    ), _e = T(
+      (F) => /* @__PURE__ */ f(
+        wt,
         {
-          group: k,
+          group: F,
           formInstance: t,
-          fieldState: z[k.code],
+          fieldState: H[F.code],
           setFieldState: fe,
           uploadUrl: ce,
-          readOnly: y,
+          readOnly: h,
           size: m
         },
-        k.id
+        F.id
       ),
       [
-        z,
+        H,
         t,
-        y,
+        h,
         ce,
         fe,
         m
       ]
-    ), Oe = G.layout ? G.layout({
-      fieldGroups: V,
-      fieldStates: z,
-      renderField: be,
+    ), qe = K.layout ? K.layout({
+      fieldGroups: L,
+      fieldStates: H,
+      renderField: _e,
       gutter: v,
-      defaultColSpan: b,
+      defaultColSpan: _,
       size: m
     }) : /* @__PURE__ */ f(
-      vt,
+      gt,
       {
-        fieldGroups: V,
-        fieldStates: z,
-        renderField: be,
+        fieldGroups: L,
+        fieldStates: H,
+        renderField: _e,
         gutter: v,
-        defaultColSpan: b,
+        defaultColSpan: _,
         size: m
       }
-    ), qe = !l && !y && (G.submitActions ? G.submitActions({
-      onSubmit: _e,
+    ), Ue = !l && !h && (K.submitActions ? K.submitActions({
+      onSubmit: be,
       loading: me || he,
       label: ue
     }) : /* @__PURE__ */ f(ie, { justify: "flex-end", children: /* @__PURE__ */ f(
       Ee,
       {
         type: "primary",
-        onClick: _e,
+        onClick: be,
         loading: me || he,
         children: ue
       }
     ) }));
-    return /* @__PURE__ */ Ue(
-      q,
+    return /* @__PURE__ */ Be(
+      U,
       {
         layout: "vertical",
         form: t,
         size: m,
-        onValuesChange: p,
+        onValuesChange: Ve,
         children: [
-          Oe,
-          qe
+          qe,
+          Ue
         ]
       }
     );
   }
 );
-St.displayName = "DynamicForm";
+kt.displayName = "DynamicForm";
 function De(e) {
   if (!e) return;
   const { mode: t } = e;
@@ -859,19 +869,19 @@ function ge(e) {
     id: e
   };
 }
-function Ft(e, t) {
+function Et(e, t) {
   const n = t.method || "GET", r = n.toUpperCase() === "GET";
   if (t.url_template)
     return (Array.isArray(e) ? e.filter((d) => d != null && d !== "") : e != null && e !== "" ? [e] : []).map((d) => {
-      const c = ge(d), _ = J(t.url, c), m = t.params ? O(t.params, c) : void 0, l = t.data ? O(t.data, c) : void 0;
+      const c = ge(d), y = Q(t.url, c), m = t.params ? q(t.params, c) : void 0, l = t.data ? q(t.data, c) : void 0;
       return {
         method: n,
-        url: _,
+        url: y,
         params: r ? m : void 0,
         data: r ? void 0 : l
       };
     });
-  const i = ge(e), a = t.params ? O(t.params, i) : void 0, s = t.data ? O(t.data, i) : void 0;
+  const i = ge(e), a = t.params ? q(t.params, i) : void 0, s = t.data ? q(t.data, i) : void 0;
   return [
     {
       method: n,
@@ -882,17 +892,17 @@ function Ft(e, t) {
   ];
 }
 function Pe(e, t) {
-  const n = t.data_path ? B(e, t.data_path) : e;
+  const n = t.data_path ? I(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 xe(e, t) {
-  return Tt(e, t.mapping_attr);
+function Te(e, t) {
+  return Mt(e, t.mapping_attr);
 }
-function Le(e, t) {
-  return Mt(t.link, e);
+function xe(e, t) {
+  return jt(t.link, e);
 }
-async function kt(e, t, n, r) {
-  const i = Ft(e, t);
+async function Rt(e, t, n, r) {
+  const i = Et(e, t);
   if (!i.length) return [];
   const a = await Promise.all(
     i.map((o) => n({ ...o, signal: r }))
@@ -901,10 +911,10 @@ async function kt(e, t, n, r) {
     s.push(...Pe(o.data, t));
   return s;
 }
-function I(e) {
+function G(e) {
   return !!(e == null || e === "" || Array.isArray(e) && e.length === 0);
 }
-function Et(e, t) {
+function Dt(e, t) {
   const n = e.option_config?.api_options?.params, r = e.option_config?.api_options?.data;
   if (!n && !r) return;
   const i = (a) => {
@@ -922,7 +932,7 @@ function Et(e, t) {
     data: r ? i(r) : void 0
   };
 }
-function Rt(e, t) {
+function Pt(e, t) {
   const n = t.option_config?.label_attr, r = t.option_config?.value_attr || "";
   if (n?.length) {
     const i = n.join(" - ");
@@ -930,33 +940,33 @@ function Rt(e, t) {
   }
   return String(e[r] ?? "");
 }
-function Dt(e, t) {
+function Tt(e, t) {
   if (!t?.length) return null;
   const r = (Array.isArray(e) ? e : [e]).map((i) => t.find((a) => String(a.value) === String(i))?.label).filter((i) => !!i);
   return r.length ? r.join(", ") : null;
 }
-function Pt(e, t, n) {
-  if (I(e)) return null;
+function xt(e, t, n) {
+  if (G(e)) return null;
   const r = t.option_config?.value_attr || "value", i = Array.isArray(e) ? e : [e];
   if (t.is_option_api && n?.length) {
     const s = i.map((o) => {
       const d = n.find(
         (c) => String(c[r]) === String(o)
       );
-      return d ? Rt(d, t) : String(o);
+      return d ? Pt(d, t) : String(o);
     }).filter(Boolean);
     return s.length ? s.join(", ") : null;
   }
-  const a = Dt(e, t.metas);
+  const a = Tt(e, t.metas);
   return a || i.map(String).join(", ");
 }
-function xt(e, t) {
-  if (I(e)) return null;
-  const n = t.additional_config?.datetime?.format, r = X(e);
+function Lt(e, t) {
+  if (G(e)) return null;
+  const n = t.additional_config?.datetime?.format, r = Z(e);
   return r.isValid() ? n ? r.format(n) : r.format("YYYY-MM-DD HH:mm:ss") : String(e);
 }
-function Lt(e) {
-  if (I(e)) return null;
+function Ct(e) {
+  if (G(e)) return null;
   if (Array.isArray(e)) {
     const t = e.map(
       (n) => typeof n == "object" && n && "name" in n ? String(n.name) : String(n)
@@ -965,20 +975,20 @@ function Lt(e) {
   }
   return String(e);
 }
-function Tt(e, t) {
+function Mt(e, t) {
   return t?.length ? t.map((n) => {
-    const r = B(e, n) ?? e[n];
+    const r = I(e, n) ?? e[n];
     return r != null ? String(r) : "";
   }).filter(Boolean).join(" - ") : JSON.stringify(e);
 }
-function Mt(e, t) {
+function jt(e, t) {
   return e ? e.replace(/\{\{(.+?)\}\}/g, (n, r) => {
-    const i = r.trim(), a = B(t, i) ?? t[i];
+    const i = r.trim(), a = I(t, i) ?? t[i];
     return a != null ? String(a) : "";
   }) : null;
 }
 function Ae(e, t, n) {
-  if (I(e)) return null;
+  if (G(e)) return null;
   switch (t?.mode ?? "formatted") {
     case "raw":
     case "formatted":
@@ -991,7 +1001,7 @@ function Ae(e, t, n) {
         return Array.isArray(e) ? e.map(String).join(", ") : String(e);
       const a = Pe(n, i);
       return a.length ? a.map((o) => {
-        const d = xe(o, i), c = Le(o, i);
+        const d = Te(o, i), c = xe(o, i);
         return c ? `${d} (${c})` : d;
       }).filter(Boolean).join(", ") || null : String(e);
     }
@@ -999,7 +1009,7 @@ function Ae(e, t, n) {
       return String(e);
   }
 }
-function jt(e, t, n) {
+function Ot(e, t, n) {
   const r = e.additional_config?.view_value;
   if (r?.mode === "api" || r?.mode === "api_ids" || r?.mode === "api_detail")
     return Ae(
@@ -1010,83 +1020,83 @@ function jt(e, t, n) {
   switch (e.field?.type?.code) {
     case "text":
     case "number":
-      return I(t) ? null : String(t);
+      return G(t) ? null : String(t);
     case "datetime":
-      return xt(t, e);
+      return Lt(t, e);
     case "select":
     case "radio":
     case "checkbox":
-      return Pt(t, e, n.optionList);
+      return xt(t, e, n.optionList);
     case "image":
     case "file":
-      return Lt(t);
+      return Ct(t);
     default:
       return r ? Ae(
         t,
         r,
         n.viewValueFetched
-      ) : I(t) ? null : String(t);
+      ) : G(t) ? null : String(t);
   }
 }
-const Q = /* @__PURE__ */ new Map(), Vt = 3e4;
-function Ct(e) {
-  const t = Q.get(e);
+const X = /* @__PURE__ */ new Map(), Vt = 3e4;
+function qt(e) {
+  const t = X.get(e);
   if (t) {
     if (Date.now() > t.expiresAt) {
-      Q.delete(e);
+      X.delete(e);
       return;
     }
     return t.error;
   }
 }
 function Se(e, t) {
-  Q.set(e, {
+  X.set(e, {
     error: t,
     expiresAt: Date.now() + Vt
   });
 }
-function Z(e, t, n = !0) {
-  const r = M(), [i, a] = D(), [s, o] = D(!1), [d, c] = D(), _ = U(t), m = U(r);
-  _.current = t, m.current = r;
+function ee(e, t, n = !0) {
+  const r = M(), [i, a] = P(), [s, o] = P(!1), [d, c] = P(), y = B(t), m = B(r);
+  y.current = t, m.current = r;
   const l = le(e);
-  return C(() => {
+  return V(() => {
     if (!n) {
       a(void 0), c(void 0), o(!1);
       return;
     }
-    const y = Ct(l);
-    if (y !== void 0) {
-      c(y), o(!1);
+    const h = qt(l);
+    if (h !== void 0) {
+      c(h), o(!1);
       return;
     }
     const u = new AbortController();
     return o(!0), c(void 0), (async () => {
       try {
-        const b = await re(
+        const _ = await re(
           m.current,
           "viewCache",
           l,
-          (w) => _.current(w),
+          (w) => y.current(w),
           u.signal
         );
-        u.signal.aborted || (a(b), c(void 0));
-      } catch (b) {
-        u.signal.aborted || (Se(l, b), c(b));
+        u.signal.aborted || (a(_), c(void 0));
+      } catch (_) {
+        u.signal.aborted || (Se(l, _), c(_));
       } finally {
         u.signal.aborted || o(!1);
       }
     })(), () => u.abort();
   }, [n, l]), { data: i, isLoading: s, error: d, refetch: async () => {
-    if (Q.delete(l), !n) return;
-    const y = new AbortController();
+    if (X.delete(l), !n) return;
+    const h = new AbortController();
     o(!0), c(void 0);
     try {
       const u = await re(
         m.current,
         "viewCache",
         l,
-        (v) => _.current(v),
-        y.signal
+        (v) => y.current(v),
+        h.signal
       );
       return a(u), u;
     } catch (u) {
@@ -1096,19 +1106,19 @@ function Z(e, t, n = !0) {
     }
   } };
 }
-const Ot = ({ value: e, code: t, modeConfig: n }) => {
-  const { client: r, renderers: i, i18n: a } = M(), s = E(
+const Ut = ({ value: e, code: t, modeConfig: n }) => {
+  const { client: r, renderers: i, i18n: a } = M(), s = R(
     () => (Array.isArray(e) ? e : [e]).filter(Boolean),
     [e]
   ), {
     data: o,
     isLoading: d,
     error: c
-  } = Z(
+  } = ee(
     ["api_detail", t, s, n?.url, n?.method],
     async (l) => (await Promise.all(
-      s.map(async (y) => {
-        const u = J(n?.url || "", { id: y });
+      s.map(async (h) => {
+        const u = Q(n?.url || "", { id: h });
         return (await r.request({
           method: n?.method,
           url: u,
@@ -1117,86 +1127,86 @@ const Ot = ({ value: e, code: t, modeConfig: n }) => {
       })
     )).filter(Boolean),
     !!(s.length && n?.url)
-  ), _ = (l, p, y) => i.link ? i.link({ url: l, label: p, data: y }) : /* @__PURE__ */ f("a", { href: l, target: "_blank", rel: "noreferrer", children: p }), m = (l) => {
-    const p = n?.mapping_attr?.map((y) => l?.[y]).join(" - ");
+  ), y = (l, p, h) => i.link ? i.link({ url: l, label: p, data: h }) : /* @__PURE__ */ f("a", { href: l, target: "_blank", rel: "noreferrer", children: p }), m = (l) => {
+    const p = n?.mapping_attr?.map((h) => l?.[h]).join(" - ");
     if (n?.link) {
-      const y = J(n.link, l);
-      return _(y, p, l);
+      const h = Q(n.link, l);
+      return y(h, p, l);
     }
     return p;
   };
-  return d ? /* @__PURE__ */ f(L, { children: i.viewLoading?.() ?? /* @__PURE__ */ f(ae, { size: "small" }) }) : c ? /* @__PURE__ */ f(L, { children: i.viewError?.(c) ?? a.messages.viewError }) : o?.length ? /* @__PURE__ */ f(L, { children: o.map((l, p) => /* @__PURE__ */ f("div", { children: m(l) }, p)) }) : /* @__PURE__ */ f(L, { children: i.viewEmpty?.() ?? a.messages.viewEmpty });
-}, Te = T(Ot), qt = ({ value: e, code: t, modeConfig: n }) => {
+  return d ? /* @__PURE__ */ f(x, { children: i.viewLoading?.() ?? /* @__PURE__ */ f(ae, { size: "small" }) }) : c ? /* @__PURE__ */ f(x, { children: i.viewError?.(c) ?? a.messages.viewError }) : o?.length ? /* @__PURE__ */ f(x, { children: o.map((l, p) => /* @__PURE__ */ f("div", { children: m(l) }, p)) }) : /* @__PURE__ */ f(x, { children: i.viewEmpty?.() ?? a.messages.viewEmpty });
+}, Le = C(Ut), Bt = ({ value: e, code: t, modeConfig: n }) => {
   const { client: r, renderers: i, i18n: a } = M(), {
     data: s,
     isLoading: o,
     error: d
-  } = Z(
+  } = ee(
     ["api_ids", t, e, n?.url, n?.method],
     async (m) => {
-      const l = n?.method || "GET", p = l.toUpperCase() === "POST", y = Array.isArray(e) ? e : [e], v = (await r.request({
+      const l = n?.method || "GET", p = l.toUpperCase() === "POST", h = Array.isArray(e) ? e : [e], v = (await r.request({
         method: l,
         url: n?.url || "",
-        data: p ? { ids: y } : void 0,
-        params: p ? void 0 : { ids: y },
+        data: p ? { ids: h } : void 0,
+        params: p ? void 0 : { ids: h },
         signal: m
-      })).data, b = n?.data_path ? B(v, n.data_path) : v;
-      return Array.isArray(b) ? b : v;
+      })).data, _ = n?.data_path ? I(v, n.data_path) : v;
+      return Array.isArray(_) ? _ : v;
     },
     !!(e && n?.url)
-  ), c = (m, l, p) => i.link ? i.link({ url: m, label: l, data: p }) : /* @__PURE__ */ f("a", { href: m, target: "_blank", rel: "noreferrer", children: l }), _ = (m) => {
+  ), c = (m, l, p) => i.link ? i.link({ url: m, label: l, data: p }) : /* @__PURE__ */ f("a", { href: m, target: "_blank", rel: "noreferrer", children: l }), y = (m) => {
     const l = n?.mapping_attr?.map((p) => m?.[p]).join(" - ");
     if (n?.link) {
-      const p = J(n.link, m);
+      const p = Q(n.link, m);
       return c(p, l, m);
     }
     return l;
   };
-  return o ? /* @__PURE__ */ f(L, { children: i.viewLoading?.() ?? /* @__PURE__ */ f(ae, { size: "small" }) }) : d ? /* @__PURE__ */ f(L, { children: i.viewError?.(d) ?? a.messages.viewError }) : s ? Array.isArray(e) ? /* @__PURE__ */ f(ie, { vertical: !0, children: (Array.isArray(s) ? s : [s]).map((m, l) => /* @__PURE__ */ f("div", { children: _(m) }, m.id ?? l)) }) : _(
+  return o ? /* @__PURE__ */ f(x, { children: i.viewLoading?.() ?? /* @__PURE__ */ f(ae, { size: "small" }) }) : d ? /* @__PURE__ */ f(x, { children: i.viewError?.(d) ?? a.messages.viewError }) : s ? Array.isArray(e) ? /* @__PURE__ */ f(ie, { vertical: !0, children: (Array.isArray(s) ? s : [s]).map((m, l) => /* @__PURE__ */ f("div", { children: y(m) }, m.id ?? l)) }) : y(
     Array.isArray(s) ? s[0] : s
-  ) : /* @__PURE__ */ f(L, { children: i.viewEmpty?.() ?? a.messages.viewEmpty });
-}, Me = T(qt), Ut = ({
+  ) : /* @__PURE__ */ f(x, { children: i.viewEmpty?.() ?? a.messages.viewEmpty });
+}, Ce = C(Bt), Gt = ({
   value: e,
   code: t,
   modeConfig: n,
   viewConfig: r
 }) => {
-  const { client: i, renderers: a, i18n: s } = M(), o = E(
+  const { client: i, renderers: a, i18n: s } = M(), o = R(
     () => n ?? (r ? De(r) : void 0),
     [n, r]
-  ), d = E(
+  ), d = R(
     () => ["api_view", t, e, o?.url, o?.method, o?.data_path],
     [t, e, o?.url, o?.method, o?.data_path]
-  ), c = x(
-    async (u) => o ? kt(
+  ), c = T(
+    async (u) => o ? Rt(
       e,
       o,
       (v) => i.request({ ...v, signal: u })
     ) : [],
     [i, o, e]
-  ), { data: _, isLoading: m, error: l } = Z(d, c, !!(e && o?.url)), p = (u, v, b) => a.link ? a.link({ url: u, label: v, data: b }) : /* @__PURE__ */ f("a", { href: u, target: "_blank", rel: "noreferrer", children: v }), y = (u, v) => {
+  ), { data: y, isLoading: m, error: l } = ee(d, c, !!(e && o?.url)), p = (u, v, _) => a.link ? a.link({ url: u, label: v, data: _ }) : /* @__PURE__ */ f("a", { href: u, target: "_blank", rel: "noreferrer", children: v }), h = (u, v) => {
     if (!o) return null;
-    const b = xe(u, o), w = Le(u, o), h = w ? p(w, b, u) : b;
-    return /* @__PURE__ */ f("div", { children: h }, u.id ?? v);
+    const _ = Te(u, o), w = xe(u, o), b = w ? p(w, _, u) : _;
+    return /* @__PURE__ */ f("div", { children: b }, u.id ?? v);
   };
-  return m ? /* @__PURE__ */ f(L, { children: a.viewLoading?.() ?? /* @__PURE__ */ f(ae, { size: "small" }) }) : l ? /* @__PURE__ */ f(L, { children: a.viewError?.(l) ?? s.messages.viewError }) : _?.length ? o?.result_type === "object" && _.length === 1 ? y(_[0], 0) : /* @__PURE__ */ f(ie, { vertical: !0, children: _.map(y) }) : /* @__PURE__ */ f(L, { children: a.viewEmpty?.() ?? s.messages.viewEmpty });
-}, je = T(Ut);
+  return m ? /* @__PURE__ */ f(x, { children: a.viewLoading?.() ?? /* @__PURE__ */ f(ae, { size: "small" }) }) : l ? /* @__PURE__ */ f(x, { children: a.viewError?.(l) ?? s.messages.viewError }) : y?.length ? o?.result_type === "object" && y.length === 1 ? h(y[0], 0) : /* @__PURE__ */ f(ie, { vertical: !0, children: y.map(h) }) : /* @__PURE__ */ f(x, { children: a.viewEmpty?.() ?? s.messages.viewEmpty });
+}, Me = C(Gt);
 function It(e) {
   return !!(e.option_config && e.is_option_api);
 }
-function Bt(e, t) {
+function Wt(e, t) {
   const n = M(), r = le([
     "viewModeOptions",
     e.map((a) => a.code),
     t
-  ]), { data: i } = Z(
+  ]), { data: i } = ee(
     [r],
     async (a) => {
       const s = {};
       return await Promise.all(
         e.map(async (o) => {
           if (!o.option_config?.url) return;
-          const d = Et(o, t), c = o.option_config.method?.toUpperCase() === "GET" || !o.option_config.method, _ = await n.client.request({
+          const d = Dt(o, t), c = o.option_config.method?.toUpperCase() === "GET" || !o.option_config.method, y = await n.client.request({
             method: o.option_config.method || "GET",
             url: o.option_config.url,
             params: c ? d?.params : void 0,
@@ -1204,7 +1214,7 @@ function Bt(e, t) {
             signal: a
           });
           s[o.code] = {
-            optionList: n.parsers.optionResponse(_.data, o)
+            optionList: n.parsers.optionResponse(y.data, o)
           };
         })
       ), s;
@@ -1213,15 +1223,15 @@ function Bt(e, t) {
   );
   return i ?? {};
 }
-const en = ({
+const nn = ({
   formConfig: e,
   formValues: t
 }) => {
-  const n = e?.form?.field_groups ?? [], r = E(
+  const n = e?.form?.field_groups ?? [], r = R(
     () => n.filter(It),
     [n]
-  ), i = Bt(r, t);
-  return E(() => n.filter((s) => !s.is_hidden).map((s) => {
+  ), i = Wt(r, t);
+  return R(() => n.filter((s) => !s.is_hidden).map((s) => {
     const o = t?.[s.code], d = s.additional_config?.view_value, c = d?.mode;
     if (c === "api" && d)
       return {
@@ -1229,7 +1239,7 @@ const en = ({
         label: s.label,
         rawValue: o,
         viewValue: /* @__PURE__ */ f(
-          je,
+          Me,
           {
             code: s.code,
             value: o,
@@ -1244,7 +1254,7 @@ const en = ({
         label: s.label,
         rawValue: o,
         viewValue: /* @__PURE__ */ f(
-          Me,
+          Ce,
           {
             code: s.code,
             value: o,
@@ -1259,7 +1269,7 @@ const en = ({
         label: s.label,
         rawValue: o,
         viewValue: /* @__PURE__ */ f(
-          Te,
+          Le,
           {
             code: s.code,
             value: o,
@@ -1268,16 +1278,16 @@ const en = ({
         ),
         field_group: s
       };
-    const _ = i[s.code] ?? {};
+    const y = i[s.code] ?? {};
     return {
       key: s.code,
       label: s.label,
       rawValue: o,
-      viewValue: jt(s, o, _),
+      viewValue: Ot(s, o, y),
       field_group: s
     };
   }), [i, n, t]);
-}, Wt = ({
+}, Kt = ({
   code: e,
   value: t,
   fieldGroup: n
@@ -1287,19 +1297,19 @@ const en = ({
     case "raw":
       return t;
     case "api":
-      return /* @__PURE__ */ f(je, { code: e, value: t, viewConfig: r });
+      return /* @__PURE__ */ f(Me, { code: e, value: t, viewConfig: r });
     case "api_ids": {
       const i = r?.api_ids;
-      return /* @__PURE__ */ f(Me, { code: e, value: t, modeConfig: i });
+      return /* @__PURE__ */ f(Ce, { code: e, value: t, modeConfig: i });
     }
     case "api_detail": {
       const i = r?.api_detail;
-      return /* @__PURE__ */ f(Te, { code: e, value: t, modeConfig: i });
+      return /* @__PURE__ */ f(Le, { code: e, value: t, modeConfig: i });
     }
     default:
       return t;
   }
-}, tn = T(Wt), Ve = {
+}, rn = C(Kt), je = {
   submit: "Save",
   submitError: "Failed to submit form",
   inputPlaceholder: (e) => `Enter ${e}`,
@@ -1310,9 +1320,9 @@ const en = ({
   viewLoading: "Loading...",
   viewEmpty: "-",
   viewError: "Failed to load"
-}, nn = {
-  messages: Ve
-}, Gt = (e) => {
+}, an = {
+  messages: je
+}, $t = (e) => {
   if (Array.isArray(e)) return e;
   if (e && typeof e == "object" && "items" in e && Array.isArray(e.items))
     return e.items;
@@ -1321,14 +1331,14 @@ const en = ({
     return Array.isArray(t.items) ? t.items : [];
   }
   return [];
-}, Kt = (e) => ({
+}, zt = (e) => ({
   redirectUrl: e?.redirect_after_create,
   data: e
-}), $t = (e, t) => t?.dataPath ? B(e, t.dataPath) : e, te = {
-  optionResponse: Gt,
-  submitResponse: Kt,
-  viewResponse: $t
-}, zt = (e, t = "_blank") => {
+}), Ht = (e, t) => t?.dataPath ? I(e, t.dataPath) : e, te = {
+  optionResponse: $t,
+  submitResponse: zt,
+  viewResponse: Ht
+}, Yt = (e, t = "_blank") => {
   window.open(e, t);
 }, ne = {
   upload: async () => {
@@ -1336,7 +1346,7 @@ const en = ({
   },
   remove: async () => !1
 };
-function rn({
+function on({
   children: e,
   client: t,
   upload: n,
@@ -1348,37 +1358,37 @@ function rn({
   submitDebounceMs: d = 200,
   redirectHandler: c,
   // legacy props
-  requestClient: _,
+  requestClient: y,
   uploadAdapter: m,
   deleteUploadAdapter: l,
   messages: p,
-  optionResponseParser: y,
+  optionResponseParser: h,
   customFieldRenderers: u
 }) {
-  const v = U(/* @__PURE__ */ new Map()), b = U(/* @__PURE__ */ new Map()), w = E(() => {
-    const h = t ?? {
-      request: _ ?? (() => {
+  const v = B(/* @__PURE__ */ new Map()), _ = B(/* @__PURE__ */ new Map()), w = R(() => {
+    const b = t ?? {
+      request: y ?? (() => {
         throw new Error("DynamicFormProvider requires client or requestClient");
       })
-    }, S = u ? Object.entries(u).map(([F, R]) => ({
-      match: F,
-      render: R
+    }, S = u ? Object.entries(u).map(([k, D]) => ({
+      match: k,
+      render: D
     })) : [], A = {
-      ...Ve,
+      ...je,
       ...r?.messages,
       ...p
     }, g = {
       ...ne,
       ...n,
       upload: n?.upload ?? m ?? ne.upload,
-      remove: n?.remove ?? (l ? (F) => l(F.path) : ne.remove)
+      remove: n?.remove ?? (l ? (k) => l(k.path) : ne.remove)
     };
     return {
-      client: h,
+      client: b,
       upload: g,
       i18n: { messages: A },
       parsers: {
-        optionResponse: i?.optionResponse ?? y ?? te.optionResponse,
+        optionResponse: i?.optionResponse ?? h ?? te.optionResponse,
         submitResponse: i?.submitResponse ?? te.submitResponse,
         viewResponse: i?.viewResponse ?? te.viewResponse
       },
@@ -1392,13 +1402,13 @@ function rn({
         ttlMs: o?.ttlMs ?? 6e4
       },
       submitDebounceMs: d,
-      redirectHandler: c ?? zt,
+      redirectHandler: c ?? Yt,
       optionCache: v.current,
-      viewCache: b.current
+      viewCache: _.current
     };
   }, [
     t,
-    _,
+    y,
     n,
     m,
     l,
@@ -1407,7 +1417,7 @@ function rn({
     i?.optionResponse,
     i?.submitResponse,
     i?.viewResponse,
-    y,
+    h,
     a,
     u,
     s,
@@ -1418,7 +1428,7 @@ function rn({
   ]);
   return /* @__PURE__ */ f(oe.Provider, { value: w, children: e });
 }
-function an(e) {
+function sn(e) {
   return {
     request: async (t) => ({ data: (await e({
       method: t.method,
@@ -1432,55 +1442,55 @@ function an(e) {
   };
 }
 export {
-  Te as ApiDetailItem,
-  Me as ApiItem,
-  je as ApiViewItem,
-  vt as DefaultLayout,
-  St as DynamicForm,
-  rn as DynamicFormProvider,
-  bt as FormItem,
-  tn as MetaItemValue,
-  Ft as buildApiViewRequests,
+  Le as ApiDetailItem,
+  Ce as ApiItem,
+  Me as ApiViewItem,
+  gt as DefaultLayout,
+  kt as DynamicForm,
+  on as DynamicFormProvider,
+  wt as FormItem,
+  rn as MetaItemValue,
+  Et as buildApiViewRequests,
   le as buildCacheKey,
   re as cachedRequest,
-  an as createAxiosDynamicFormClient,
+  sn as createAxiosDynamicFormClient,
   se as debounce,
-  nn as defaultI18n,
-  Ve as defaultMessages,
-  Gt as defaultOptionResponseParser,
+  an as defaultI18n,
+  je as defaultMessages,
+  $t as defaultOptionResponseParser,
   te as defaultParsers,
-  zt as defaultRedirectHandler,
-  Kt as defaultSubmitResponseParser,
-  $t as defaultViewResponseParser,
-  mt as extractDependencyFields,
+  Yt as defaultRedirectHandler,
+  zt as defaultSubmitResponseParser,
+  Ht as defaultViewResponseParser,
+  pt as extractDependencyFields,
   Pe as extractViewData,
-  kt as fetchApiViewItems,
-  J as fillTemplate,
-  B as getByPath,
-  ct as getCached,
-  xe as getMappedLabel,
-  Le as getMappedLink,
-  I as isEmptyValue,
-  et as mapOptionToSelectItem,
-  tt as mapOptions,
+  Rt as fetchApiViewItems,
+  Q as fillTemplate,
+  I as getByPath,
+  dt as getCached,
+  Te as getMappedLabel,
+  xe as getMappedLink,
+  G as isEmptyValue,
+  tt as mapOptionToSelectItem,
+  nt as mapOptions,
   De as normalizeApiViewConfig,
-  Zt as normalizeMetaForForm,
-  ft as parseFormValues,
-  O as replaceTemplateInObject,
-  Et as resolveApiOptionMeta,
-  Xe as resolveFieldRenderer,
-  Ze as resolveFieldRendererFromMap,
-  jt as resolveFieldViewValue,
+  tn as normalizeMetaForForm,
+  mt as parseFormValues,
+  q as replaceTemplateInObject,
+  Dt as resolveApiOptionMeta,
+  Ze as resolveFieldRenderer,
+  et as resolveFieldRendererFromMap,
+  Ot as resolveFieldViewValue,
   Ae as resolveViewValueConfig,
-  dt as setCache,
-  Z as useCachedViewRequest,
-  pt as useDependencyValues,
-  lt as useDynamicField,
+  ut as setCache,
+  ee as useCachedViewRequest,
+  yt as useDependencyValues,
+  ct as useDynamicField,
   M as useDynamicFormContext,
-  Xt as useDynamicFormContextOptional,
-  ht as useDynamicOptions,
-  wt as useFieldGroups,
-  gt as useFieldStates,
-  At as useProcessedValues,
-  en as useViewMode
+  en as useDynamicFormContextOptional,
+  bt as useDynamicOptions,
+  At as useFieldGroups,
+  St as useFieldStates,
+  Ft as useProcessedValues,
+  nn as useViewMode
 };