@nocobase/client 2.0.46 → 2.0.47

package/es/index.mjs

@@ -106,7 +106,7 @@ import { evaluators } from "@nocobase/evaluators/client";
 import * as formilyAntdV5 from "@formily/antd-v5";
 import { FormLayout, ArrayCollapse as ArrayCollapse$2, ArrayItems, ArrayBase, TreeSelect as TreeSelect$1, Input as Input$4, FormItem as FormItem$1, useFormLayout, ArrayTable, NumberPicker, Select as Select$2, FormButtonGroup } from "@formily/antd-v5";
 import * as nocobaseFlowEngine from "@nocobase/flow-engine";
-import { observer, useFlowEngine, createCollectionContextMeta, useFlowEngineContext, FlowEngine, FlowEngineProvider, FlowEngineGlobalsContextProvider, useFlowContext, FlowContextSelector, defineAction, tExpr, useFlowViewContext, parseValueToPath, VariableInput as VariableInput$1, createEphemeralContext, setupRunJSContexts, getRunJSDocFor, listSnippetsForContext, prepareRunJsCode, JSRunner, createSafeNavigator, createSafeWindow, createSafeDocument, shouldPreprocessRunJSTemplates, FlowContext, getRunJSScenesForContext, isRunJSValue, normalizeRunJSValue, useFlowModel, FlowModel, buildSubModelItems, buildSubModelItem, DisplayItemModel, FilterItem as FilterItem$2, FilterGroup as FilterGroup$3, EMPTY_COLUMN_UID, DragHandler as DragHandler$1, findModelUidPosition, buildLayoutSnapshot, getSlotKey, simulateLayoutForSlot, resolveDropIntent, DndProvider, Droppable, MemoFlowModelRenderer, AddSubModelButton, FlowSettingsButton, MultiRecordResource, getPageActive, VIEW_ACTIVATED_EVENT, getEmitterViewActivatedVersion, DATA_SOURCE_DIRTY_EVENT, parsePathnameToViewParams, FlowModelRenderer, observable as observable$1, defineFlow, useFlowModelById, reaction as reaction$1, ViewNavigation, EditableItemModel, FilterableItemModel, isCtxDateExpression, parseCtxDateExpression, isVariableExpression, serializeCtxDateValue, useFlowSettingsContext, pruneFilter, MobilePopup, resolveRunJSObjectValues, SingleRecordResource, escapeT, extractUsedVariablePaths, extractUsedVariablePathsFromRunJS, runjsWithSafeGlobals, createAssociationAwareObjectMetaFactory, createAssociationSubpathResolver, createCurrentRecordMetaFactory, createRecordResolveOnServerWithLocal, FormItem as FormItem$2, FieldModelRenderer, ModelRenderMode, buildWrapperFieldChildren, useFlowModelContext, FlowsFloatContextMenu, FlowModelProvider, FlowErrorFallback, createRecordMetaFactory, CollectionField as CollectionField$2, FlowModelContext, ElementProxy, autorun as autorun$1, largeField, FlowExitAllException, ActionScene, jioToJoiSchema, FlowRuntimeContext, extractPropertyPath, VariableTag, FlowStepContext, untracked as untracked$1, isBeforeRenderFlow, shouldHideEventInSettings, GLOBAL_EMBED_CONTAINER_ID, EMBED_REPLACING_DATA_KEY } from "@nocobase/flow-engine";
+import { observer, useFlowEngine, createCollectionContextMeta, useFlowEngineContext, FlowEngine, FlowEngineProvider, FlowEngineGlobalsContextProvider, useFlowContext, FlowContextSelector, defineAction, tExpr, useFlowViewContext, parseValueToPath, VariableInput as VariableInput$1, createEphemeralContext, setupRunJSContexts, getRunJSDocFor, listSnippetsForContext, prepareRunJsCode, JSRunner, createSafeNavigator, createSafeWindow, createSafeDocument, shouldPreprocessRunJSTemplates, FlowContext, getRunJSScenesForContext, isRunJSValue, normalizeRunJSValue, useFlowModel, FlowModel, buildSubModelItems, buildSubModelItem, DisplayItemModel, FilterItem as FilterItem$2, FilterGroup as FilterGroup$3, EMPTY_COLUMN_UID, normalizeGridLayout, DragHandler as DragHandler$1, projectLayoutToLegacyRows, findModelUidLayoutPosition, buildLayoutSnapshot, resolveDropIntent, getSlotKey, simulateLayoutForSlot, isSameGridLayout, DndProvider, Droppable, MemoFlowModelRenderer, AddSubModelButton, FlowSettingsButton, MultiRecordResource, getPageActive, VIEW_ACTIVATED_EVENT, getEmitterViewActivatedVersion, DATA_SOURCE_DIRTY_EVENT, parsePathnameToViewParams, FlowModelRenderer, observable as observable$1, defineFlow, useFlowModelById, reaction as reaction$1, ViewNavigation, EditableItemModel, FilterableItemModel, isCtxDateExpression, parseCtxDateExpression, isVariableExpression, serializeCtxDateValue, pruneFilter, useFlowSettingsContext, MobilePopup, resolveRunJSObjectValues, SingleRecordResource, escapeT, extractUsedVariablePaths, extractUsedVariablePathsFromRunJS, runjsWithSafeGlobals, createAssociationAwareObjectMetaFactory, createAssociationSubpathResolver, createCurrentRecordMetaFactory, createRecordResolveOnServerWithLocal, FormItem as FormItem$2, FieldModelRenderer, ModelRenderMode, buildWrapperFieldChildren, useFlowModelContext, FlowsFloatContextMenu, FlowModelProvider, FlowErrorFallback, createRecordMetaFactory, CollectionField as CollectionField$2, FlowModelContext, ElementProxy, autorun as autorun$1, largeField, FlowExitAllException, ActionScene, jioToJoiSchema, FlowRuntimeContext, extractPropertyPath, VariableTag, FlowStepContext, untracked as untracked$1, isBeforeRenderFlow, shouldHideEventInSettings, GLOBAL_EMBED_CONTAINER_ID, EMBED_REPLACING_DATA_KEY } from "@nocobase/flow-engine";
 import { FieldModelRenderer as Hn } from "@nocobase/flow-engine";
 import ignore from "ignore";
 import cronstrue from "cronstrue";
@@ -9991,7 +9991,7 @@ function addAppVersion(e, t) {
       addAppVersion((n = e.properties) == null ? void 0 : n[o], t);
     }), e;
 }
-const name = "@nocobase/client", version = "2.0.46", license = "Apache-2.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
+const name = "@nocobase/client", version = "2.0.47", license = "Apache-2.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.6.1",
@@ -10014,10 +10014,10 @@ const name = "@nocobase/client", version = "2.0.46", license = "Apache-2.0", mai
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "2.0.46",
-  "@nocobase/flow-engine": "2.0.46",
-  "@nocobase/sdk": "2.0.46",
-  "@nocobase/utils": "2.0.46",
+  "@nocobase/evaluators": "2.0.47",
+  "@nocobase/flow-engine": "2.0.47",
+  "@nocobase/sdk": "2.0.47",
+  "@nocobase/utils": "2.0.47",
   "@tanstack/react-table": "^8.21.3",
   "@types/tabulator-tables": "^6.2.6",
   "acorn-jsx": "^5.3.2",
@@ -30659,7 +30659,7 @@ const useStyles$a = genStyleHook("nb-markdown", (e, { isDarkTheme: t }) => {
     }, t ? i : r)
   };
 }), parseMarkdown$1 = _.memoize((e) => L(void 0, null, function* () {
-  return e && (yield import("./md-oH2RssNY.mjs")).default.render(e);
+  return e && (yield import("./md-BbvRKckr.mjs")).default.render(e);
 }));
 function useParseMarkdown$1(e) {
   const [t, o] = useState(""), [n, r] = useState(!0);
@@ -71340,52 +71340,83 @@ class FilterManager {
     });
   }
 }
