@nocobase/client 1.2.2-alpha → 1.2.3-alpha

package/es/index.mjs

@@ -3902,7 +3902,7 @@ function addAppVersion(e, t) {
       addAppVersion((n = e.properties) == null ? void 0 : n[o], t);
     }), e;
 }
-const name = "@nocobase/client", version$1 = "1.2.2-alpha", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
+const name = "@nocobase/client", version$1 = "1.2.3-alpha", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
   "@ahooksjs/use-url-state": "3.5.1",
   "@ant-design/cssinjs": "^1.11.1",
   "@ant-design/icons": "^5.1.4",
@@ -3923,9 +3923,9 @@ const name = "@nocobase/client", version$1 = "1.2.2-alpha", license = "AGPL-3.0"
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "1.2.2-alpha",
-  "@nocobase/sdk": "1.2.2-alpha",
-  "@nocobase/utils": "1.2.2-alpha",
+  "@nocobase/evaluators": "1.2.3-alpha",
+  "@nocobase/sdk": "1.2.3-alpha",
+  "@nocobase/utils": "1.2.3-alpha",
   ahooks: "^3.7.2",
   antd: "^5.12.8",
   "antd-style": "3.4.5",
@@ -11257,53 +11257,68 @@ const ColDivider = (e) => {
   return useMemo(() => e.reduceProperties((t, o) => (o["x-component"] === "Grid.Col" && !o["x-hidden"] && t.push(o), t), []), [Object.keys(e.properties || {}).join(",")]);
 }, DndWrapper = (e) => e.dndContext === !1 ? /* @__PURE__ */ jsx(Fragment, { children: e.children }) : /* @__PURE__ */ jsx(DndContext, F(g({}, e.dndContext), { children: e.children })), useGridContext = () => useContext(GridContext), useGridRowContext = () => useContext(GridRowContext), Grid = observer$1(
   (e) => {
-    const { distributed: t, showDivider: o = !0 } = e, n = useRef(null), r = useField(), i = useFieldSchema(), { render: a } = useSchemaInitializerRender(i["x-initializer"], i["x-initializer-props"]), l = useCallback((x) => a(x), []), c = r.address.toString(), u = useRowProperties(), { setPrintContent: d } = useFormBlockContext(), { styles: p } = useStyles$j(), m = t === void 0 ? (i == null ? void 0 : i.parent["x-component"]) === "Page" || (i == null ? void 0 : i.parent["x-component"]) === "Tabs.TabPane" : t;
+    const { distributed: t, showDivider: o = !0 } = e, n = useRef(null), r = useField(), i = useFieldSchema(), { render: a } = useSchemaInitializerRender(i["x-initializer"], i["x-initializer-props"]), l = useCallback((C) => a(C), []), c = r.address.toString(), u = useRowProperties(), { setPrintContent: d } = useFormBlockContext(), { styles: p } = useStyles$j(), { token: m } = theme.useToken(), { designable: h } = useDesignable(), x = t === void 0 ? (i == null ? void 0 : i.parent["x-component"]) === "Page" || (i == null ? void 0 : i.parent["x-component"]) === "Tabs.TabPane" : t;
     useEffect(() => {
       n.current && (d == null || d(n.current));
     }, [n.current]);
-    const h = useMemo(() => ({
+    const f = useMemo(() => ({
       ref: n,
       fieldSchema: i,
       renderSchemaInitializer: a,
       InitializerComponent: l,
       showDivider: o
     }), [i, a, l, o]);
-    return /* @__PURE__ */ jsx(FilterBlockProvider, { children: /* @__PURE__ */ jsx(GridContext.Provider, { value: h, children: /* @__PURE__ */ jsx("div", { className: `nb-grid ${p.container}`, style: { position: "relative" }, ref: n, children: /* @__PURE__ */ jsxs("div", { className: "nb-grid-warp", children: [
-      /* @__PURE__ */ jsxs(DndWrapper, { dndContext: e.dndContext, children: [
-        o ? /* @__PURE__ */ jsx(
-          RowDivider,
-          {
-            rows: u,
-            first: !0,
-            id: `${c}_0`,
-            data: {
-              breakRemoveOn: breakRemoveOnGrid,
-              wrapSchema: wrapRowSchema,
-              insertAdjacent: "afterBegin",
-              schema: i
-            }
-          }
-        ) : null,
-        u.map((x, f) => /* @__PURE__ */ jsxs(React.Fragment, { children: [
-          m ? /* @__PURE__ */ jsx(SchemaComponent, { name: x.name, schema: x, distributed: !0 }) : /* @__PURE__ */ jsx(MemorizedRecursionField, { name: x.name, schema: x }),
-          o ? /* @__PURE__ */ jsx(
-            RowDivider,
-            {
-              rows: u,
-              index: f,
-              id: `${c}_${f + 1}`,
-              data: {
-                breakRemoveOn: breakRemoveOnGrid,
-                wrapSchema: wrapRowSchema,
-                insertAdjacent: "afterEnd",
-                schema: x
+    return /* @__PURE__ */ jsx(FilterBlockProvider, { children: /* @__PURE__ */ jsx(GridContext.Provider, { value: f, children: /* @__PURE__ */ jsx(
+      "div",
+      {
+        className: cls(
+          `nb-grid ${p.container}`,
+          css`
+                & {
+                  margin-bottom: ${h ? 0 : -m.marginLG}px;
+                }
+              `
+        ),
+        style: { position: "relative" },
+        ref: n,
+        children: /* @__PURE__ */ jsxs("div", { className: "nb-grid-warp", children: [
+          /* @__PURE__ */ jsxs(DndWrapper, { dndContext: e.dndContext, children: [
+            o ? /* @__PURE__ */ jsx(
+              RowDivider,
+              {
+                rows: u,
+                first: !0,
+                id: `${c}_0`,
+                data: {
+                  breakRemoveOn: breakRemoveOnGrid,
+                  wrapSchema: wrapRowSchema,
+                  insertAdjacent: "afterBegin",
+                  schema: i
+                }
               }
-            }
-          ) : null
-        ] }, f))
-      ] }),
-      a()
-    ] }) }) }) });
+            ) : null,
+            u.map((C, S) => /* @__PURE__ */ jsxs(React.Fragment, { children: [
+              x ? /* @__PURE__ */ jsx(SchemaComponent, { name: C.name, schema: C, distributed: !0 }) : /* @__PURE__ */ jsx(MemorizedRecursionField, { name: C.name, schema: C }),
+              o ? /* @__PURE__ */ jsx(
+                RowDivider,
+                {
+                  rows: u,
+                  index: S,
+                  id: `${c}_${S + 1}`,
+                  data: {
+                    breakRemoveOn: breakRemoveOnGrid,
+                    wrapSchema: wrapRowSchema,
+                    insertAdjacent: "afterEnd",
+                    schema: C
+                  }
+                }
+              ) : null
+            ] }, S))
+          ] }),
+          a()
+        ] })
+      }
+    ) }) });
   },
   { displayName: "Grid" }
 );
@@ -12503,29 +12518,11 @@ const useStyles$i = createStyles(({ css: e, token: t }) => e`
     }
   `), BlockItem = withDynamicSchemaProps(
   (e) => {
-    const { className: t, children: o } = useProps(e), { styles: n } = useStyles$i(), r = useFieldSchema(), { render: i } = useSchemaToolbarRender(r), { getAriaLabel: a } = useGetAriaLabelOfBlockItem(e.name), { token: l } = theme.useToken(), { designable: c } = useDesignable(), u = useMemo(() => a(), [a]);
-    return /* @__PURE__ */ jsxs(
-      SortableItem,
-      {
-        role: "button",
-        "aria-label": u,
-        className: cls(
-          "nb-block-item",
-          t,
-          n,
-          css`
-            margin-bottom: ${c ? l.marginLG : 0}px !important;
-            .ant-card {
-              margin-bottom: ${c ? l.marginLG : 0}px !important;
-            }
-          `
-        ),
-        children: [
-          i(),
-          /* @__PURE__ */ jsx(ErrorBoundary, { FallbackComponent: ErrorFallback, onError: (d) => console.log(d), children: o })
-        ]
-      }
-    );
+    const { className: t, children: o } = useProps(e), { styles: n } = useStyles$i(), r = useFieldSchema(), { render: i } = useSchemaToolbarRender(r), { getAriaLabel: a } = useGetAriaLabelOfBlockItem(e.name), l = useMemo(() => a(), [a]);
+    return /* @__PURE__ */ jsxs(SortableItem, { role: "button", "aria-label": l, className: cls("nb-block-item", t, n), children: [
+      i(),
+      /* @__PURE__ */ jsx(ErrorBoundary, { FallbackComponent: ErrorFallback, onError: (c) => console.log(c), children: o })
+    ] });
   },
   { displayName: "BlockItem" }
 ), TestDesigner = () => {
@@ -36455,7 +36452,7 @@ const MarkdownEditor = (e) => {
       "div",
       {
         className: cls([o, n, "nb-markdown nb-markdown-default nb-markdown-table", i]),
-        style: F(g({}, e.style), { height: y || "100%", overflow: "auto" }),
+        style: F(g({}, e.style), { height: y || "100%" }),
         dangerouslySetInnerHTML: { __html: h }
       }
     );