v0.6.13

dist/button.js

@@ -1,4 +1,4 @@
-import { ah as s, ag as u, ai as e } from "./common/main-D5FjEFNr.js";
+import { ah as s, ag as u, ai as e } from "./common/main-Y0jvzCNv.js";
 export {
   s as auth,
   u as default,

dist/common/main-Y0jvzCNv.js

@@ -494,16 +494,16 @@ const fn = xt.getInstance(), jt = S.forwardRef(({ listCode: e, base62params: t,
     return p.over([p.partialRight(p.pick, P), p.partialRight(p.omit, P)]);
   }, [t == null ? void 0 : t.extras]), [k, x] = C(m);
   return u(e, { ...x, value: f, rawValue: b, $setting: Object.assign({}, o, k) });
-}, wn = ({ theme: e, items: t = [{ key: "default", label: "默认" }], fields: n = [], itemRender: a, chunks: i = [], widgetSetting: r = {}, children: o }) => {
-  const [s, l] = A();
+}, wn = ({ theme: e, basicForm: t, items: n = [{ key: "default", label: "默认" }], fields: a = [], itemRender: i, chunks: r = [], widgetSetting: o = {}, children: s }) => {
+  const [l, g] = A();
   V(() => {
-    e ? ae.getWidgetComponent(e).then((c) => {
-      if (!(c != null && c.default)) throw "not found";
-      return c;
-    }).catch((c) => ({ default: () => `${e} ${c}` })).then((c) => l(S.createElement(c.default, {}))) : l(null);
+    e ? ae.getWidgetComponent(e).then((d) => {
+      if (!(d != null && d.default)) throw "not found";
+      return d;
+    }).catch((d) => ({ default: () => `${e} ${d}` })).then((d) => g(S.createElement(d.default, {}))) : g(null);
   }, [e]);
-  const g = W(() => t == null ? void 0 : t.map((c) => ({ ...c, children: a(c, n == null ? void 0 : n.filter((d) => !(d != null && d.group) && c.key == "default" || d.group == c.key), c.key == "default" ? o : null) })).concat(i), [t, o, i]);
-  return s && S.cloneElement(s, { items: g, basicForm, $setting: r });
+  const c = W(() => n == null ? void 0 : n.map((d) => ({ ...d, children: i(d, a == null ? void 0 : a.filter((h) => !(h != null && h.group) && d.key == "default" || h.group == d.key), d.key == "default" ? s : null) })).concat(r), [n, s, r]);
+  return l && S.cloneElement(l, { items: c, basicForm: t, $setting: o });
 }, bn = ({ name: e, form: t = null, basicForm: n = null, style: a = {}, className: i, cols: r = 12, rowHeight: o = 21, containerPadding: s = [0, 0], itemMargin: l = [4, 0], formProps: g = {}, formFields: c = [], fields: d = [], data: h, theme: m, themeProps: f = {}, children: b, ...C }) => {
   const [k] = Z.useForm(t), x = W(() => [{ name: "__PROPS__", value: g }].concat(c), [g, c]);
   He(() => (k.setFieldsValue(h), () => k.resetFields()), [h]);
@@ -511,7 +511,7 @@ const fn = xt.getInstance(), jt = S.forwardRef(({ listCode: e, base62params: t,
     const I = Ot(F, Ra, n);
     return E("div", { className: R("ff-grid-layout", i), style: { ...a, "--grid-layout-item-margin-y": `${(l == null ? void 0 : l[0]) || 0}px`, "--grid-layout-item-margin-x": `${(l == null ? void 0 : l[1]) || 0}px`, "--grid-layout-container-padding-y": `${(s == null ? void 0 : s[0]) || 0}px`, "--grid-layout-container-padding-x": `${(s == null ? void 0 : s[1]) || 0}px`, "--grid-layout-cols": r, "--grid-layout-row-height": `${o}px` }, children: [I, B && S.cloneElement(B, { cols: r, rowHeight: o, itemMargin: l, containerPadding: s, fields: F, basicForm: n })] });
   };
-  return u(Z, { ...C, fields: x, form: k, component: !1, children: m ? u(wn, { ...f, theme: m, itemRender: P, fields: d, children: b }) : P(0, b) });
+  return u(Z, { ...C, fields: x, form: k, component: !1, children: m ? u(wn, { ...f, theme: m, itemRender: P, fields: d, children: b, basicForm: n }) : P(0, d, b) });
 }, Ai = /* @__PURE__ */ ((e) => function({ code: t, data: n, ...a }) {
   const { uuid: i, resource: r, items: o, hides: s, rowHeight: l, marginX: g, marginY: c, cols: d, theme: h, themeProps: m } = Ta(t), f = W(() => [{ name: "__RESOURCE__", value: r }, { name: "__LAYOUT_KEY__", value: t }, { name: "__LAYOUT_UUID__", value: i }], [t, i, r]);
   return r && u(e, { name: t, theme: h, themeProps: m, ...a, fields: o, formFields: f, rowHeight: l, cols: d, itemMargin: [g, c], data: r ? { [r]: n } : n });
@@ -809,7 +809,7 @@ const xe = vt.getInstance(), ct = () => {
     const _ = Ot(z, At, n);
     return E("div", { className: R("ff-grid-layout-form", i), style: { ...a, "--grid-layout-item-margin-x": `${(s == null ? void 0 : s[0]) ?? 8}px`, "--grid-layout-item-margin-y": `${(s == null ? void 0 : s[1]) ?? 16}px`, "--grid-layout-container-padding-y": `${(l == null ? void 0 : l[0]) || 0}px`, "--grid-layout-container-padding-x": `${(l == null ? void 0 : l[1]) || 0}px`, "--grid-layout-cols": r, "--grid-layout-row-height": `${o}px` }, children: [_, T && S.cloneElement(T, { cols: r, rowHeight: o, itemMargin: s, containerPadding: l, fields: z, basicForm: n })] });
   };
-  return E(Z, { ...O, form: F, fields: I, onValuesChange: B, children: [k ? u(wn, { ...x, theme: k, itemRender: M, fields: g, children: P }) : M(0, P), c == null ? void 0 : c.map(($) => {
+  return E(Z, { ...O, form: F, fields: I, onValuesChange: B, children: [k ? u(wn, { ...x, theme: k, itemRender: M, fields: g, children: P, basicForm: n }) : M(0, g, P), c == null ? void 0 : c.map(($) => {
     var z;
     return u(Ft, { name: $.code, children: u(Ua, { form: F, basicForm: n, name: $.code, type: $.type, initialValue: $.initialValue, initialValueLanguage: (z = $.extras) == null ? void 0 : z.initialValueLanguage }) }, JSON.stringify($.code));
   })] });

dist/components.js

@@ -1,4 +1,4 @@
-import { ao as p, af as s, ap as n, aq as t, an as d } from "./common/main-D5FjEFNr.js";
+import { ao as p, af as s, ap as n, aq as t, an as d } from "./common/main-Y0jvzCNv.js";
 export {
   p as Empty,
   s as Icon,

dist/container.js

@@ -1,4 +1,4 @@
-import { ak as e, ao as s, ap as p, aq as n, al as t, an as d, am as r, aj as u } from "./common/main-D5FjEFNr.js";
+import { ak as e, ao as s, ap as p, aq as n, al as t, an as d, am as r, aj as u } from "./common/main-Y0jvzCNv.js";
 export {
   e as Context,
   s as Empty,

dist/data-converter.js

@@ -1,6 +1,6 @@
 import "lodash";
 import "react";
-import { D as p } from "./common/main-D5FjEFNr.js";
+import { D as p } from "./common/main-Y0jvzCNv.js";
 export {
   p as default
 };

dist/data-list.js

@@ -1,4 +1,4 @@
-import { J as t, F as e, z as r, C as o, K as i, E as l, B as u, I as D, A as n, L, y as C, N as m, M as p, U as b, P as c, S as F, Q as d, T as O, O as S } from "./common/main-D5FjEFNr.js";
+import { J as t, F as e, z as r, C as o, K as i, E as l, B as u, I as D, A as n, L, y as C, N as m, M as p, U as b, P as c, S as F, Q as d, T as O, O as S } from "./common/main-Y0jvzCNv.js";
 export {
   t as DataListContent,
   e as DataListContext,

dist/data-list/utils.js

@@ -1,5 +1,5 @@
 import "lodash";
-import { n as a } from "../common/main-D5FjEFNr.js";
+import { n as a } from "../common/main-Y0jvzCNv.js";
 export {
   a as getDefaultExpandRowKeys
 };

dist/grid-layout-form.js

@@ -1,4 +1,4 @@
-import { a5 as s, a7 as r, a6 as u, a4 as o, x as t, ac as m, aa as d, ab as F, ae as i, a9 as c, a8 as g, ad as l } from "./common/main-D5FjEFNr.js";
+import { a5 as s, a7 as r, a6 as u, a4 as o, x as t, ac as m, aa as d, ab as F, ae as i, a9 as c, a8 as g, ad as l } from "./common/main-Y0jvzCNv.js";
 export {
   s as GridLayoutForm,
   r as GridLayoutFormHelper,

dist/grid-layout-form/utils.js

@@ -1,5 +1,5 @@
 import "lodash";
-import { a as o, g } from "../common/main-D5FjEFNr.js";
+import { a as o, g } from "../common/main-Y0jvzCNv.js";
 export {
   o as getNormalizeWidget,
   g as getOptionItemByValue

dist/grid-layout.js

@@ -1,4 +1,4 @@
-import { o as u, q as e, p as r, H as t, G as d, v as o, x as i, w as G, s as y } from "./common/main-D5FjEFNr.js";
+import { o as u, q as e, p as r, H as t, G as d, v as o, x as i, w as G, s as y } from "./common/main-Y0jvzCNv.js";
 export {
   u as GridLayout,
   e as GridLayoutFramework,

dist/grid-layout/utils.js

@@ -1,4 +1,4 @@
-import { j as a, l, k as o } from "../common/main-D5FjEFNr.js";
+import { j as a, l, k as o } from "../common/main-Y0jvzCNv.js";
 export {
   a as getBoxStyle,
   l as getNormalizeFields,

dist/hooks.js

@@ -1,7 +1,7 @@
 import "lodash";
 import "rc-field-form";
 import "react";
-import { a1 as r, a0 as o, a2 as p, _ as f, $ as i, a3 as m, Z as c } from "./common/main-D5FjEFNr.js";
+import { a1 as r, a0 as o, a2 as p, _ as f, $ as i, a3 as m, Z as c } from "./common/main-Y0jvzCNv.js";
 import { default as b } from "rc-util/lib/hooks/useMergedState";
 export {
   r as useDeepEffect,

dist/iconfont.js

@@ -2,7 +2,7 @@ import "react/jsx-runtime";
 import "react";
 import "prop-types";
 import "classnames";
-import { af as a } from "./common/main-D5FjEFNr.js";
+import { af as a } from "./common/main-Y0jvzCNv.js";
 export {
   a as default
 };

dist/index.js

@@ -1,4 +1,4 @@
-import { az as t, aA as e, av as o, aw as n, ar as p, ax as r, au as c, at as u, as as f, ay as l } from "./common/main-D5FjEFNr.js";
+import { az as t, aA as e, av as o, aw as n, ar as p, ax as r, au as c, at as u, as as f, ay as l } from "./common/main-Y0jvzCNv.js";
 export {
   t as AppContext,
   e as AppGlobalParamsContext,

dist/pages.js

@@ -1,4 +1,4 @@
-import { W as t, V as e, X as o, Y as g } from "./common/main-D5FjEFNr.js";
+import { W as t, V as e, X as o, Y as g } from "./common/main-Y0jvzCNv.js";
 export {
   t as CustomPage,
   e as DataListPage,

dist/res-ws.js

@@ -1,5 +1,5 @@
 import "lodash";
-import { R as a } from "./common/main-D5FjEFNr.js";
+import { R as a } from "./common/main-Y0jvzCNv.js";
 export {
   a as default
 };

dist/utils.js

@@ -1,5 +1,5 @@
 import "lodash";
-import { d as r, f as i, e as g, h as m, b as o, c as p, i as P, m as d, r as k, t as u, u as h } from "./common/main-D5FjEFNr.js";
+import { d as r, f as i, e as g, h as m, b as o, c as p, i as P, m as d, r as k, t as u, u as h } from "./common/main-Y0jvzCNv.js";
 import "./common/vender-FNiQWFaA.js";
 export {
   r as deepSome,

package.json

@@ -1,7 +1,7 @@
 {
   "name": "ff",
   "private": true,
-  "version": "0.6.12",
+  "version": "0.6.13",
   "author": "www.fsdpf.com",
   "type": "module",
   "main": "./dist/index.js",