-function Grid({ rows: e, sizes: t = {}, renderItem: o, rowGap: n = 16, colGap: r = 16, dragOverlayRect: i }) {
-  return Object.keys(e || {}).length === 0 ? /* @__PURE__ */ jsx("div", { style: { position: "relative" }, "data-grid-empty-container": !0, children: i && /* @__PURE__ */ jsx(GridDragOverlay, { rect: i }) }) : /* @__PURE__ */ jsxs("div", { style: { position: "relative", display: "flex", flexDirection: "column", gap: n }, children: [
-    i && /* @__PURE__ */ jsx(GridDragOverlay, { rect: i }),
-    Object.entries(e).map(([a, l]) => {
-      const c = l.length, u = t[a] || [], d = u.some((m) => m != null && m !== void 0), p = l.map((m, h) => {
-        var g;
-        if (d) {
-          const f = u.reduce((S, C) => S + (C || 0), 0), y = c - u.filter(Boolean).length, b = y > 0 ? (24 - f) / y : 0;
-          return (g = u[h]) != null ? g : b;
-        } else
-          return 24 / c;
-      });
-      return /* @__PURE__ */ jsx(Row, { gutter: r, "data-grid-row-id": a, children: l.map((m, h) => /* @__PURE__ */ jsx(
-        GridColumn,
-        {
-          rowKey: a,
-          columnIndex: h,
-          span: p[h],
-          rowGap: n,
-          cell: m,
-          renderItem: o
-        },
-        `${a}:${m.join("|") || "empty"}`
-      )) }, a);
-    })
-  ] });
+function Grid({
+  rows: e = {},
+  sizes: t = {},
+  layout: o,
+  renderItem: n,
+  rowGap: r = 16,
+  colGap: i = 16,
+  dragOverlayRect: a
+}) {
+  const l = o || normalizeGridLayout({ rows: e, sizes: t });
+  return l.rows.length ? /* @__PURE__ */ jsxs("div", { style: { position: "relative", display: "flex", flexDirection: "column", gap: r }, "data-grid-root": !0, children: [
+    a && /* @__PURE__ */ jsx(GridDragOverlay, { rect: a }),
+    /* @__PURE__ */ jsx(GridRows, { rows: l.rows, renderItem: n, rowGap: r, colGap: i, parentPath: [] })
+  ] }) : /* @__PURE__ */ jsx("div", { style: { position: "relative" }, "data-grid-root": !0, "data-grid-empty-container": !0, children: a && /* @__PURE__ */ jsx(GridDragOverlay, { rect: a }) });
+}
+function GridRows({ rows: e, renderItem: t, rowGap: o, colGap: n, parentPath: r }) {
+  return /* @__PURE__ */ jsx(Fragment$1, { children: e.map((i) => {
+    const a = i.cells.length, l = i.sizes || [], c = l.some((p) => p != null && p !== void 0), u = [...r, { rowId: i.id }], d = i.cells.map((p, m) => {
+      var h;
+      if (c) {
+        const g = l.reduce((b, S) => b + (S || 0), 0), f = a - l.filter(Boolean).length, y = f > 0 ? (24 - g) / f : 0;
+        return (h = l[m]) != null ? h : y;
+      } else
+        return 24 / a;
+    });
+    return /* @__PURE__ */ jsx(Row, { gutter: n, "data-grid-row-id": i.id, "data-grid-path": JSON.stringify(u), children: i.cells.map((p, m) => /* @__PURE__ */ jsx(
+      GridColumn,
+      {
+        rowKey: i.id,
+        columnIndex: m,
+        span: d[m],
+        rowGap: o,
+        colGap: n,
+        cell: p,
+        path: [...u.slice(0, -1), { rowId: i.id, cellId: p.id }],
+        renderItem: t
+      },
+      p.id
+    )) }, i.id);
+  }) });
 }
 const GridColumn = React.memo(function e({
   rowKey: t,
   columnIndex: o,
   span: n,
   rowGap: r,
-  cell: i,
-  renderItem: a
+  colGap: i,
+  cell: a,
+  path: l,
+  renderItem: c
 }) {
-  return /* @__PURE__ */ jsx(Col, { span: n, "data-grid-column-row-id": t, "data-grid-column-index": o, children: /* @__PURE__ */ jsx("div", { style: { display: "flex", flexDirection: "column", gap: r }, children: i.map((l, c) => l === EMPTY_COLUMN_UID ? null : /* @__PURE__ */ jsx(
-    "div",
+  var d;
+  const u = a.items || [];
+  return /* @__PURE__ */ jsx(
+    Col,
     {
-      "data-grid-item-row-id": t,
+      span: n,
+      "data-grid-column-row-id": t,
       "data-grid-column-index": o,
-      "data-grid-item-index": c,
-      "data-grid-item-uid": l,
-      children: a(l)
-    },
-    l
-  )) }) });
+      "data-grid-path": JSON.stringify(l),
+      children: /* @__PURE__ */ jsxs("div", { style: { display: "flex", flexDirection: "column", gap: r }, children: [
+        u.map((p, m) => p === EMPTY_COLUMN_UID ? null : /* @__PURE__ */ jsx(
+          "div",
+          {
+            "data-grid-item-row-id": t,
+            "data-grid-column-index": o,
+            "data-grid-item-index": m,
+            "data-grid-item-uid": p,
+            "data-grid-path": JSON.stringify(l),
+            children: c(p)
+          },
+          p
+        )),
+        (d = a.rows) != null && d.length ? /* @__PURE__ */ jsx(GridRows, { rows: a.rows, renderItem: c, rowGap: r, colGap: i, parentPath: l }) : null
+      ] })
+    }
+  );
 });
 GridColumn.displayName = "GridColumn";
 function GridDragOverlay({ rect: e }) {
@@ -71419,6 +71450,10 @@ function GridDragOverlay({ rect: e }) {
     "empty-column": {
       border: "2px dashed var(--colorPrimary)",
       backgroundColor: "rgba(22, 119, 255, 0.04)"
+    },
+    "item-edge": {
+      border: "2px solid var(--colorPrimary)",
+      backgroundColor: "rgba(22, 119, 255, 0.12)"
     }
   };
   return /* @__PURE__ */ jsx("div", { style: x(x({}, t), o[e.type]) });
@@ -71484,6 +71519,25 @@ class GridModel extends FlowModel {
     ]);
     R(this, "dragState");
     R(this, "_memoItemFlowSettings");
+    R(this, "updateDragPointerPosition", (o) => {
+      if (!this.dragState)
+        return;
+      const n = getClientPoint(o);
+      n && (this.dragState.pointerPosition = n);
+    });
+    R(this, "handleDragScroll", () => {
+      this.dragState && this.scheduleSnapshotRefresh();
+    });
+  }
+  bindDragDocumentListeners() {
+    var a;
+    const o = ((a = this.getDragContainer()) == null ? void 0 : a.ownerDocument) || (typeof document == "undefined" ? null : document);
+    if (!o)
+      return;
+    const n = { capture: !0, passive: !0 }, r = { capture: !0 }, i = o.defaultView;
+    return o.addEventListener("pointermove", this.updateDragPointerPosition, n), o.addEventListener("mousemove", this.updateDragPointerPosition, n), o.addEventListener("touchmove", this.updateDragPointerPosition, n), o.addEventListener("scroll", this.handleDragScroll, n), i == null || i.addEventListener("scroll", this.handleDragScroll, n), () => {
+      o.removeEventListener("pointermove", this.updateDragPointerPosition, r), o.removeEventListener("mousemove", this.updateDragPointerPosition, r), o.removeEventListener("touchmove", this.updateDragPointerPosition, r), o.removeEventListener("scroll", this.handleDragScroll, r), i == null || i.removeEventListener("scroll", this.handleDragScroll, r);
+    };
   }
   deriveRowOrder(o, n) {
     const r = [], i = /* @__PURE__ */ new Set();
@@ -71512,77 +71566,153 @@ class GridModel extends FlowModel {
   getItemFlowSettings() {
     return this._memoItemFlowSettings || (this._memoItemFlowSettings = x({ showBackground: !1, showDragHandle: !0 }, this.itemFlowSettings)), this._memoItemFlowSettings;
   }
+  getItemUids() {
+    return (this.subModels.items || []).map((o) => o.uid);
+  }
+  normalizeLayoutFromSource(o) {
+    var r, i, a, l, c, u, d, p;
+    const n = this.getStepParams(GRID_FLOW_KEY, GRID_STEP) || {};
+    return normalizeGridLayout({
+      layout: (i = (r = o == null ? void 0 : o.layout) != null ? r : this.props.layout) != null ? i : n.layout,
+      rows: (l = (a = o == null ? void 0 : o.rows) != null ? a : this.props.rows) != null ? l : n.rows,
+      sizes: (u = (c = o == null ? void 0 : o.sizes) != null ? c : this.props.sizes) != null ? u : n.sizes,
+      rowOrder: (p = (d = o == null ? void 0 : o.rowOrder) != null ? d : this.props.rowOrder) != null ? p : n.rowOrder,
+      itemUids: this.getItemUids(),
+      gridUid: this.uid,
+      logger: console
+    });
+  }
+  getGridLayout() {
+    return this.normalizeLayoutFromSource();
+  }
+  syncLayoutProps(o) {
+    const n = projectLayoutToLegacyRows(o);
+    this.setProps("layout", o), this.setProps("rows", n.rows), this.setProps("sizes", n.sizes), this.setProps("rowOrder", n.rowOrder);
+  }
+  setGridStepLayout(o) {
+    this.setStepParams(GRID_FLOW_KEY, {
+      [GRID_STEP]: {
+        layout: o
+      }
+    });
+  }
+  findLayoutRowByPath(o, n) {
+    if (!(n != null && n.length))
+      return null;
+    let r = o.rows;
+    for (let i = 0; i < n.length; i += 1) {
+      const a = n[i], l = r.find((u) => u.id === a.rowId);
+      if (!l)
+        return null;
+      if (i === n.length - 1)
+        return l;
+      const c = l.cells.find((u) => u.id === a.cellId);
+      r = (c == null ? void 0 : c.rows) || [];
+    }
+    return null;
+  }
+  collectCellItemsForResize(o) {
+    return Array.isArray(o.items) ? [...o.items] : (o.rows || []).flatMap(
+      (n) => n.cells.flatMap((r) => this.collectCellItemsForResize(r))
+    );
+  }
+  buildResizedCells(o, n) {
+    const r = /* @__PURE__ */ new Set();
+    return n.map((i, a) => {
+      const l = o.cells.findIndex((c, u) => !r.has(u) && _.isEqual(this.collectCellItemsForResize(c), i));
+      if (l !== -1) {
+        r.add(l);
+        const c = o.cells[l];
+        return c.rows && !c.items ? _.cloneDeep(c) : {
+          id: c.id,
+          items: [...i]
+        };
+      }
+      return {
+        id: `${o.id}:cell:${a}:${uid()}`,
+        items: [...i]
+      };
+    });
+  }
+  getResizeRowPath(o) {
+    if (!(o != null && o.length))
+      return [];
+    const n = o.map((r) => x({}, r));
+    return delete n[n.length - 1].cellId, n;
+  }
+  getResizeContainerWidth(o) {
+    var l, c, u;
+    const n = this.getResizeRowPath(o), r = ((l = this.gridContainerRef.current) == null ? void 0 : l.clientWidth) || 0;
+    if (!n.length)
+      return r;
+    const a = Array.from(((c = this.gridContainerRef.current) == null ? void 0 : c.querySelectorAll("[data-grid-row-id]")) || []).find((d) => {
+      try {
+        return _.isEqual(JSON.parse(d.dataset.gridPath || "[]"), n);
+      } catch (p) {
+        return !1;
+      }
+    });
+    return ((u = a == null ? void 0 : a.parentElement) == null ? void 0 : u.clientWidth) || r;
+  }
+  resizeGridLayout({
+    direction: o,
+    resizeDistance: n,
+    model: r
+  }) {
+    var f, y;
+    const i = this.getGridLayout(), a = findModelUidLayoutPosition(i, r.uid);
+    if (!a)
+      return null;
+    const l = this.findLayoutRowByPath(i, a.path);
+    if (!l)
+      return null;
+    const c = this.getResizeContainerWidth(a.path), u = l.cells.map((b) => this.collectCellItemsForResize(b)), { newRows: d, newSizes: p, moveDistance: m } = recalculateGridSizes({
+      position: {
+        rowId: l.id,
+        columnIndex: a.cellIndex,
+        itemIndex: a.itemIndex
+      },
+      direction: o,
+      resizeDistance: n,
+      prevMoveDistance: this.prevMoveDistance,
+      oldRows: { [l.id]: u },
+      oldSizes: { [l.id]: l.sizes || [] },
+      gutter: (y = (f = this.context.themeToken) == null ? void 0 : f.marginBlock) != null ? y : 16,
+      gridContainerWidth: c
+    }), h = _.cloneDeep(i), g = this.findLayoutRowByPath(h, a.path);
+    return g ? (g.cells = this.buildResizedCells(l, d[l.id] || []), g.sizes = p[l.id] || [], {
+      layout: normalizeGridLayout({
+        layout: h,
+        itemUids: this.getItemUids(),
+        gridUid: this.uid,
+        logger: console
+      }),
+      moveDistance: m
+    }) : null;
+  }
   onMount() {
     super.onMount(), this.emitter.on("onSubModelAdded", (o) => {
-      if (!o.isNew)
-        return;
-      this.resetRows(!0);
-      const n = findModelUidPosition(o.uid, this.props.rows || {});
-      if (n) {
-        const r = _.cloneDeep(this.props.sizes || {});
-        r[n.rowId] = [24];
-        const { rowOrder: i } = this.normalizeRowsWithOrder(this.props.rows || {}, this.props.rowOrder), a = this.orderSizesByRowOrder(r, i);
-        this.setStepParams(GRID_FLOW_KEY, GRID_STEP, {
-          rows: this.props.rows || {},
-          sizes: a,
-          rowOrder: i
-        }), this.setProps("sizes", a), this.setProps("rowOrder", i);
-      }
+      o.isNew && (this.resetRows(!0), this.setGridStepLayout(this.props.layout));
     }), this.emitter.on("onSubModelDestroyed", (o) => {
-      var i, a, l, c;
-      const n = o.uid, r = findModelUidPosition(n, this.props.rows || {});
-      if (this.resetRows(!0), r) {
-        const u = this.props.rows || {}, d = _.cloneDeep(this.props.sizes || {});
-        ((i = u[r.rowId]) == null ? void 0 : i[r.columnIndex]) === void 0 && ((a = d[r.rowId]) == null || a.splice(r.columnIndex, 1)), u[r.rowId] === void 0 && delete d[r.rowId];
-        const { rowOrder: p } = this.normalizeRowsWithOrder(u, this.props.rowOrder), m = this.orderSizesByRowOrder(d, p);
-        this.setStepParams(GRID_FLOW_KEY, GRID_STEP, {
-          rows: u,
-          sizes: m,
-          rowOrder: p
-        }), this.setProps("sizes", m), this.setProps("rowOrder", p);
-      }
-      (l = this.context.filterManager) == null || l.removeFilterConfig({ targetId: n }), (c = this.context.filterManager) == null || c.removeFilterConfig({ filterId: n }), this.saveStepParams();
+      var r, i;
+      const n = o.uid;
+      this.resetRows(!0), this.setGridStepLayout(this.props.layout), (r = this.context.filterManager) == null || r.removeFilterConfig({ targetId: n }), (i = this.context.filterManager) == null || i.removeFilterConfig({ filterId: n }), this.saveStepParams();
     }), this.emitter.on("onSubModelMoved", () => {
       this.resetRows(!0);
     }), this.emitter.on("onResizeLeft", ({ resizeDistance: o, model: n }) => {
-      var u;
-      const r = findModelUidPosition(n.uid, this.props.rows || {}), i = ((u = this.gridContainerRef.current) == null ? void 0 : u.clientWidth) || 0, { newRows: a, newSizes: l, moveDistance: c } = recalculateGridSizes({
-        position: r,
-        direction: "left",
-        resizeDistance: o,
-        prevMoveDistance: this.prevMoveDistance,
-        oldRows: this.props.rows || {},
-        oldSizes: this.props.sizes || {},
-        gutter: this.context.themeToken.marginBlock,
-        gridContainerWidth: i
-      });
-      this.prevMoveDistance = c, this.setProps("rows", a), this.setProps("sizes", l);
+      const r = this.resizeGridLayout({ direction: "left", resizeDistance: o, model: n });
+      r && (this.prevMoveDistance = r.moveDistance, this.syncLayoutProps(r.layout));
     }), this.emitter.on("onResizeRight", ({ resizeDistance: o, model: n }) => {
-      var u;
-      const r = findModelUidPosition(n.uid, this.props.rows || {}), i = ((u = this.gridContainerRef.current) == null ? void 0 : u.clientWidth) || 0, { newRows: a, newSizes: l, moveDistance: c } = recalculateGridSizes({
-        position: r,
-        direction: "right",
-        resizeDistance: o,
-        prevMoveDistance: this.prevMoveDistance,
-        oldRows: this.props.rows || {},
-        oldSizes: this.props.sizes || {},
-        gutter: this.context.themeToken.marginBlock,
-        gridContainerWidth: i
-      });
-      this.prevMoveDistance = c, this.setProps("rows", a), this.setProps("sizes", l);
+      const r = this.resizeGridLayout({ direction: "right", resizeDistance: o, model: n });
+      r && (this.prevMoveDistance = r.moveDistance, this.syncLayoutProps(r.layout));
     }), this.emitter.on("onResizeBottom", ({ resizeDistance: o, model: n }) => {
     }), this.emitter.on("onResizeEnd", () => {
-      this.prevMoveDistance = 0, this.saveGridLayout();
+      this.prevMoveDistance = 0, this.saveGridLayout(this.props.layout);
     });
   }
   saveGridLayout(o) {
-    var c, u, d, p, m;
-    const n = (u = (c = o == null ? void 0 : o.rows) != null ? c : this.props.rows) != null ? u : {}, r = (d = o == null ? void 0 : o.rowOrder) != null ? d : this.props.rowOrder, { rows: i, rowOrder: a } = this.normalizeRowsWithOrder(n, r), l = this.orderSizesByRowOrder((m = (p = o == null ? void 0 : o.sizes) != null ? p : this.props.sizes) != null ? m : {}, a);
-    this.setStepParams(GRID_FLOW_KEY, GRID_STEP, {
-      rows: i,
-      sizes: l,
-      rowOrder: a
-    }), this.setProps("rowOrder", a), this.saveStepParams();
+    const n = o && "version" in o ? normalizeGridLayout({ layout: o, itemUids: this.getItemUids(), gridUid: this.uid, logger: console }) : this.normalizeLayoutFromSource(o);
+    this.setGridStepLayout(n), this.syncLayoutProps(n), this.saveStepParams();
   }
   mergeRowsWithItems(o) {
     const n = this.subModels.items || [];
@@ -71602,17 +71732,15 @@ class GridModel extends FlowModel {
     return a;
   }
   resetRows(o = !1) {
-    const n = this.getStepParams(GRID_FLOW_KEY, GRID_STEP) || {}, r = this.mergeRowsWithItems(n.rows || {}), { rows: i, rowOrder: a } = this.normalizeRowsWithOrder(r, n.rowOrder), l = this.orderSizesByRowOrder(n.sizes || {}, a);
-    this.setStepParams(GRID_FLOW_KEY, GRID_STEP, {
-      rows: i,
-      sizes: l,
-      rowOrder: a
-    }), o && (this.setProps("rows", i), this.setProps("sizes", l), this.setProps("rowOrder", a));
+    const n = this.getStepParams(GRID_FLOW_KEY, GRID_STEP) || {}, r = this.normalizeLayoutFromSource(n);
+    this.setGridStepLayout(r), o && this.syncLayoutProps(r);
   }
   computePointerPosition(o) {
     var a;
     if (!this.dragState)
       return null;
+    if (this.dragState.pointerPosition)
+      return this.dragState.pointerPosition;
     const n = this.dragState.pointerOrigin;
     if (n)
       return {
@@ -71644,42 +71772,60 @@ class GridModel extends FlowModel {
     this.dragState.slots = o.slots, this.dragState.containerRect = o.containerRect;
   }
   scheduleSnapshotRefresh() {
-    this.dragState && (this.dragState.refreshTimer && clearTimeout(this.dragState.refreshTimer), this.dragState.refreshTimer = setTimeout(() => {
-      this.dragState && (this.dragState.refreshTimer = null, this.updateLayoutSnapshot());
-    }, 16));
+    this.dragState && (this.dragState.refreshTimer || (this.dragState.refreshTimer = setTimeout(() => {
+      this.dragState && (this.dragState.refreshTimer = null, this.updateLayoutSnapshot(), this.refreshPreviewFromPointer());
+    }, 16)));
+  }
+  refreshPreviewFromPointer() {
+    if (!this.dragState)
+      return;
+    const o = this.dragState.pointerPosition || this.dragState.pointerOrigin;
+    if (!o)
+      return;
+    const n = this.resolveDragSlot(o);
+    this.applyPreview(n);
   }
   /**
    * 根据 slot 类型、位置和配置计算最终的 overlay 尺寸和位置
    */
   computeOverlayRect(o) {
-    var i, a, l, c, u, d, p, m, h;
+    var i, a, l, c, u, d, p, m, h, g, f, y;
     const n = this.dragOverlayConfig, r = o.rect;
     switch (o.type) {
       case "column": {
-        const g = (i = n == null ? void 0 : n.columnInsert) == null ? void 0 : i[o.position], f = (a = g == null ? void 0 : g.height) != null ? a : r.height, y = (l = g == null ? void 0 : g.offsetTop) != null ? l : 0;
+        const b = (i = n == null ? void 0 : n.columnInsert) == null ? void 0 : i[o.position], S = (a = b == null ? void 0 : b.height) != null ? a : r.height, C = (l = b == null ? void 0 : b.offsetTop) != null ? l : 0;
         return {
-          top: r.top + y,
+          top: r.top + C,
           left: r.left,
           width: r.width,
-          height: f
+          height: S
         };
       }
       case "column-edge": {
-        const g = (c = n == null ? void 0 : n.columnEdge) == null ? void 0 : c[o.direction], f = (u = g == null ? void 0 : g.width) != null ? u : r.width, y = (d = g == null ? void 0 : g.offsetLeft) != null ? d : 0;
+        const b = (c = n == null ? void 0 : n.columnEdge) == null ? void 0 : c[o.direction], S = (u = b == null ? void 0 : b.width) != null ? u : r.width, C = (d = b == null ? void 0 : b.offsetLeft) != null ? d : 0;
         return {
           top: r.top,
-          left: r.left + y,
-          width: f,
+          left: r.left + C,
+          width: S,
+          height: r.height
+        };
+      }
+      case "item-edge": {
+        const b = (p = n == null ? void 0 : n.columnEdge) == null ? void 0 : p[o.direction], S = (m = b == null ? void 0 : b.width) != null ? m : r.width, C = (h = b == null ? void 0 : b.offsetLeft) != null ? h : 0;
+        return {
+          top: r.top,
+          left: r.left + C,
+          width: S,
           height: r.height
         };
       }
       case "row-gap": {
-        const g = (p = n == null ? void 0 : n.rowGap) == null ? void 0 : p[o.position], f = (m = g == null ? void 0 : g.height) != null ? m : r.height, y = (h = g == null ? void 0 : g.offsetTop) != null ? h : 0;
+        const b = (g = n == null ? void 0 : n.rowGap) == null ? void 0 : g[o.position], S = (f = b == null ? void 0 : b.height) != null ? f : r.height, C = (y = b == null ? void 0 : b.offsetTop) != null ? y : 0;
         return {
-          top: r.top + y,
+          top: r.top + C,
           left: r.left,
           width: r.width,
-          height: f
+          height: S
         };
       }
       case "empty-column":
@@ -71699,8 +71845,20 @@ class GridModel extends FlowModel {
         };
     }
   }
+  getHitTestSlot(o) {
+    return A(x({}, o), {
+      // 命中区域与实际显示的 overlay 保持一致，避免鼠标仍在蓝框内时命中跳走
+      rect: this.computeOverlayRect(o)
+    });
+  }
+  resolveDragSlot(o) {
+    var n;
+    return (n = this.dragState) != null && n.slots.length ? resolveDropIntent(
+      o,
+      this.dragState.slots.map((r) => this.getHitTestSlot(r))
+    ) : null;
+  }
   applyPreview(o) {
-    var d, p;
     if (!this.dragState)
       return;
     if (!o) {
@@ -71714,40 +71872,49 @@ class GridModel extends FlowModel {
       slot: o,
       sourceUid: this.dragState.sourceUid,
       layout: this.dragState.snapshot,
-      generateRowId: uid
+      generateRowId: uid,
+      generatedIds: this.dragState.generatedIds,
+      generateId: () => uid()
     });
+    if (r.layout && this.dragState.snapshot.layout && isSameGridLayout(r.layout, this.dragState.snapshot.layout)) {
+      this.applyPreview(null);
+      return;
+    }
     this.dragState.previewLayout = {
       rows: _.cloneDeep(r.rows),
       sizes: _.cloneDeep(r.sizes),
-      rowOrder: _.cloneDeep(r.rowOrder)
+      rowOrder: _.cloneDeep(r.rowOrder),
+      layout: _.cloneDeep(r.layout)
     };
-    const i = this.getDragContainer(), a = (d = i == null ? void 0 : i.scrollTop) != null ? d : 0, l = (p = i == null ? void 0 : i.scrollLeft) != null ? p : 0, c = this.computeOverlayRect(o), u = {
-      top: c.top - this.dragState.containerRect.top + a,
-      left: c.left - this.dragState.containerRect.left + l,
-      width: c.width,
-      height: c.height,
+    const i = this.computeOverlayRect(o), a = {
+      top: i.top - this.dragState.containerRect.top,
+      left: i.left - this.dragState.containerRect.left,
+      width: i.width,
+      height: i.height,
       type: o.type
     };
-    this.setProps("dragOverlayRect", u), this.dragState.activeSlotKey = n;
+    this.setProps("dragOverlayRect", a), this.dragState.activeSlotKey = n;
   }
   handleDragStart(o) {
-    var l;
-    const n = o.active.id, { rows: r, rowOrder: i } = this.normalizeRowsWithOrder(this.props.rows || {}, this.props.rowOrder), a = this.orderSizesByRowOrder(this.props.sizes || {}, i);
+    var a;
+    const n = o.active.id, r = this.normalizeLayoutFromSource(), i = projectLayoutToLegacyRows(r);
     this.dragState = {
       sourceUid: n,
       snapshot: {
-        rows: _.cloneDeep(r),
-        sizes: _.cloneDeep(a),
-        rowOrder: i
+        rows: _.cloneDeep(i.rows),
+        sizes: _.cloneDeep(i.sizes),
+        rowOrder: _.cloneDeep(i.rowOrder),
+        layout: _.cloneDeep(r)
       },
       slots: [],
       containerEl: this.gridContainerRef.current,
       containerRect: { top: 0, left: 0, width: 0, height: 0 },
-      pointerOrigin: (l = getClientPoint(o.activatorEvent)) != null ? l : void 0,
+      pointerOrigin: (a = getClientPoint(o.activatorEvent)) != null ? a : void 0,
       activeSlotKey: null,
       previewLayout: void 0,
-      refreshTimer: null
-    }, this.setProps("dragOverlayRect", null), this.updateLayoutSnapshot(), this.scheduleSnapshotRefresh();
+      refreshTimer: null,
+      generatedIds: /* @__PURE__ */ new Map()
+    }, this.dragState.cleanupListeners = this.bindDragDocumentListeners(), this.setProps("dragOverlayRect", null), this.updateLayoutSnapshot(), this.scheduleSnapshotRefresh();
   }
   handleDragMove(o) {
     if (!this.dragState)
@@ -71758,17 +71925,18 @@ class GridModel extends FlowModel {
       this.applyPreview(null);
       return;
     }
-    const r = resolveDropIntent(n, this.dragState.slots);
+    const r = this.resolveDragSlot(n);
     this.applyPreview(r);
   }
   finishDrag() {
-    this.dragState && (this.dragState.refreshTimer && clearTimeout(this.dragState.refreshTimer), this.dragState = void 0, this.setProps("dragOverlayRect", null));
+    var o, n;
+    this.dragState && (this.dragState.refreshTimer && clearTimeout(this.dragState.refreshTimer), (n = (o = this.dragState).cleanupListeners) == null || n.call(o), this.dragState = void 0, this.setProps("dragOverlayRect", null));
   }
   handleDragEnd(o) {
     if (!this.dragState)
       return;
     const n = this.dragState.previewLayout;
-    n && (this.setProps("rows", _.cloneDeep(n.rows)), this.setProps("sizes", _.cloneDeep(n.sizes)), n.rowOrder && this.setProps("rowOrder", _.cloneDeep(n.rowOrder)), this.saveGridLayout(n)), this.finishDrag();
+    n && (n.layout ? this.syncLayoutProps(_.cloneDeep(n.layout)) : (this.setProps("rows", _.cloneDeep(n.rows)), this.setProps("sizes", _.cloneDeep(n.sizes)), n.rowOrder && this.setProps("rowOrder", _.cloneDeep(n.rowOrder))), this.saveGridLayout(n)), this.finishDrag();
   }
   handleDragCancel(o) {
     this.finishDrag();
@@ -71783,32 +71951,52 @@ class GridModel extends FlowModel {
    */
   getVisibleLayout() {
     var h;
-    const o = this.props.rows || {}, n = this.props.sizes || {}, r = this.context.isMobileLayout ? transformRowsToSingleColumn(o) : o, i = this.context.isMobileLayout ? {} : n, { rows: a, rowOrder: l } = this.normalizeRowsWithOrder(r, this.props.rowOrder), c = this.orderSizesByRowOrder(i, l);
+    const o = this.normalizeLayoutFromSource(), n = this.context.isMobileLayout ? normalizeGridLayout({
+      rows: transformRowsToSingleColumn(projectLayoutToLegacyRows(o).rows),
+      itemUids: this.getItemUids()
+    }) : o, r = projectLayoutToLegacyRows(n), { rows: i, rowOrder: a } = this.normalizeRowsWithOrder(
+      r.rows,
+      r.rowOrder
+    ), l = this.orderSizesByRowOrder(r.sizes, a);
     if (this.context.flowSettingsEnabled)
-      return { rows: a, sizes: c };
-    const u = ((h = this.subModels) == null ? void 0 : h.items) || [];
-    if (!u.length)
-      return { rows: r, sizes: i };
-    const d = new Map(u.map((g) => [g.uid, g])), p = {}, m = {};
-    return l.forEach((g) => {
-      const f = a[g], y = c[g] || [], b = [], S = [];
-      f.forEach((C, F) => {
-        C = C.filter((v) => {
-          var k;
-          return v === EMPTY_COLUMN_UID ? !1 : ((k = d.get(v)) == null ? void 0 : k.hidden) !== !0;
-        }), C.some((v) => {
-          if (v === EMPTY_COLUMN_UID)
-            return !1;
-          const k = d.get(v);
-          return !k || !k.hidden;
-        }) && (b.push(C), S.push(y[F]));
-      }), b.length > 0 && (p[g] = b, S.length > 0 && (m[g] = S));
-    }), { rows: p, sizes: m };
+      return { layout: n, rows: i, sizes: l };
+    const c = ((h = this.subModels) == null ? void 0 : h.items) || [];
+    if (!c.length)
+      return { layout: n, rows: r.rows, sizes: r.sizes };
+    const u = new Map(c.map((g) => [g.uid, g])), d = (g) => g.map((f) => {
+      const y = [], b = [];
+      return f.cells.forEach((S, C) => {
+        var I;
+        const F = (I = f.sizes) == null ? void 0 : I[C], P = Number.isFinite(F) && F > 0 ? F : 1;
+        if (S.rows) {
+          const T = d(S.rows);
+          T.length && (y.push(A(x({}, S), { rows: T })), b.push(P));
+          return;
+        }
+        const v = (S.items || []).filter((T) => {
+          var E;
+          return T === EMPTY_COLUMN_UID ? !1 : ((E = u.get(T)) == null ? void 0 : E.hidden) !== !0;
+        });
+        v.some((T) => {
+          const E = u.get(T);
+          return !E || !E.hidden;
+        }) && (y.push(A(x({}, S), { items: v })), b.push(P));
+      }), y.length ? A(x({}, f), {
+        cells: y,
+        sizes: b
+      }) : null;
+    }).filter(Boolean), p = normalizeGridLayout({
+      layout: {
+        version: 2,
+        rows: d(n.rows)
+      }
+    }), m = projectLayoutToLegacyRows(p);
+    return { layout: p, rows: m.rows, sizes: m.sizes };
   }
   render() {
-    const { rows: o, sizes: n } = this.getVisibleLayout(), r = Object.keys(o || {}).length > 0;
+    const { layout: o, rows: n, sizes: r } = this.getVisibleLayout(), i = Object.keys(n || {}).length > 0;
     return /* @__PURE__ */ jsxs(Fragment$1, { children: [
-      r && /* @__PURE__ */ jsx(
+      i && /* @__PURE__ */ jsx(
         Space$1,
         {
           ref: this.gridContainerRef,
@@ -71827,51 +72015,52 @@ class GridModel extends FlowModel {
                 {
                   rowGap: this.props.rowGap,
                   colGap: this.props.colGap,
-                  rows: o,
-                  sizes: n,
+                  layout: o,
+                  rows: n,
+                  sizes: r,
                   dragOverlayRect: this.props.dragOverlayRect,
-                  renderItem: (i) => {
-                    var h, g, f, y, b, S;
-                    const a = this.flowEngine.getModel(i);
-                    if (!a)
+                  renderItem: (a) => {
+                    var g, f, y, b, S, C;
+                    const l = this.flowEngine.getModel(a);
+                    if (!l)
                       return this.itemFallback;
-                    const l = this.context.fieldKey, c = this.context.fieldIndex, u = this.context.getPropertyOptions("item"), d = (g = (h = this.context).getPropertyOptions) == null ? void 0 : g.call(h, "record"), p = (y = (f = this.context).getPropertyOptions) == null ? void 0 : y.call(f, "currentObject"), m = c == null ? a : (() => {
-                      const C = a.createFork({}, `${l}:${i}`);
-                      C.context.defineProperty("fieldIndex", {
+                    const c = this.context.fieldKey, u = this.context.fieldIndex, d = this.context.getPropertyOptions("item"), p = (f = (g = this.context).getPropertyOptions) == null ? void 0 : f.call(g, "record"), m = (b = (y = this.context).getPropertyOptions) == null ? void 0 : b.call(y, "currentObject"), h = u == null ? l : (() => {
+                      const F = l.createFork({}, `${c}:${a}`);
+                      F.context.defineProperty("fieldIndex", {
+                        get: () => u
+                      }), F.context.defineProperty("fieldKey", {
                         get: () => c
-                      }), C.context.defineProperty("fieldKey", {
-                        get: () => l
-                      }), C.context.defineProperty("record", {
+                      }), F.context.defineProperty("record", {
                         get: () => this.context.record,
                         cache: !1,
-                        meta: d == null ? void 0 : d.meta,
-                        resolveOnServer: d == null ? void 0 : d.resolveOnServer,
-                        serverOnlyWhenContextParams: d == null ? void 0 : d.serverOnlyWhenContextParams
-                      }), C.context.defineProperty("currentObject", {
+                        meta: p == null ? void 0 : p.meta,
+                        resolveOnServer: p == null ? void 0 : p.resolveOnServer,
+                        serverOnlyWhenContextParams: p == null ? void 0 : p.serverOnlyWhenContextParams
+                      }), F.context.defineProperty("currentObject", {
                         get: () => this.context.currentObject,
                         cache: !1,
                         // meta: currentObjectOptions?.meta,
-                        resolveOnServer: p == null ? void 0 : p.resolveOnServer,
-                        serverOnlyWhenContextParams: p == null ? void 0 : p.serverOnlyWhenContextParams
+                        resolveOnServer: m == null ? void 0 : m.resolveOnServer,
+                        serverOnlyWhenContextParams: m == null ? void 0 : m.serverOnlyWhenContextParams
                       });
-                      const v = u || {}, { value: F } = v, P = te(v, ["value"]);
-                      return C.context.defineProperty("item", A(x({}, P), {
+                      const k = d || {}, { value: P } = k, v = te(k, ["value"]);
+                      return F.context.defineProperty("item", A(x({}, v), {
                         get: () => this.context.item,
                         cache: !1
-                      })), C;
+                      })), F;
                     })();
-                    return /* @__PURE__ */ jsx(Droppable, { model: m, children: /* @__PURE__ */ jsx(
+                    return /* @__PURE__ */ jsx(Droppable, { model: h, children: /* @__PURE__ */ jsx(
                       MemoFlowModelRenderer,
                       {
-                        model: m,
-                        fallback: a.skeleton || this.itemFallback,
+                        model: h,
+                        fallback: l.skeleton || this.itemFallback,
                         showFlowSettings: this.context.flowSettingsEnabled ? this.getItemFlowSettings() : !1,
                         showErrorFallback: !0,
-                        settingsMenuLevel: (b = m == null ? void 0 : m.settingsMenuLevel) != null ? b : this.itemSettingsMenuLevel,
+                        settingsMenuLevel: (S = h == null ? void 0 : h.settingsMenuLevel) != null ? S : this.itemSettingsMenuLevel,
                         showTitle: !0,
                         extraToolbarItems: this.itemExtraToolbarItems
                       },
-                      `${m.uid}:${l}:${(m == null ? void 0 : m.use) || ((S = m == null ? void 0 : m.constructor) == null ? void 0 : S.name) || "m"}`
+                      `${h.uid}:${c}:${(h == null ? void 0 : h.use) || ((C = h == null ? void 0 : h.constructor) == null ? void 0 : C.name) || "m"}`
                     ) });
                   }
                 }
@@ -71894,31 +72083,28 @@ GridModel.registerFlow({
     },
     grid: {
       uiSchema: {
-        rows: {
-          title: tExpr("Rows"),
+        layout: {
+          title: tExpr("Layout"),
           "x-decorator": "FormItem",
           "x-component": JsonEditor,
           "x-component-props": {
             autoSize: { minRows: 10, maxRows: 20 },
-            description: tExpr("Configure the rows and columns of the grid.")
+            description: tExpr("Configure the nested layout of the grid.")
           }
-        },
-        sizes: {
-          title: tExpr("Sizes"),
-          "x-decorator": "FormItem",
-          "x-component": JsonEditor,
-          "x-component-props": {
-            rows: 5
-          },
-          description: tExpr(
-            "Configure the sizes of each row. The value is an array of numbers representing the width of each column in the row."
-          )
         }
       },
       handler(e, t) {
         return L(this, null, function* () {
-          const o = e.model.mergeRowsWithItems(t.rows || {}), { rows: n, rowOrder: r } = e.model.normalizeRowsWithOrder(o, t.rowOrder), i = e.model.orderSizesByRowOrder(t.sizes || {}, r);
-          e.model.setProps("rows", n), e.model.setProps("sizes", i), e.model.setProps("rowOrder", r);
+          const o = e.model, n = normalizeGridLayout({
+            layout: t.layout,
+            rows: t.rows,
+            sizes: t.sizes,
+            rowOrder: t.rowOrder,
+            itemUids: o.getItemUids(),
+            gridUid: o.uid,
+            logger: console
+          });
+          o.setGridStepLayout(n), o.syncLayoutProps(n);
         });
       }
     }
@@ -72036,8 +72222,8 @@ class BlockGridModel extends GridModel {
     R(this, "dragOverlayConfig", {
       // 列内插入
       columnInsert: {
-        before: { offsetTop: -24 },
-        after: { offsetTop: 24 }
+        before: { offsetTop: -12 },
+        after: { offsetTop: 12 }
       },
       // 列边缘
       columnEdge: {
@@ -72091,7 +72277,7 @@ BlockGridModel.registerFlow({
   }
 });
 const parseMarkdown = _.memoize((e) => L(void 0, null, function* () {
-  return e && (yield import("./md-BbvRKckr.mjs")).default.render(e);
+  return e && (yield import("./md-oH2RssNY.mjs")).default.render(e);
 }));
 function useParseMarkdown(e) {
   const [t, o] = useState(""), [n, r] = useState(!0);
@@ -74900,14 +75086,14 @@ const FieldAssignValueInput = ({
   ), f = React.useMemo(() => {
     var pe, he, ye, Ce, me, ae, ce, ge, xe, Se, ke, Ie, be, we, je, Ee, ve, Fe;
     if (h) {
-      const Me = h, Pe = h.context, { collection: Oe, dataSource: _e, blockModel: Le } = Pe, Re = ((pe = h == null ? void 0 : h.getStepParams) == null ? void 0 : pe.call(h, "fieldSettings", "init")) || {}, Ae = ((he = h == null ? void 0 : h.context) == null ? void 0 : he.dataSourceManager) || ((Ce = (ye = d.model) == null ? void 0 : ye.context) == null ? void 0 : Ce.dataSourceManager), ze = getCollectionFromModel(d.model), De = Oe || (Re != null && Re.dataSourceKey && (Re != null && Re.collectionName) ? (me = Ae == null ? void 0 : Ae.getCollection) == null ? void 0 : me.call(Ae, Re.dataSourceKey, Re.collectionName) : void 0) || ze, qe = _e || (Re != null && Re.dataSourceKey ? (ae = Ae == null ? void 0 : Ae.getDataSource) == null ? void 0 : ae.call(Ae, Re.dataSourceKey) : void 0) || (De != null && De.dataSourceKey ? (ce = Ae == null ? void 0 : Ae.getDataSource) == null ? void 0 : ce.call(Ae, De.dataSourceKey) : void 0), Te = resolveAssignValueFieldPath(h), Ve = Te == null ? void 0 : Te.split(".").slice(-1)[0], Ue = Ve ? (ge = De == null ? void 0 : De.getField) == null ? void 0 : ge.call(De, Ve) : void 0, Ke = (Se = (xe = Me == null ? void 0 : Me.customFieldModelInstance) == null ? void 0 : xe.context) == null ? void 0 : Se.collectionField;
+      const Me = h, Pe = h.context, { collection: Oe, dataSource: Ve, blockModel: Le } = Pe, Re = ((pe = h == null ? void 0 : h.getStepParams) == null ? void 0 : pe.call(h, "fieldSettings", "init")) || {}, Ae = ((he = h == null ? void 0 : h.context) == null ? void 0 : he.dataSourceManager) || ((Ce = (ye = d.model) == null ? void 0 : ye.context) == null ? void 0 : Ce.dataSourceManager), ze = getCollectionFromModel(d.model), De = Oe || (Re != null && Re.dataSourceKey && (Re != null && Re.collectionName) ? (me = Ae == null ? void 0 : Ae.getCollection) == null ? void 0 : me.call(Ae, Re.dataSourceKey, Re.collectionName) : void 0) || ze, qe = Ve || (Re != null && Re.dataSourceKey ? (ae = Ae == null ? void 0 : Ae.getDataSource) == null ? void 0 : ae.call(Ae, Re.dataSourceKey) : void 0) || (De != null && De.dataSourceKey ? (ce = Ae == null ? void 0 : Ae.getDataSource) == null ? void 0 : ce.call(Ae, De.dataSourceKey) : void 0), Te = resolveAssignValueFieldPath(h), _e = Te == null ? void 0 : Te.split(".").slice(-1)[0], Ue = _e ? (ge = De == null ? void 0 : De.getField) == null ? void 0 : ge.call(De, _e) : void 0, Ke = (Se = (xe = Me == null ? void 0 : Me.customFieldModelInstance) == null ? void 0 : xe.context) == null ? void 0 : Se.collectionField;
       return {
         itemModel: h,
         collection: De || null,
         dataSource: qe || null,
         blockModel: Le,
         fieldPath: Te || null,
-        fieldName: Ve || null,
+        fieldName: _e || null,
         collectionField: Ue || Ke || null
       };
     }
@@ -74996,13 +75182,13 @@ const FieldAssignValueInput = ({
     [N, i]
   ), [V, z] = React.useState(null);
   React.useEffect(() => {
-    var Pe, Oe, _e, Le, Re, Ae, ze, De, qe, Te, Ve, Ue, Ke, nt, We, it, Ye, at, Je, lt, ct, ut, dt, pt, mt, ht, gt, ft, xt, yt, bt, St, Ct, vt, Ft, Pt, kt, It;
+    var Pe, Oe, Ve, Le, Re, Ae, ze, De, qe, Te, _e, Ue, Ke, nt, We, it, Ye, at, Je, lt, ct, ut, dt, pt, mt, ht, gt, ft, xt, yt, bt, St, Ct, vt, Ft, Pt, kt, It;
     if (!C || !F)
       return;
-    const Y = h, X = ((Oe = (Pe = f == null ? void 0 : f.itemModel) == null ? void 0 : Pe.context) == null ? void 0 : Oe.engine) || ((Le = (_e = d.model) == null ? void 0 : _e.context) == null ? void 0 : Le.engine);
+    const Y = h, X = ((Oe = (Pe = f == null ? void 0 : f.itemModel) == null ? void 0 : Pe.context) == null ? void 0 : Oe.engine) || ((Le = (Ve = d.model) == null ? void 0 : Ve.context) == null ? void 0 : Le.engine);
     if (!X)
       return;
-    const se = ((Re = Y == null ? void 0 : Y.context) == null ? void 0 : Re.dataSourceManager) || ((ze = (Ae = d.model) == null ? void 0 : Ae.context) == null ? void 0 : ze.dataSourceManager), re = y || getCollectionFromModel(Y) || getCollectionFromModel(d.model), { customFieldName: le, customFieldProps: ue, currentAllowMultiple: ie, originFieldModel: de, originProps: fe } = k, pe = (De = de == null ? void 0 : de.context) == null ? void 0 : De.collectionField, he = P || pe || void 0, ye = b || (re != null && re.dataSourceKey ? (qe = se == null ? void 0 : se.getDataSource) == null ? void 0 : qe.call(se, re.dataSourceKey) : null), me = (typeof (re == null ? void 0 : re.getFields) == "function" ? re.getFields() || [] : []).find((Be) => (Be == null ? void 0 : Be.name) === F) || (typeof (re == null ? void 0 : re.getField) == "function" ? re.getField(F) : void 0) || he, ae = me ? EditableItemModel.getDefaultBindingByField(((Te = f == null ? void 0 : f.itemModel) == null ? void 0 : Te.context) || ((Ve = d.model) == null ? void 0 : Ve.context), me) : null, ce = ae == null ? void 0 : ae.modelName, ge = resolveAssignValueFieldSettingsInit({
+    const se = ((Re = Y == null ? void 0 : Y.context) == null ? void 0 : Re.dataSourceManager) || ((ze = (Ae = d.model) == null ? void 0 : Ae.context) == null ? void 0 : ze.dataSourceManager), re = y || getCollectionFromModel(Y) || getCollectionFromModel(d.model), { customFieldName: le, customFieldProps: ue, currentAllowMultiple: ie, originFieldModel: de, originProps: fe } = k, pe = (De = de == null ? void 0 : de.context) == null ? void 0 : De.collectionField, he = P || pe || void 0, ye = b || (re != null && re.dataSourceKey ? (qe = se == null ? void 0 : se.getDataSource) == null ? void 0 : qe.call(se, re.dataSourceKey) : null), me = (typeof (re == null ? void 0 : re.getFields) == "function" ? re.getFields() || [] : []).find((Be) => (Be == null ? void 0 : Be.name) === F) || (typeof (re == null ? void 0 : re.getField) == "function" ? re.getField(F) : void 0) || he, ae = me ? EditableItemModel.getDefaultBindingByField(((Te = f == null ? void 0 : f.itemModel) == null ? void 0 : Te.context) || ((_e = d.model) == null ? void 0 : _e.context), me) : null, ce = ae == null ? void 0 : ae.modelName, ge = resolveAssignValueFieldSettingsInit({
       collection: re,
       customFieldName: le,
       fieldPath: C,
@@ -75581,7 +75767,31 @@ const LinkageFilterItem = observer((e) => {
       }
     )
   ] });
-}), dataScope = defineAction({
+}), PRESERVE_NULL = { __nocobaseDataScopeNull__: !0 };
+function isPreserveNull(e) {
+  return e && typeof e == "object" && !Array.isArray(e) && e.__nocobaseDataScopeNull__ === !0 && Object.keys(e).length === 1;
+}
+function restorePreservedNull(e) {
+  return isPreserveNull(e) ? null : Array.isArray(e) ? e.map((t) => restorePreservedNull(t)) : e && typeof e == "object" ? Object.keys(e).reduce((t, o) => (t[o] = restorePreservedNull(e[o]), t), {}) : e;
+}
+function markEmptyVariableValues(e, t) {
+  if (!(!e || !t || typeof e != "object" || typeof t != "object")) {
+    if ("path" in e && "operator" in e) {
+      isVariableExpression(e.value) && (t.value === void 0 || t.value === null || t.value === "") && (t.value = PRESERVE_NULL);
+      return;
+    }
+    Array.isArray(e.items) && Array.isArray(t.items) && e.items.forEach((o, n) => {
+      markEmptyVariableValues(o, t.items[n]);
+    });
+  }
+}
+function normalizeDataScopeFilter(e, t) {
+  const o = _.cloneDeep(t);
+  markEmptyVariableValues(e, o);
+  const n = pruneFilter(transformFilter(o));
+  return restorePreservedNull(n);
+}
+const dataScope = defineAction({
   name: "dataScope",
   title: tExpr("Data scope"),
   uiMode: {
@@ -75611,14 +75821,15 @@ const LinkageFilterItem = observer((e) => {
       filter: { logic: "$and", items: [] }
     };
   },
+  useRawParams: !0,
   handler(e, t) {
     return L(this, null, function* () {
-      var r;
-      const o = (r = e.model) == null ? void 0 : r.resource;
+      var i;
+      const o = (i = e.model) == null ? void 0 : i.resource;
       if (!o)
         return;
-      const n = pruneFilter(transformFilter(t.filter));
-      isEmptyFilter(n) ? o.removeFilterGroup(e.model.uid) : o.addFilterGroup(e.model.uid, n);
+      const n = yield e.resolveJsonTemplate(t.filter), r = normalizeDataScopeFilter(t.filter, n);
+      isEmptyFilter(r) ? o.removeFilterGroup(e.model.uid) : o.addFilterGroup(e.model.uid, r);
     });
   }
 });
@@ -79690,8 +79901,8 @@ class FormGridModel extends GridModel {
     R(this, "dragOverlayConfig", {
       // 列内插入
       columnInsert: {
-        before: { offsetTop: -12, height: 24 },
-        after: { offsetTop: 7, height: 24 }
+        before: { offsetTop: -6, height: 24 },
+        after: { offsetTop: 3, height: 24 }
       },
       // 列边缘
       columnEdge: {
@@ -79700,8 +79911,8 @@ class FormGridModel extends GridModel {
       },
       // 行间隙
       rowGap: {
-        above: { offsetTop: 0, height: 24 },
-        below: { offsetTop: -14, height: 24 }
+        above: { offsetTop: -2, height: 24 },
+        below: { offsetTop: -12, height: 24 }
       }
     });
   }
@@ -81554,8 +81765,8 @@ class DetailsGridModel extends GridModel {
     R(this, "dragOverlayConfig", {
       // 列内插入
       columnInsert: {
-        before: { offsetTop: -12, height: 24 },
-        after: { offsetTop: 7, height: 24 }
+        before: { offsetTop: -6, height: 24 },
+        after: { offsetTop: 3, height: 24 }
       },
       // 列边缘
       columnEdge: {
@@ -81564,8 +81775,8 @@ class DetailsGridModel extends GridModel {
       },
       // 行间隙
       rowGap: {
-        above: { offsetTop: 0, height: 24 },
-        below: { offsetTop: -14, height: 24 }
+        above: { offsetTop: -2, height: 24 },
+        below: { offsetTop: -12, height: 24 }
       }
     });
   }
@@ -84444,7 +84655,7 @@ const CustomWidth = ({ setOpen: e, t, handleChange: o, defaultValue: n }) => {
         get: () => (o == null ? void 0 : o.__index) || n
       });
       const c = this.context.prefixFieldPath ? this.fieldPath.replace(`${this.context.prefixFieldPath}.`, "") : this.fieldPath, u = get(o, c);
-      return /* @__PURE__ */ jsx(FormItem$2, A(x({}, omit(this.props, "title")), { value: u, noStyle: !0, children: /* @__PURE__ */ jsx(FieldModelRenderer, { model: a }) }), r.uid);
+      return a.setProps({ value: u }), /* @__PURE__ */ jsx(FormItem$2, A(x({}, omit(this.props, "title")), { value: u, noStyle: !0, children: /* @__PURE__ */ jsx(FieldModelRenderer, { model: a }) }), r.uid);
     }) });
   }
 };
@@ -90237,9 +90448,11 @@ const He = class He extends FilterBlockModel {
     const o = this.context.blockGridModel;
     if (o != null && o.emitter) {
       const n = (r) => {
-        !(r != null && r.uid) || r.uid === this.uid || this.handleTargetBlockRemoved(r.uid);
+        !(r != null && r.uid) || r.uid === this.uid || this.handleTargetBlockRemoved(r.uid).catch((i) => {
+          console.error("Failed to handle destroyed target block in FilterFormBlockModel:", i);
+        });
       };
-      o.emitter.on("onSubModelRemoved", n), this.removeTargetBlockListener = () => o.emitter.off("onSubModelRemoved", n);
+      o.emitter.on("onSubModelDestroyed", n), this.removeTargetBlockListener = () => o.emitter.off("onSubModelDestroyed", n);
     }
   }
   onUnmount() {
@@ -91040,6 +91253,7 @@ FilterFormItemModel.registerFlow({
 class FilterFormGridModel extends GridModel {
   constructor() {
     super(...arguments);
+    R(this, "fullLayoutBeforeCollapse");
     R(this, "itemSettingsMenuLevel", 2);
     R(this, "itemFlowSettings", {
       showBackground: !0,
@@ -91053,8 +91267,8 @@ class FilterFormGridModel extends GridModel {
     R(this, "dragOverlayConfig", {
       // 列内插入
       columnInsert: {
-        before: { offsetTop: -12, height: 24 },
-        after: { offsetTop: 7, height: 24 }
+        before: { offsetTop: -6, height: 24 },
+        after: { offsetTop: 3, height: 24 }
       },
       // 列边缘
       columnEdge: {
@@ -91063,8 +91277,8 @@ class FilterFormGridModel extends GridModel {
       },
       // 行间隙
       rowGap: {
-        above: { offsetTop: 0, height: 24 },
-        below: { offsetTop: -14, height: 24 }
+        above: { offsetTop: -2, height: 24 },
+        below: { offsetTop: -12, height: 24 }
       }
     });
     R(this, "loading", observable$1.ref(!1));
@@ -91080,11 +91294,13 @@ class FilterFormGridModel extends GridModel {
    * 避免拖拽排序或重新挂载后只拿到被裁剪过的运行时 rows。
    */
   getFullLayout() {
-    const o = this.getStepParams(GRID_FLOW_KEY, GRID_STEP) || {}, n = this.props.rows || {}, r = o.rows || {}, i = Object.keys(n).length, a = Object.keys(r).length, l = (h) => Object.values(h).reduce(
-      (g, f) => g + f.reduce((y, b) => y + b.length, 0),
+    const o = this.getStepParams(GRID_FLOW_KEY, GRID_STEP) || {}, n = this.props.layout ? this.getGridLayout() : void 0, r = o.layout ? this.normalizeLayoutFromSource(o) : void 0, i = n ? projectLayoutToLegacyRows(n) : { rows: this.props.rows || {}, rowOrder: this.props.rowOrder }, a = r ? projectLayoutToLegacyRows(r) : { rows: o.rows || {}, rowOrder: o.rowOrder }, l = i.rows, c = a.rows || {}, u = Object.keys(l).length, d = Object.keys(c).length, p = (b) => Object.values(b).reduce(
+      (S, C) => S + C.reduce((F, P) => F + P.length, 0),
       0
-    ), c = l(n), u = l(r), d = i > a || i === a && c >= u, p = this.mergeRowsWithItems(d ? n : r), m = d ? this.props.rowOrder || o.rowOrder : o.rowOrder || this.props.rowOrder;
-    return this.normalizeRowsWithOrder(p, m);
+    ), m = p(l), h = p(c), g = u > d || u === d && m >= h, f = this.mergeRowsWithItems(g ? l : c), y = g ? i.rowOrder || this.props.rowOrder || o.rowOrder : a.rowOrder || o.rowOrder || this.props.rowOrder;
+    return A(x({}, this.normalizeRowsWithOrder(f, y)), {
+      layout: g ? n : r
+    });
   }
   /**
    * 按“可视字段行数”裁剪布局，而不是只按 grid row 数裁剪。
@@ -91101,13 +91317,22 @@ class FilterFormGridModel extends GridModel {
     }), i;
   }
   toggleFormFieldsCollapse(o, n) {
-    const { rows: r, rowOrder: i } = this.getFullLayout();
+    const { rows: r, rowOrder: i, layout: a } = this.getFullLayout();
     if (!o) {
-      this.setProps("rows", r), this.setProps("rowOrder", i);
+      const u = this.fullLayoutBeforeCollapse || a;
+      u ? this.syncLayoutProps(u) : (this.setProps("rows", r), this.setProps("rowOrder", i)), this.fullLayoutBeforeCollapse = void 0;
       return;
     }
-    const a = this.limitRowsByVisibleCount(r, i, n);
-    this.setProps("rows", a), this.setProps("rowOrder", i);
+    this.fullLayoutBeforeCollapse || (this.fullLayoutBeforeCollapse = a || normalizeGridLayout({
+      rows: r,
+      rowOrder: i,
+      itemUids: this.getItemUids()
+    }));
+    const l = this.limitRowsByVisibleCount(r, i, n), c = normalizeGridLayout({
+      rows: l,
+      rowOrder: i
+    });
+    this.syncLayoutProps(c), this.setProps("rowOrder", i);
   }
   onModelCreated(o) {
     return L(this, null, function* () {
@@ -92313,7 +92538,13 @@ class TableBlockModel extends CollectionBlockModel {
                       onSuccess: (y) => {
                         var F;
                         const b = this.collection.getField(u);
-                        l[u] = y[u], setNestedValue(this.resource.getData(), c, l);
+                        if (l[u] = y[u], typeof c == "number")
+                          this.resource.setItem(c, l);
+                        else {
+                          const P = _.cloneDeep(this.resource.getData());
+                          setNestedValue(P, c, l), this.resource.setData(P);
+                        }
+                        this.resource.emit("refresh");
                         const S = p.subModels.field.createFork({}, `${c}`), C = createCurrentRecordMetaFactory(
                           S.context,
                           () => S.context.collection
@@ -92982,6 +93213,23 @@ TableJSFieldItemModel.define({
   // 提高排序到“字段类”列表的靠前位置，但不抢默认项
   sort: 110
 });
+function getRecordRenderSignature(e) {
+  if (!e || typeof e != "object")
+    return String(e);
+  try {
+    const t = /* @__PURE__ */ new WeakSet();
+    return JSON.stringify(e, (o, n) => {
+      if (n && typeof n == "object") {
+        if (t.has(n))
+          return "[Circular]";
+        t.add(n);
+      }
+      return n;
+    });
+  } catch (t) {
+    return String(e);
+  }
+}
 class JSColumnModel extends TableCustomColumnModel {
   constructor() {
     super(...arguments);
@@ -93045,28 +93293,30 @@ class JSColumnModel extends TableCustomColumnModel {
         /* @__PURE__ */ jsx(Tooltip, { title: this.props.tooltip, children: /* @__PURE__ */ jsx(QuestionCircleOutlined, { style: { cursor: "pointer" } }) })
       ] }) : r,
       render: (i, a, l) => {
-        var m, h, g;
-        const c = (h = (m = this.context.collection) == null ? void 0 : m.getFilterByTK) == null ? void 0 : h.call(m, a), u = (g = c != null ? c : a == null ? void 0 : a.id) != null ? g : l, d = this.createFork({}, String(u)), p = createRecordMetaFactory(
-          () => d.context.collection,
-          d.context.t("Current record"),
-          (f) => {
-            var C, F, P, v;
-            const y = (C = f.collection) == null ? void 0 : C.name, b = (F = f.collection) == null ? void 0 : F.dataSourceKey, S = (v = (P = f.collection) == null ? void 0 : P.getFilterByTK) == null ? void 0 : v.call(P, f.record);
-            if (!(!y || typeof S == "undefined" || S === null))
-              return { collection: y, dataSourceKey: b, filterByTk: S };
+        var g, f, y;
+        const c = (f = (g = this.context.collection) == null ? void 0 : g.getFilterByTK) == null ? void 0 : f.call(g, a), u = (y = c != null ? c : a == null ? void 0 : a.id) != null ? y : l, d = getRecordRenderSignature(a), p = this.createFork({}, String(u));
+        p.__recordRenderSignature !== d && (p.__recordRenderSignature = d, p.invalidateFlowCache("beforeRender"));
+        const h = createRecordMetaFactory(
+          () => p.context.collection,
+          p.context.t("Current record"),
+          (b) => {
+            var P, v, k, I;
+            const S = (P = b.collection) == null ? void 0 : P.name, C = (v = b.collection) == null ? void 0 : v.dataSourceKey, F = (I = (k = b.collection) == null ? void 0 : k.getFilterByTK) == null ? void 0 : I.call(k, b.record);
+            if (!(!S || typeof F == "undefined" || F === null))
+              return { collection: S, dataSourceKey: C, filterByTk: F };
           }
         );
-        return d.context.defineProperty("record", {
+        return p.context.defineProperty("record", {
           get: () => a,
           cache: !1,
           resolveOnServer: createRecordResolveOnServerWithLocal(
-            () => d.context.collection,
+            () => p.context.collection,
             () => a
           ),
-          meta: p
-        }), d.context.defineProperty("recordIndex", {
+          meta: h
+        }), p.context.defineProperty("recordIndex", {
           get: () => l
-        }), /* @__PURE__ */ jsx(MemoFlowModelRenderer, { model: d }, d.uid);
+        }), /* @__PURE__ */ jsx(MemoFlowModelRenderer, { model: p }, `${p.uid}:${d}`);
       }
     });
   }
@@ -93169,7 +93419,11 @@ JSColumnModel.registerFlow({
           }
           e.onRefReady(e.ref, (u) => L(this, null, function* () {
             e.defineProperty("element", {
-              get: () => new ElementProxy(u)
+              get: () => {
+                var p;
+                return new ElementProxy(((p = e.ref) == null ? void 0 : p.current) || u);
+              },
+              cache: !1
             });
             const d = createSafeNavigator();
             yield e.runjs(
@@ -94699,8 +94953,11 @@ class JSFieldModel extends FieldModel {
   constructor() {
     super(...arguments);
     R(this, "_mountedOnce", !1);
+    // prevent first-mount double-run
+    R(this, "_lastRenderedElement");
+    R(this, "_pendingRenderedElement");
+    R(this, "_lastRunJs");
   }
-  // prevent first-mount double-run
   getInputArgs() {
     var n, r, i, a, l, c;
     const o = this.context.collectionField;
@@ -94723,18 +94980,41 @@ class JSFieldModel extends FieldModel {
    * 说明：fork 实例在表格逐行渲染时会复用该逻辑，确保按值更新。
    */
   useHooksBeforeRender() {
-    var r;
-    const o = (r = this.getStepParams("jsSettings", "runJs")) == null ? void 0 : r.code, n = useRef(null);
+    var n;
+    const o = (n = this.getStepParams("jsSettings", "runJs")) == null ? void 0 : n.code;
     useEffect(() => {
-      const i = this.props.value, a = (typeof o == "string" && o.trim().length ? o : DEFAULT_CODE$1).trim(), l = n.current;
-      l && l.code === a && l.value === i || (n.current = { code: a, value: i }, this.applyFlow("jsSettings"));
+      var r;
+      this.refreshRenderedElement((r = this.context.ref) == null ? void 0 : r.current);
     }, [o, this.props.value]);
   }
   /**
    * 渲染一个占位容器，供 JS 脚本写入内容
    */
+  getRunJsCode() {
+    var n;
+    const o = (n = this.getStepParams("jsSettings", "runJs")) == null ? void 0 : n.code;
+    return (typeof o == "string" && o.trim().length ? o : DEFAULT_CODE$1).trim();
+  }
+  refreshRenderedElement(o) {
+    if (!o || this._pendingRenderedElement === o)
+      return;
+    this._pendingRenderedElement = o;
+    const n = this.context.ref;
+    queueMicrotask(() => {
+      if (this._pendingRenderedElement === o && (this._pendingRenderedElement = null), n.current !== o)
+        return;
+      const r = this.getRunJsCode(), i = this.props.value, a = this._lastRunJs;
+      a && a.element === o && a.code === r && Object.is(a.value, i) || (this._lastRunJs = { code: r, value: i, element: o }, this.applyFlow("jsSettings"));
+    });
+  }
   render() {
-    return /* @__PURE__ */ jsx("span", { ref: this.context.ref, style: { display: "inline-block", maxWidth: "100%" } });
+    const o = this.context.ref;
+    return /* @__PURE__ */ jsx("span", { ref: (r) => {
+      if (o.current = r, !r)
+        return;
+      const i = this._lastRenderedElement && this._lastRenderedElement !== r;
+      this._lastRenderedElement = r, (i || !this._mountedOnce) && this.refreshRenderedElement(r);
+    }, style: { display: "inline-block", maxWidth: "100%" } });
   }
   /**
    * 组件挂载后，如果容器引用已就绪，强制重跑一次 beforeRender flows 以把 HTML 写入当前 DOM。
@@ -94742,7 +95022,7 @@ class JSFieldModel extends FieldModel {
    */
   onMount() {
     var o;
-    this._mountedOnce && (o = this.context.ref) != null && o.current && this.rerender(), this._mountedOnce = !0;
+    this._mountedOnce && (o = this.context.ref) != null && o.current && this.refreshRenderedElement(this.context.ref.current), this._mountedOnce = !0;
   }
 }
 JSFieldModel.define({
@@ -94796,7 +95076,11 @@ JSFieldModel.registerFlow({
           const { code: o, version: n } = resolveRunJsParams(e, t);
           e.onRefReady(e.ref, (r) => L(this, null, function* () {
             e.defineProperty("element", {
-              get: () => new ElementProxy(r)
+              get: () => {
+                var a;
+                return new ElementProxy(((a = e.ref) == null ? void 0 : a.current) || r);
+              },
+              cache: !1
             }), e.defineProperty("value", {
               get: () => {
                 var a;
@@ -97457,17 +97741,18 @@ const setTargetDataScope = defineAction({
       filter: { logic: "$and", items: [] }
     };
   },
+  useRawParams: !0,
   handler(e, t) {
     return L(this, null, function* () {
-      const o = t.targetBlockUid;
-      if (!o)
+      const o = yield e.resolveJsonTemplate(t), n = o.targetBlockUid;
+      if (!n)
         return;
-      e.model.scheduleModelOperation(o, (r) => {
-        const i = r.resource;
-        if (!i)
+      e.model.scheduleModelOperation(n, (i) => {
+        const a = i.resource;
+        if (!a)
           return;
-        const a = pruneFilter(transformFilter(t.filter));
-        isEmptyFilter(a) ? i.removeFilterGroup(`setTargetDataScope_${e.model.uid}`) : i.addFilterGroup(`setTargetDataScope_${e.model.uid}`, a), i.hasData() && i.refresh();
+        const l = normalizeDataScopeFilter(t.filter, o.filter);
+        isEmptyFilter(l) ? a.removeFilterGroup(`setTargetDataScope_${e.model.uid}`) : a.addFilterGroup(`setTargetDataScope_${e.model.uid}`, l), a.hasData() && a.refresh();
       });
     });
   }
@@ -101589,7 +101874,7 @@ const DefaultValue = connect((e) => {
   }, [l, r]), f = React.useRef(void 0);
   isEqual(f.current, g) || (f.current = g);
   const y = f.current, b = useMemo(() => {
-    var de, he, ye, Ce, me, ae, ce, ge, xe, Se, ke, Ie, be, we, je, Ee, ve, Fe, Me, Pe, Oe, _e, Le, Re, Ae, ze, De, qe;
+    var de, he, ye, Ce, me, ae, ce, ge, xe, Se, ke, Ie, be, we, je, Ee, ve, Fe, Me, Pe, Oe, Ve, Le, Re, Ae, ze, De, qe;
     const k = l, I = (k == null ? void 0 : k.customFieldModelInstance) || ((de = k == null ? void 0 : k.subModels) == null ? void 0 : de.field), T = (I == null ? void 0 : I.props) || {}, E = (k == null ? void 0 : k.customFieldProps) || {}, fe = T, { value: N, defaultValue: j } = fe, M = te(fe, ["value", "defaultValue"]), pe = E, {
       value: w,
       defaultValue: B
@@ -101622,8 +101907,8 @@ const DefaultValue = connect((e) => {
       subModels: { fields: [le] }
     }), ie = (Ee = (je = ue.subModels) == null ? void 0 : je.fields) == null ? void 0 : Ee[0];
     if (ie && (ie._originalModel = I, ie._originalPropsFallback = k == null ? void 0 : k.customFieldProps, ie._fallbackCollectionField = (ve = k == null ? void 0 : k.context) == null ? void 0 : ve.collectionField, ie._originalOptionsFallback = snapshotOptions((Fe = I == null ? void 0 : I.getDataSource) == null ? void 0 : Fe.call(I)) || snapshotOptions((Me = I == null ? void 0 : I.props) == null ? void 0 : Me.options) || snapshotOptions((Pe = k == null ? void 0 : k.customFieldProps) == null ? void 0 : Pe.options)), D != null && D.dataSourceKey && (D != null && D.collectionName)) {
-      const Te = l.context.dataSourceManager, Ve = (Oe = Te == null ? void 0 : Te.getDataSource) == null ? void 0 : Oe.call(Te, D.dataSourceKey), Ue = (_e = Te == null ? void 0 : Te.getCollection) == null ? void 0 : _e.call(Te, D.dataSourceKey, D.collectionName);
-      Ve && ((Re = (Le = ue.context) == null ? void 0 : Le.defineProperty) == null || Re.call(Le, "dataSource", { get: () => Ve })), Ue && ((ze = (Ae = ue.context) == null ? void 0 : Ae.defineProperty) == null || ze.call(Ae, "collection", { get: () => Ue }));
+      const Te = l.context.dataSourceManager, _e = (Oe = Te == null ? void 0 : Te.getDataSource) == null ? void 0 : Oe.call(Te, D.dataSourceKey), Ue = (Ve = Te == null ? void 0 : Te.getCollection) == null ? void 0 : Ve.call(Te, D.dataSourceKey, D.collectionName);
+      _e && ((Re = (Le = ue.context) == null ? void 0 : Le.defineProperty) == null || Re.call(Le, "dataSource", { get: () => _e })), Ue && ((ze = (Ae = ue.context) == null ? void 0 : Ae.defineProperty) == null || ze.call(Ae, "collection", { get: () => Ue }));
     }
     return y && ((qe = (De = ue.context) == null ? void 0 : De.defineProperty) == null || qe.call(De, "flags", { value: y })), ue;
   }, [l, y]);