@nocobase/plugin-flow-engine 2.1.0-alpha.25 → 2.1.0-alpha.26

package/dist/externalVersion.js

@@ -8,16 +8,16 @@
  */
 
 module.exports = {
-  "@nocobase/client": "2.1.0-alpha.25",
+  "@nocobase/client": "2.1.0-alpha.26",
   "lodash": "4.18.1",
-  "@nocobase/database": "2.1.0-alpha.25",
-  "@nocobase/data-source-manager": "2.1.0-alpha.25",
-  "@nocobase/resourcer": "2.1.0-alpha.25",
-  "@nocobase/utils": "2.1.0-alpha.25",
-  "@nocobase/cache": "2.1.0-alpha.25",
-  "@nocobase/plugin-localization": "2.1.0-alpha.25",
-  "@nocobase/server": "2.1.0-alpha.25",
-  "@nocobase/actions": "2.1.0-alpha.25",
+  "@nocobase/database": "2.1.0-alpha.26",
+  "@nocobase/data-source-manager": "2.1.0-alpha.26",
+  "@nocobase/resourcer": "2.1.0-alpha.26",
+  "@nocobase/utils": "2.1.0-alpha.26",
+  "@nocobase/cache": "2.1.0-alpha.26",
+  "@nocobase/plugin-localization": "2.1.0-alpha.26",
+  "@nocobase/server": "2.1.0-alpha.26",
+  "@nocobase/actions": "2.1.0-alpha.26",
   "@formily/json-schema": "2.3.7",
-  "@nocobase/ai": "2.1.0-alpha.25"
+  "@nocobase/ai": "2.1.0-alpha.26"
 };

package/dist/node_modules/ses/package.json

@@ -1 +1 @@
-{"name":"ses","version":"1.14.0","description":"Hardened JavaScript for Fearless Cooperation","keywords":["lockdown","harden","Compartment","assert","security","confinement","isolation","object capabilities","ocaps","secure execution","third-party code","prototype pollution","supply-chain attack","plugin"],"author":"Agoric","license":"Apache-2.0","homepage":"https://github.com/Agoric/SES-shim/tree/master/packages/ses#readme","repository":{"type":"git","url":"git+https://github.com/endojs/endo.git","directory":"packages/ses"},"bugs":{"url":"https://github.com/endojs/endo/issues"},"type":"module","main":"./dist/ses.cjs","module":"./index.js","unpkg":"./dist/ses.umd.js","types":"./types.d.ts","exports":{".":{"import":{"types":"./types.d.ts","xs":"./src-xs/index.js","default":"./index.js"},"require":{"types":"./dist/types.d.cts","default":"./dist/ses.cjs"}},"./lockdown":{"import":{"types":"./types.d.ts","default":"./index.js"},"require":{"types":"./dist/types.d.cts","default":"./dist/ses.cjs"}},"./hermes":{"require":{"types":"./dist/types.d.cts","default":"./dist/ses-hermes.cjs"}},"./tools.js":"./tools.js","./assert-shim.js":"./assert-shim.js","./lockdown-shim.js":{"xs":"./src-xs/lockdown-shim.js","default":"./lockdown-shim.js"},"./compartment-shim.js":{"xs":"./src-xs/compartment-shim.js","default":"./compartment-shim.js"},"./console-shim.js":"./console-shim.js","./package.json":"./package.json"},"scripts":{"build:vanilla":"node scripts/bundle.js","build:hermes":"node scripts/bundle.js hermes","build":"yarn build:vanilla && yarn build:hermes","clean":"rm -rf dist","cover":"c8 ava","demo":"python3 -m http.server","lint":"yarn lint:types && yarn lint:eslint","lint-fix":"eslint --fix .","lint:eslint":"eslint .","lint:types":"tsc","prepare":"npm run clean && npm run build","qt":"ava","test":"tsd && ava","test:hermes":"./scripts/hermes-test.sh","test:xs":"xst dist/ses.umd.js test/_lockdown-safe.js && node scripts/generate-test-xs.js && xst tmp/test-xs.js && rm -rf tmp","postpack":"git clean -fX \"*.d.ts*\" \"*.d.cts*\" \"*.d.mts*\" \"*.tsbuildinfo\""},"dependencies":{"@endo/cache-map":"^1.1.0","@endo/env-options":"^1.1.11","@endo/immutable-arraybuffer":"^1.1.2"},"devDependencies":{"@babel/generator":"^7.26.3","@babel/parser":"~7.26.2","@babel/traverse":"~7.25.9","@babel/types":"~7.26.0","@endo/compartment-mapper":"^1.6.3","@endo/module-source":"^1.3.3","@endo/test262-runner":"^0.1.48","@types/babel__traverse":"^7.20.5","ava":"^6.1.3","babel-eslint":"^10.1.0","c8":"^7.14.0","core-js":"^3.31.0","eslint":"^8.57.1","eslint-config-airbnb-base":"^15.0.0","eslint-config-prettier":"^9.1.0","eslint-plugin-eslint-comments":"^3.2.0","eslint-plugin-import":"^2.31.0","hermes-engine-cli":"^0.12.0","prettier":"^3.5.3","terser":"^5.16.6","tsd":"^0.31.2","typescript":"~5.8.3"},"files":["./*.d.ts","./*.js","./*.map","LICENSE*","SECURITY*","dist","lib","src","tools"],"publishConfig":{"access":"public"},"eslintConfig":{"extends":["plugin:@endo/ses"]},"ava":{"files":["test/**/*.test.*"],"timeout":"2m"},"typeCoverage":{"atLeast":81.17},"gitHead":"9815aea9541f241389d2135c6097a7442bdffa17","_lastModified":"2026-04-27T22:04:16.306Z"}
+{"name":"ses","version":"1.14.0","description":"Hardened JavaScript for Fearless Cooperation","keywords":["lockdown","harden","Compartment","assert","security","confinement","isolation","object capabilities","ocaps","secure execution","third-party code","prototype pollution","supply-chain attack","plugin"],"author":"Agoric","license":"Apache-2.0","homepage":"https://github.com/Agoric/SES-shim/tree/master/packages/ses#readme","repository":{"type":"git","url":"git+https://github.com/endojs/endo.git","directory":"packages/ses"},"bugs":{"url":"https://github.com/endojs/endo/issues"},"type":"module","main":"./dist/ses.cjs","module":"./index.js","unpkg":"./dist/ses.umd.js","types":"./types.d.ts","exports":{".":{"import":{"types":"./types.d.ts","xs":"./src-xs/index.js","default":"./index.js"},"require":{"types":"./dist/types.d.cts","default":"./dist/ses.cjs"}},"./lockdown":{"import":{"types":"./types.d.ts","default":"./index.js"},"require":{"types":"./dist/types.d.cts","default":"./dist/ses.cjs"}},"./hermes":{"require":{"types":"./dist/types.d.cts","default":"./dist/ses-hermes.cjs"}},"./tools.js":"./tools.js","./assert-shim.js":"./assert-shim.js","./lockdown-shim.js":{"xs":"./src-xs/lockdown-shim.js","default":"./lockdown-shim.js"},"./compartment-shim.js":{"xs":"./src-xs/compartment-shim.js","default":"./compartment-shim.js"},"./console-shim.js":"./console-shim.js","./package.json":"./package.json"},"scripts":{"build:vanilla":"node scripts/bundle.js","build:hermes":"node scripts/bundle.js hermes","build":"yarn build:vanilla && yarn build:hermes","clean":"rm -rf dist","cover":"c8 ava","demo":"python3 -m http.server","lint":"yarn lint:types && yarn lint:eslint","lint-fix":"eslint --fix .","lint:eslint":"eslint .","lint:types":"tsc","prepare":"npm run clean && npm run build","qt":"ava","test":"tsd && ava","test:hermes":"./scripts/hermes-test.sh","test:xs":"xst dist/ses.umd.js test/_lockdown-safe.js && node scripts/generate-test-xs.js && xst tmp/test-xs.js && rm -rf tmp","postpack":"git clean -fX \"*.d.ts*\" \"*.d.cts*\" \"*.d.mts*\" \"*.tsbuildinfo\""},"dependencies":{"@endo/cache-map":"^1.1.0","@endo/env-options":"^1.1.11","@endo/immutable-arraybuffer":"^1.1.2"},"devDependencies":{"@babel/generator":"^7.26.3","@babel/parser":"~7.26.2","@babel/traverse":"~7.25.9","@babel/types":"~7.26.0","@endo/compartment-mapper":"^1.6.3","@endo/module-source":"^1.3.3","@endo/test262-runner":"^0.1.48","@types/babel__traverse":"^7.20.5","ava":"^6.1.3","babel-eslint":"^10.1.0","c8":"^7.14.0","core-js":"^3.31.0","eslint":"^8.57.1","eslint-config-airbnb-base":"^15.0.0","eslint-config-prettier":"^9.1.0","eslint-plugin-eslint-comments":"^3.2.0","eslint-plugin-import":"^2.31.0","hermes-engine-cli":"^0.12.0","prettier":"^3.5.3","terser":"^5.16.6","tsd":"^0.31.2","typescript":"~5.8.3"},"files":["./*.d.ts","./*.js","./*.map","LICENSE*","SECURITY*","dist","lib","src","tools"],"publishConfig":{"access":"public"},"eslintConfig":{"extends":["plugin:@endo/ses"]},"ava":{"files":["test/**/*.test.*"],"timeout":"2m"},"typeCoverage":{"atLeast":81.17},"gitHead":"9815aea9541f241389d2135c6097a7442bdffa17","_lastModified":"2026-04-28T15:18:48.914Z"}

package/dist/node_modules/zod/package.json

@@ -1 +1 @@
-{"name":"zod","version":"4.3.5","type":"module","license":"MIT","author":"Colin McDonnell <zod@colinhacks.com>","description":"TypeScript-first schema declaration and validation library with static type inference","homepage":"https://zod.dev","llms":"https://zod.dev/llms.txt","llmsFull":"https://zod.dev/llms-full.txt","mcpServer":"https://mcp.inkeep.com/zod/mcp","funding":"https://github.com/sponsors/colinhacks","sideEffects":false,"files":["src","**/*.js","**/*.mjs","**/*.cjs","**/*.d.ts","**/*.d.mts","**/*.d.cts","**/package.json"],"keywords":["typescript","schema","validation","type","inference"],"main":"./index.cjs","types":"./index.d.cts","module":"./index.js","zshy":{"exports":{"./package.json":"./package.json",".":"./src/index.ts","./mini":"./src/mini/index.ts","./locales":"./src/locales/index.ts","./v3":"./src/v3/index.ts","./v4":"./src/v4/index.ts","./v4-mini":"./src/v4-mini/index.ts","./v4/mini":"./src/v4/mini/index.ts","./v4/core":"./src/v4/core/index.ts","./v4/locales":"./src/v4/locales/index.ts","./v4/locales/*":"./src/v4/locales/*"},"conditions":{"@zod/source":"src"}},"exports":{"./package.json":"./package.json",".":{"@zod/source":"./src/index.ts","types":"./index.d.cts","import":"./index.js","require":"./index.cjs"},"./mini":{"@zod/source":"./src/mini/index.ts","types":"./mini/index.d.cts","import":"./mini/index.js","require":"./mini/index.cjs"},"./locales":{"@zod/source":"./src/locales/index.ts","types":"./locales/index.d.cts","import":"./locales/index.js","require":"./locales/index.cjs"},"./v3":{"@zod/source":"./src/v3/index.ts","types":"./v3/index.d.cts","import":"./v3/index.js","require":"./v3/index.cjs"},"./v4":{"@zod/source":"./src/v4/index.ts","types":"./v4/index.d.cts","import":"./v4/index.js","require":"./v4/index.cjs"},"./v4-mini":{"@zod/source":"./src/v4-mini/index.ts","types":"./v4-mini/index.d.cts","import":"./v4-mini/index.js","require":"./v4-mini/index.cjs"},"./v4/mini":{"@zod/source":"./src/v4/mini/index.ts","types":"./v4/mini/index.d.cts","import":"./v4/mini/index.js","require":"./v4/mini/index.cjs"},"./v4/core":{"@zod/source":"./src/v4/core/index.ts","types":"./v4/core/index.d.cts","import":"./v4/core/index.js","require":"./v4/core/index.cjs"},"./v4/locales":{"@zod/source":"./src/v4/locales/index.ts","types":"./v4/locales/index.d.cts","import":"./v4/locales/index.js","require":"./v4/locales/index.cjs"},"./v4/locales/*":{"@zod/source":"./src/v4/locales/*","types":"./v4/locales/*","import":"./v4/locales/*","require":"./v4/locales/*"}},"repository":{"type":"git","url":"git+https://github.com/colinhacks/zod.git"},"bugs":{"url":"https://github.com/colinhacks/zod/issues"},"support":{"backing":{"npm-funding":true}},"scripts":{"clean":"git clean -xdf . -e node_modules","build":"zshy --project tsconfig.build.json","postbuild":"tsx ../../scripts/write-stub-package-jsons.ts && pnpm biome check --write .","test:watch":"pnpm vitest","test":"pnpm vitest run","prepublishOnly":"tsx ../../scripts/check-versions.ts"},"_lastModified":"2026-04-27T22:04:17.394Z"}
+{"name":"zod","version":"4.3.5","type":"module","license":"MIT","author":"Colin McDonnell <zod@colinhacks.com>","description":"TypeScript-first schema declaration and validation library with static type inference","homepage":"https://zod.dev","llms":"https://zod.dev/llms.txt","llmsFull":"https://zod.dev/llms-full.txt","mcpServer":"https://mcp.inkeep.com/zod/mcp","funding":"https://github.com/sponsors/colinhacks","sideEffects":false,"files":["src","**/*.js","**/*.mjs","**/*.cjs","**/*.d.ts","**/*.d.mts","**/*.d.cts","**/package.json"],"keywords":["typescript","schema","validation","type","inference"],"main":"./index.cjs","types":"./index.d.cts","module":"./index.js","zshy":{"exports":{"./package.json":"./package.json",".":"./src/index.ts","./mini":"./src/mini/index.ts","./locales":"./src/locales/index.ts","./v3":"./src/v3/index.ts","./v4":"./src/v4/index.ts","./v4-mini":"./src/v4-mini/index.ts","./v4/mini":"./src/v4/mini/index.ts","./v4/core":"./src/v4/core/index.ts","./v4/locales":"./src/v4/locales/index.ts","./v4/locales/*":"./src/v4/locales/*"},"conditions":{"@zod/source":"src"}},"exports":{"./package.json":"./package.json",".":{"@zod/source":"./src/index.ts","types":"./index.d.cts","import":"./index.js","require":"./index.cjs"},"./mini":{"@zod/source":"./src/mini/index.ts","types":"./mini/index.d.cts","import":"./mini/index.js","require":"./mini/index.cjs"},"./locales":{"@zod/source":"./src/locales/index.ts","types":"./locales/index.d.cts","import":"./locales/index.js","require":"./locales/index.cjs"},"./v3":{"@zod/source":"./src/v3/index.ts","types":"./v3/index.d.cts","import":"./v3/index.js","require":"./v3/index.cjs"},"./v4":{"@zod/source":"./src/v4/index.ts","types":"./v4/index.d.cts","import":"./v4/index.js","require":"./v4/index.cjs"},"./v4-mini":{"@zod/source":"./src/v4-mini/index.ts","types":"./v4-mini/index.d.cts","import":"./v4-mini/index.js","require":"./v4-mini/index.cjs"},"./v4/mini":{"@zod/source":"./src/v4/mini/index.ts","types":"./v4/mini/index.d.cts","import":"./v4/mini/index.js","require":"./v4/mini/index.cjs"},"./v4/core":{"@zod/source":"./src/v4/core/index.ts","types":"./v4/core/index.d.cts","import":"./v4/core/index.js","require":"./v4/core/index.cjs"},"./v4/locales":{"@zod/source":"./src/v4/locales/index.ts","types":"./v4/locales/index.d.cts","import":"./v4/locales/index.js","require":"./v4/locales/index.cjs"},"./v4/locales/*":{"@zod/source":"./src/v4/locales/*","types":"./v4/locales/*","import":"./v4/locales/*","require":"./v4/locales/*"}},"repository":{"type":"git","url":"git+https://github.com/colinhacks/zod.git"},"bugs":{"url":"https://github.com/colinhacks/zod/issues"},"support":{"backing":{"npm-funding":true}},"scripts":{"clean":"git clean -xdf . -e node_modules","build":"zshy --project tsconfig.build.json","postbuild":"tsx ../../scripts/write-stub-package-jsons.ts && pnpm biome check --write .","test:watch":"pnpm vitest","test":"pnpm vitest run","prepublishOnly":"tsx ../../scripts/check-versions.ts"},"_lastModified":"2026-04-28T15:18:49.983Z"}

package/dist/server/flow-surfaces/blueprint/compile-blocks.js

@@ -800,6 +800,60 @@ function resolveTargetBlockKey(value, localBlockKeys, context) {
   }
   (0, import_errors.throwBadRequest)(`${context} must be a string block key`);
 }
+function collectTreeConnectTargetKeys(settings, context) {
+  if (!import_lodash.default.isPlainObject(settings == null ? void 0 : settings.connectFields)) {
+    return [];
+  }
+  if (import_lodash.default.isUndefined(settings.connectFields.targets)) {
+    return [];
+  }
+  if (!Array.isArray(settings.connectFields.targets)) {
+    (0, import_errors.throwBadRequest)(`${context}.settings.connectFields.targets must be an array`);
+  }
+  const seenTargets = /* @__PURE__ */ new Set();
+  return settings.connectFields.targets.map((target, targetIndex) => {
+    if (!import_lodash.default.isPlainObject(target)) {
+      (0, import_errors.throwBadRequest)(`${context}.settings.connectFields.targets[${targetIndex}] must be an object`);
+    }
+    if (import_lodash.default.isUndefined(target.target) || target.target === null || target.target === "") {
+      return "";
+    }
+    if (typeof target.target !== "string") {
+      (0, import_errors.throwBadRequest)(`${context}.settings.connectFields.targets[${targetIndex}].target must be a string block key`);
+    }
+    const normalizedTarget = (0, import_service_utils.normalizeFlowSurfaceComposeKey)(
+      target.target,
+      `${context}.settings.connectFields.targets[${targetIndex}].target`
+    );
+    if (seenTargets.has(normalizedTarget)) {
+      (0, import_errors.throwBadRequest)(
+        `${context}.settings.connectFields.targets[${targetIndex}].target duplicate target '${normalizedTarget}' in tree connectFields`
+      );
+    }
+    seenTargets.add(normalizedTarget);
+    return normalizedTarget;
+  }).filter(Boolean);
+}
+function compileTreeConnectSettingsTargets(settings, localBlockKeys, context) {
+  if (!import_lodash.default.isPlainObject(settings == null ? void 0 : settings.connectFields) || !Array.isArray(settings.connectFields.targets)) {
+    return settings;
+  }
+  const nextSettings = import_lodash.default.cloneDeep(settings);
+  nextSettings.connectFields.targets = nextSettings.connectFields.targets.map((target, targetIndex) => {
+    if (!import_lodash.default.isPlainObject(target) || import_lodash.default.isUndefined(target.target) || target.target === null || target.target === "") {
+      return target;
+    }
+    return {
+      ...target,
+      target: resolveTargetBlockKey(
+        target.target,
+        localBlockKeys,
+        `${context}.settings.connectFields.targets[${targetIndex}].target`
+      )
+    };
+  });
+  return nextSettings;
+}
 function compileField(input, index, scopePrefix, assets, localBlockKeys, context, popupDefaultsMetadata, defaults) {
   if (typeof input === "string") {
     const fieldPath2 = (0, import_private_utils.assertNonEmptyString)(input, `${context}[${index}]`);
@@ -919,6 +973,9 @@ function compileBlocks(input, scopePrefix, assets, context, defaults, requiredEx
     assertApplyBlueprintKanbanMainContent(block, `${context}[${index}]`);
     assertApplyBlueprintTreeMainContent(block, `${context}[${index}]`);
     const fields = resolveBlockFieldInputs(block, `${context}[${index}]`);
+    collectTreeConnectTargetKeys(block.settings, `${context}[${index}]`).forEach((targetKey) => {
+      referencedBlockKeys.add(targetKey);
+    });
     fields.forEach((field, fieldIndex) => {
       if (typeof (field == null ? void 0 : field.target) !== "string" || !field.target.trim()) {
         return;
@@ -1032,7 +1089,7 @@ function compileBlocks(input, scopePrefix, assets, context, defaults, requiredEx
       type: blockType,
       resource: buildBlockResource(block, blockContext),
       template,
-      settings: Object.keys(settings).length ? settings : void 0,
+      settings: Object.keys(settings).length ? compileTreeConnectSettingsTargets(settings, blockKeysByLocalKey, blockContext) : void 0,
       fields: blockType === "calendar" || blockType === "tree" ? void 0 : fields,
       fieldsLayout: blockType === "calendar" || blockType === "kanban" || blockType === "tree" ? void 0 : fieldsLayout,
       actions: blockType === "tree" ? void 0 : actionsWithDefaultFilter,

package/dist/server/flow-surfaces/builder.js

@@ -1030,6 +1030,24 @@ function buildBlockDefaults(use) {
         defaultView: "month",
         enableQuickCreateEvent: true,
         weekStart: 1
+      },
+      stepParams: {
+        cardSettings: {
+          blockHeight: {
+            heightMode: "fullHeight"
+          }
+        }
+      }
+    };
+  }
+  if (use === "KanbanBlockModel") {
+    return {
+      stepParams: {
+        cardSettings: {
+          blockHeight: {
+            heightMode: "fullHeight"
+          }
+        }
       }
     };
   }

package/dist/server/flow-surfaces/catalog.js

@@ -72,6 +72,10 @@ const OPEN_VIEW_SCENE_SCHEMA = {
 const OBJECT_SCHEMA = { type: "object" };
 const NUMBER_SCHEMA = { type: "number" };
 const ARRAY_SCHEMA = { type: "array" };
+const BLOCK_HEIGHT_MODE_SCHEMA = {
+  type: "string",
+  enum: ["defaultHeight", "specifyValue", "fullHeight"]
+};
 const NULLABLE_NUMBER_OR_STRING_SCHEMA = {
   oneOf: [NUMBER_SCHEMA, NULLABLE_STRING_SCHEMA]
 };
@@ -295,13 +299,21 @@ const FILTER_FORM_BLOCK_SETTINGS_GROUP = {
   }
 };
 const BLOCK_CARD_SETTINGS_GROUP = {
-  allowedPaths: ["titleDescription.title", "titleDescription.description", "linkageRules"],
+  allowedPaths: [
+    "titleDescription.title",
+    "titleDescription.description",
+    "blockHeight.heightMode",
+    "blockHeight.height",
+    "linkageRules"
+  ],
   clearable: true,
   mergeStrategy: "deep",
-  eventBindingSteps: ["titleDescription", "linkageRules"],
+  eventBindingSteps: ["titleDescription", "blockHeight", "linkageRules"],
   pathSchemas: {
     "titleDescription.title": STRING_SCHEMA,
     "titleDescription.description": STRING_SCHEMA,
+    "blockHeight.heightMode": BLOCK_HEIGHT_MODE_SCHEMA,
+    "blockHeight.height": NUMBER_SCHEMA,
     linkageRules: ARRAY_SCHEMA
   }
 };
@@ -833,8 +845,6 @@ TAB_NODE_CONTRACT.domains.stepParams = groupedDomain({
 });
 const TABLE_BLOCK_CONTRACT = createContract({
   editableDomains: ["props", "decoratorProps", "stepParams", "flowRegistry"],
-  props: ["height", "heightMode"],
-  decoratorProps: ["height", "heightMode"],
   stepParams: ["resourceSettings", "tableSettings", "cardSettings"],
   flowRegistry: true,
   eventCapabilities: {
@@ -942,7 +952,6 @@ const CALENDAR_BLOCK_CONTRACT = createContract({
     "quickCreatePopupSettings",
     "eventPopupSettings"
   ],
-  decoratorProps: ["height", "heightMode"],
   stepParams: ["resourceSettings", "calendarSettings", "cardSettings"],
   flowRegistry: true,
   eventCapabilities: {
@@ -958,7 +967,6 @@ CALENDAR_BLOCK_CONTRACT.domains.stepParams = groupedDomain({
 const TREE_BLOCK_CONTRACT = createContract({
   editableDomains: ["props", "decoratorProps", "stepParams", "flowRegistry"],
   props: ["searchable", "defaultExpandAll", "includeDescendants", "fieldNames", "pageSize"],
-  decoratorProps: ["height", "heightMode"],
   stepParams: ["resourceSettings", "treeSettings", "cardSettings"],
   flowRegistry: true,
   eventCapabilities: {
@@ -997,7 +1005,6 @@ const KANBAN_BLOCK_CONTRACT = createContract({
     "pageSize",
     "columnWidth"
   ],
-  decoratorProps: ["height", "heightMode"],
   stepParams: ["resourceSettings", "kanbanSettings", "cardSettings"],
   flowRegistry: true,
   eventCapabilities: {
@@ -1013,7 +1020,6 @@ KANBAN_BLOCK_CONTRACT.domains.stepParams = groupedDomain({
 const LIST_BLOCK_CONTRACT = createContract({
   editableDomains: ["props", "decoratorProps", "stepParams", "flowRegistry"],
   props: [],
-  decoratorProps: ["height", "heightMode"],
   stepParams: ["resourceSettings", "listSettings", "cardSettings"],
   flowRegistry: true,
   eventCapabilities: {
@@ -1053,7 +1059,6 @@ LIST_BLOCK_CONTRACT.domains.stepParams = groupedDomain({
 const GRID_CARD_BLOCK_CONTRACT = createContract({
   editableDomains: ["props", "decoratorProps", "stepParams", "flowRegistry"],
   props: [],
-  decoratorProps: ["height", "heightMode"],
   stepParams: ["resourceSettings", "GridCardSettings", "cardSettings"],
   flowRegistry: true,
   eventCapabilities: {
@@ -1217,22 +1222,12 @@ IFRAME_BLOCK_CONTRACT.domains.stepParams = groupedDomain({
   }
 });
 const CHART_CARD_SETTINGS_GROUP = {
-  allowedPaths: [
-    "titleDescription.title",
-    "titleDescription.description",
-    "blockHeight.heightMode",
-    "blockHeight.height",
-    "linkageRules"
-  ],
+  allowedPaths: BLOCK_CARD_SETTINGS_GROUP.allowedPaths,
   clearable: true,
   mergeStrategy: "deep",
-  eventBindingSteps: ["titleDescription", "blockHeight", "linkageRules"],
+  eventBindingSteps: BLOCK_CARD_SETTINGS_GROUP.eventBindingSteps,
   pathSchemas: {
-    "titleDescription.title": STRING_SCHEMA,
-    "titleDescription.description": STRING_SCHEMA,
-    "blockHeight.heightMode": STRING_SCHEMA,
-    "blockHeight.height": NUMBER_SCHEMA,
-    linkageRules: ARRAY_SCHEMA
+    ...BLOCK_CARD_SETTINGS_GROUP.pathSchemas
   }
 };
 const CHART_BLOCK_CONTRACT = createContract({
@@ -1294,8 +1289,7 @@ JS_BLOCK_CONTRACT.domains.stepParams = groupedDomain({
 });
 const MAP_BLOCK_CONTRACT = createContract({
   editableDomains: ["props", "decoratorProps", "stepParams", "flowRegistry"],
-  props: ["height", "heightMode", "mapField", "marker", "lineSort", "zoom"],
-  decoratorProps: ["height", "heightMode"],
+  props: ["mapField", "marker", "lineSort", "zoom"],
   stepParams: ["resourceSettings", "createMapBlock", "cardSettings"],
   flowRegistry: true,
   eventCapabilities: {

package/dist/server/flow-surfaces/compose-compiler.d.ts

@@ -113,4 +113,4 @@ export declare function compileComposeExecutionPlan(input: {
     layout?: FlowSurfaceComposeObject;
 }): FlowSurfaceCompiledComposePlan;
 export declare function resolveComposeFieldContainerSource(blockSpec: Pick<FlowSurfaceComposeNormalizedBlockSpec, 'type'>): 'block' | 'item';
-export declare function resolveComposeTargetKey(targetKey: string, keyMap: Record<string, FlowSurfaceComposeTargetKey | undefined>, kind: 'field' | 'layout'): string;
+export declare function resolveComposeTargetKey(targetKey: string, keyMap: Record<string, FlowSurfaceComposeTargetKey | undefined>, kind: 'field' | 'layout' | 'tree connectFields'): string;

package/dist/server/flow-surfaces/compose-runtime.d.ts

@@ -66,6 +66,7 @@ export type FlowSurfaceComposeRuntimeDeps = {
     removeExistingItem?: (uid: string) => Promise<void>;
     createBlock: (payload: Record<string, unknown>, spec: FlowSurfaceComposeNormalizedBlockSpec) => Promise<FlowSurfaceComposeBlockResult>;
     applyNodeSettings?: (actionName: string, targetUid: string | undefined, settings?: FlowSurfaceComposeObject) => Promise<void>;
+    resolveBlockSettings?: (settings: FlowSurfaceComposeObject, state: FlowSurfaceComposeRuntimeState, block: FlowSurfaceComposeRuntimeBlockState) => FlowSurfaceComposeObject | Promise<FlowSurfaceComposeObject>;
     createField: (payload: Record<string, unknown>, spec: FlowSurfaceComposeNormalizedFieldSpec, blockResult: FlowSurfaceComposeBlockResult) => Promise<FlowSurfaceComposeFieldResult | null>;
     applyFieldSettings?: (actionName: string, result: FlowSurfaceComposeFieldResult, settings?: FlowSurfaceComposeObject) => Promise<void>;
     onFieldError?: (input: {

package/dist/server/flow-surfaces/compose-runtime.js

@@ -142,7 +142,8 @@ async function applyBlockSettings(deps, state) {
     if (!hasInlineSettings(block.spec.settings)) {
       continue;
     }
-    await applyNodeSettings("compose block", block.result.uid, block.spec.settings);
+    const settings = deps.resolveBlockSettings ? await deps.resolveBlockSettings(block.spec.settings || {}, state, block) : block.spec.settings;
+    await applyNodeSettings("compose block", block.result.uid, settings);
   }
 }
 async function createFields(plan, deps, state) {

package/dist/server/flow-surfaces/configure-options.js

@@ -80,6 +80,16 @@ const SORTING = arrayOption("Sorting rule array", {
     }
   ]
 });
+const CONNECT_FIELDS = objectOption("Tree connect data block targets", {
+  example: {
+    targets: [
+      {
+        targetId: "target-block-uid",
+        filterPaths: ["id"]
+      }
+    ]
+  }
+});
 const OPEN_VIEW = objectOption("Popup or drawer open configuration", {
   example: {
     dataSourceKey: "main",
@@ -247,7 +257,8 @@ const TREE_OPTIONS = {
   fieldNames: objectOption("Tree field names", { example: { title: "title", key: "id", children: "children" } }),
   pageSize: numberOption("Root records per page", { example: 200 }),
   dataScope: FILTER_GROUP,
-  sorting: SORTING
+  sorting: SORTING,
+  connectFields: CONNECT_FIELDS
 };
 const KANBAN_OPTIONS = {
   ...COMMON_BLOCK_HEADER_OPTIONS,

package/dist/server/flow-surfaces/field-binding-registry.js

@@ -103,7 +103,7 @@ const FIELD_BINDING_RULE_DEFINITIONS = [
   {
     scope: "display",
     modelClassName: "DisplayPreviewFieldModel",
-    interfaces: ["url", "attachment", "attachmentURL", "m2m", "m2o", "o2o", "o2m", "oho", "obo", "mbm"],
+    interfaces: ["attachment", "attachmentURL", "m2m", "m2o", "o2o", "o2m", "oho", "obo", "mbm"],
     ownerPlugin: FILE_MANAGER_PLUGIN,
     isDefault: true,
     when: ({ field, targetCollection }) => isAttachmentInterface(field) || !targetCollection || getCollectionTemplate(targetCollection) === "file"

package/dist/server/flow-surfaces/service-helpers.js

@@ -155,8 +155,8 @@ function getFieldName(field) {
   return (field == null ? void 0 : field.name) || ((_a = field == null ? void 0 : field.options) == null ? void 0 : _a.name);
 }
 function getFieldTitle(field) {
-  var _a;
-  return (field == null ? void 0 : field.title) || ((_a = field == null ? void 0 : field.options) == null ? void 0 : _a.title) || getFieldName(field);
+  var _a, _b, _c, _d;
+  return ((_a = field == null ? void 0 : field.uiSchema) == null ? void 0 : _a.title) || ((_c = (_b = field == null ? void 0 : field.options) == null ? void 0 : _b.uiSchema) == null ? void 0 : _c.title) || (field == null ? void 0 : field.title) || ((_d = field == null ? void 0 : field.options) == null ? void 0 : _d.title) || getFieldName(field);
 }
 function resolveAssociationNameFromField(field, fallbackCollection) {
   const resourceName = typeof (field == null ? void 0 : field.resourceName) === "string" ? field.resourceName.trim() : "";

package/dist/server/flow-surfaces/service-utils.d.ts

@@ -21,6 +21,7 @@ export declare function normalizeBlockTitleDescription(titleDescription: any): a
 export declare function buildBlockTitleDescriptionFromSemanticChanges(changes: Record<string, any>): {
     titleDescription: _.Dictionary<any>;
 };
+export declare function buildBlockCardSettingsFromSemanticChanges(changes: Record<string, any>): {};
 export declare function buildChartCardSettingsFromSemanticChanges(currentCardSettings: any, changes: Record<string, any>): any;
 export declare function buildPopupTabTree(options: {
     tabUid?: string;

package/dist/server/flow-surfaces/service-utils.js

@@ -38,6 +38,7 @@ var service_utils_exports = {};
 __export(service_utils_exports, {
   assertFlowSurfaceComposeUniqueKeys: () => assertFlowSurfaceComposeUniqueKeys,
   assertSupportedSimpleChanges: () => assertSupportedSimpleChanges,
+  buildBlockCardSettingsFromSemanticChanges: () => buildBlockCardSettingsFromSemanticChanges,
   buildBlockTitleDescriptionFromSemanticChanges: () => buildBlockTitleDescriptionFromSemanticChanges,
   buildChartCardSettingsFromSemanticChanges: () => buildChartCardSettingsFromSemanticChanges,
   buildDefaultFieldState: () => buildDefaultFieldState,
@@ -180,6 +181,25 @@ function buildBlockTitleDescriptionFromSemanticChanges(changes) {
     })
   };
 }
+function buildBlockCardSettingsFromSemanticChanges(changes) {
+  const nextCardSettings = buildBlockTitleDescriptionFromSemanticChanges(changes) || {};
+  const hasHeightPatch = hasOwnDefined(changes, "height") || hasOwnDefined(changes, "heightMode");
+  if (hasHeightPatch) {
+    const nextHeightMode = hasOwnDefined(changes, "heightMode") ? normalizePublicBlockHeightMode(changes.heightMode) : hasOwnDefined(changes, "height") ? "specifyValue" : void 0;
+    if (nextHeightMode) {
+      import_lodash.default.set(nextCardSettings, ["blockHeight", "heightMode"], nextHeightMode);
+      if (nextHeightMode === "specifyValue" && hasOwnDefined(changes, "height")) {
+        import_lodash.default.set(nextCardSettings, ["blockHeight", "height"], changes.height);
+      } else {
+        import_lodash.default.unset(nextCardSettings, ["blockHeight", "height"]);
+      }
+    }
+  }
+  if (import_lodash.default.isEmpty(import_lodash.default.get(nextCardSettings, ["blockHeight"]))) {
+    import_lodash.default.unset(nextCardSettings, ["blockHeight"]);
+  }
+  return Object.keys(nextCardSettings).length ? nextCardSettings : void 0;
+}
 function buildChartCardSettingsFromSemanticChanges(currentCardSettings, changes) {
   const nextCardSettings = import_lodash.default.cloneDeep(currentCardSettings || {});
   const currentTitleDescription = import_lodash.default.get(currentCardSettings, ["titleDescription"]);
@@ -820,6 +840,7 @@ function getFieldBindingDefaultProps(containerUse, fieldUse, field) {
 0 && (module.exports = {
   assertFlowSurfaceComposeUniqueKeys,
   assertSupportedSimpleChanges,
+  buildBlockCardSettingsFromSemanticChanges,
   buildBlockTitleDescriptionFromSemanticChanges,
   buildChartCardSettingsFromSemanticChanges,
   buildDefaultFieldState,

package/dist/server/flow-surfaces/service.d.ts

@@ -484,6 +484,7 @@ export declare class FlowSurfacesService {
     private buildDefaultFieldOpenView;
     private ensureLocalFieldPopupSurface;
     private applyInlineNodeSettings;
+    private resolveComposeBlockSettings;
     private applyInlineFieldPopup;
     private applyInlineFieldSettings;
     private applyInlineStandaloneFieldSettings;
@@ -543,7 +544,6 @@ export declare class FlowSurfacesService {
     private normalizeCanonicalBlockHeaderWriteForUpdateSettings;
     private syncCanonicalBlockHeaderForUpdateSettings;
     private stripLegacyBlockHeaderChromeForUpdateSettings;
-    private syncMapHeightChromeForUpdateSettings;
     private normalizeOpenViewForUpdateSettings;
     private syncChartConfigureForUpdateSettings;
     private validateChartConfigureForUpdateSettings;
@@ -704,10 +704,18 @@ export declare class FlowSurfacesService {
     private buildFieldCatalogEntriesForResource;
     private buildLegacyFieldCatalogEntriesForResource;
     private findOwningBlockGrid;
+    private assertNoTreeConnectFieldsFlowRegistry;
+    private normalizeTreeConnectFields;
+    private getDataBlockResourceInit;
+    private getTreeSelectedKeyFieldPath;
+    private normalizeTreeConnectFilterPaths;
+    private resolveTreeConnectComparableField;
+    private normalizeTreeConnectValueKind;
+    private persistTreeConnectFields;
     private isFilterFormFieldPathAvailableForResource;
     private persistFilterFormConnectConfig;
-    private removeFilterFormConnectConfig;
-    private removeFilterFormTargetBindings;
+    private removeFilterSourceBindings;
+    private removeFilterTargetBindings;
     private collectChartBlockUidsFromTree;
     private removeFlowSqlBindingsForChartUids;
     private removeFlowSqlBindingsForNodeTree;

package/dist/server/flow-surfaces/service.js

@@ -166,6 +166,7 @@ const FILTER_TARGET_BLOCK_USES = /* @__PURE__ */ new Set([
   "MapBlockModel",
   "CommentsBlockModel"
 ]);
+const TREE_CONNECT_TARGET_BLOCK_USES = new Set(FILTER_TARGET_BLOCK_USES);
 const EDITABLE_FIELD_WRAPPER_USES = /* @__PURE__ */ new Set(["FormItemModel", "FilterFormItemModel", "PatternFormItemModel"]);
 const DISPLAY_FIELD_WRAPPER_USES = /* @__PURE__ */ new Set([
   "DetailsItemModel",
@@ -1026,27 +1027,36 @@ class FlowSurfacesService {
     });
   }
   collectRelationNestedFieldPaths(fieldNode) {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
     const fieldUse = String(((_b = (_a = fieldNode == null ? void 0 : fieldNode.stepParams) == null ? void 0 : _a.fieldBinding) == null ? void 0 : _b.use) || (fieldNode == null ? void 0 : fieldNode.use) || "").trim();
+    const relationFieldInit = ((_d = (_c = fieldNode == null ? void 0 : fieldNode.stepParams) == null ? void 0 : _c.fieldSettings) == null ? void 0 : _d.init) || {};
+    const relationFieldPath = (0, import_service_helpers.normalizeFieldPath)(relationFieldInit.fieldPath, relationFieldInit.associationPathName);
+    const toPublicFieldPath = (fieldPath) => {
+      const normalized = String(fieldPath || "").trim();
+      if (!normalized || !relationFieldPath || !normalized.startsWith(`${relationFieldPath}.`)) {
+        return normalized;
+      }
+      return normalized.slice(relationFieldPath.length + 1);
+    };
     if (["SubTableFieldModel", "DisplaySubTableFieldModel"].includes(fieldUse)) {
-      return import_lodash.default.castArray(((_c = fieldNode == null ? void 0 : fieldNode.subModels) == null ? void 0 : _c.columns) || []).map((item) => {
+      return import_lodash.default.castArray(((_e = fieldNode == null ? void 0 : fieldNode.subModels) == null ? void 0 : _e.columns) || []).map((item) => {
         var _a2, _b2, _c2;
         return (_c2 = (_b2 = (_a2 = item == null ? void 0 : item.stepParams) == null ? void 0 : _a2.fieldSettings) == null ? void 0 : _b2.init) == null ? void 0 : _c2.fieldPath;
-      }).filter(Boolean);
+      }).map(toPublicFieldPath).filter(Boolean);
     }
     if (fieldUse === "PopupSubTableFieldModel") {
-      return import_lodash.default.castArray(((_d = fieldNode == null ? void 0 : fieldNode.subModels) == null ? void 0 : _d.subTableColumns) || []).filter((item) => (item == null ? void 0 : item.use) === "TableColumnModel").map((item) => {
+      return import_lodash.default.castArray(((_f = fieldNode == null ? void 0 : fieldNode.subModels) == null ? void 0 : _f.subTableColumns) || []).filter((item) => (item == null ? void 0 : item.use) === "TableColumnModel").map((item) => {
         var _a2, _b2, _c2;
         return (_c2 = (_b2 = (_a2 = item == null ? void 0 : item.stepParams) == null ? void 0 : _a2.fieldSettings) == null ? void 0 : _b2.init) == null ? void 0 : _c2.fieldPath;
-      }).filter(Boolean);
+      }).map(toPublicFieldPath).filter(Boolean);
     }
     if (["SubFormFieldModel", "SubFormListFieldModel", "DisplaySubItemFieldModel", "DisplaySubListFieldModel"].includes(
       fieldUse
     )) {
-      return import_lodash.default.castArray(((_g = (_f = (_e = fieldNode == null ? void 0 : fieldNode.subModels) == null ? void 0 : _e.grid) == null ? void 0 : _f.subModels) == null ? void 0 : _g.items) || []).map((item) => {
+      return import_lodash.default.castArray(((_i = (_h = (_g = fieldNode == null ? void 0 : fieldNode.subModels) == null ? void 0 : _g.grid) == null ? void 0 : _h.subModels) == null ? void 0 : _i.items) || []).map((item) => {
         var _a2, _b2, _c2;
         return (_c2 = (_b2 = (_a2 = item == null ? void 0 : item.stepParams) == null ? void 0 : _a2.fieldSettings) == null ? void 0 : _b2.init) == null ? void 0 : _c2.fieldPath;
-      }).filter(Boolean);
+      }).map(toPublicFieldPath).filter(Boolean);
     }
     return void 0;
   }
@@ -3821,6 +3831,7 @@ class FlowSurfacesService {
         }
         await this.applyInlineNodeSettings(actionName, targetUid, settings, options);
       },
+      resolveBlockSettings: (settings, state) => this.resolveComposeBlockSettings(settings, state.keyMap),
       createField: async (payload) => this.addField(payload, {
         ...options,
         popupTemplateAliasSession
@@ -5472,6 +5483,7 @@ class FlowSurfacesService {
         fieldUid: tree.innerUid,
         fieldUse: boundFieldCapability.fieldUse,
         targetCollection: relationFieldTypeResolution.targetCollection,
+        relationFieldInit: normalizedFieldBinding,
         fields: relationFieldTypeResolution.fields,
         selectorFields: relationFieldTypeResolution.selectorFields,
         titleField: relationFieldTypeResolution.titleField,
@@ -6783,6 +6795,27 @@ class FlowSurfacesService {
       (0, import_service_utils.rethrowInlineConfigurationError)(error, `flowSurfaces ${actionName} settings invalid`);
     }
   }
+  resolveComposeBlockSettings(settings, keyMap) {
+    if (!import_lodash.default.isPlainObject(settings == null ? void 0 : settings.connectFields) || !Array.isArray(settings.connectFields.targets)) {
+      return settings;
+    }
+    const nextSettings = import_lodash.default.cloneDeep(settings);
+    nextSettings.connectFields = {
+      ...nextSettings.connectFields,
+      targets: import_lodash.default.castArray(nextSettings.connectFields.targets).map((target) => {
+        if (!import_lodash.default.isPlainObject(target) || import_lodash.default.isUndefined(target.target) || target.target === null || target.target === "") {
+          return target;
+        }
+        const nextTarget = {
+          ...target,
+          targetId: (0, import_compose_compiler.resolveComposeTargetKey)(String(target.target), keyMap, "tree connectFields")
+        };
+        delete nextTarget.target;
+        return nextTarget;
+      })
+    };
+    return nextSettings;
+  }
   async applyInlineFieldPopup(actionName, result, popup, options) {
     popup = this.prepareInlinePopupTemplateAliases(actionName, popup, options.popupTemplateAliasSession);
     const fieldHostUid = result.fieldUid || result.uid;
@@ -7830,6 +7863,9 @@ class FlowSurfacesService {
       if (typeof normalizedValues[domain] === "undefined") {
         return;
       }
+      if (domain === "flowRegistry") {
+        this.assertNoTreeConnectFieldsFlowRegistry(current, normalizedValues[domain], "updateSettings");
+      }
       if (!contract.editableDomains.includes(domain)) {
         (0, import_errors.throwBadRequest)(`flowSurfaces updateSettings domain '${domain}' is not editable`);
       }
@@ -7861,7 +7897,6 @@ class FlowSurfacesService {
     this.syncChartConfigureForUpdateSettings(current, nextPayload);
     await this.validateChartConfigureForUpdateSettings(current, nextPayload, options.transaction);
     this.syncCanonicalBlockHeaderForUpdateSettings(current, nextPayload);
-    this.syncMapHeightChromeForUpdateSettings(current, nextPayload);
     this.syncChartCardRuntimeStepParamsForUpdateSettings(
       current,
       nextPayload,
@@ -8052,6 +8087,7 @@ class FlowSurfacesService {
     import_lodash.default.set(values, titleDescriptionPath, normalizedTitleDescription);
   }
   syncCanonicalBlockHeaderForUpdateSettings(current, nextPayload) {
+    var _a;
     const semanticUse = (0, import_approval.normalizeApprovalSemanticUse)(current == null ? void 0 : current.use);
     if (!CANONICAL_BLOCK_HEADER_USES.has(semanticUse)) {
       return;
@@ -8062,11 +8098,19 @@ class FlowSurfacesService {
     const nextStepParams = import_lodash.default.cloneDeep(nextPayload.stepParams ?? (current == null ? void 0 : current.stepParams) ?? {});
     const nextCardSettings = import_lodash.default.cloneDeep(import_lodash.default.get(nextStepParams, ["cardSettings"]) || {});
     const normalizedTitleDescription = (0, import_service_utils.normalizeBlockTitleDescription)(import_lodash.default.get(nextCardSettings, ["titleDescription"]));
+    const normalizedBlockHeight = (_a = (0, import_service_utils.normalizeChartCardSettings)({
+      blockHeight: import_lodash.default.get(nextCardSettings, ["blockHeight"])
+    })) == null ? void 0 : _a.blockHeight;
     if (normalizedTitleDescription) {
       import_lodash.default.set(nextCardSettings, ["titleDescription"], normalizedTitleDescription);
     } else {
       import_lodash.default.unset(nextCardSettings, ["titleDescription"]);
     }
+    if (normalizedBlockHeight) {
+      import_lodash.default.set(nextCardSettings, ["blockHeight"], normalizedBlockHeight);
+    } else {
+      import_lodash.default.unset(nextCardSettings, ["blockHeight"]);
+    }
     if (import_lodash.default.isEmpty(nextCardSettings)) {
       import_lodash.default.unset(nextStepParams, ["cardSettings"]);
     } else {
@@ -8100,28 +8144,6 @@ class FlowSurfacesService {
       );
     }
   }
-  syncMapHeightChromeForUpdateSettings(current, nextPayload) {
-    if ((current == null ? void 0 : current.use) !== "MapBlockModel") {
-      return;
-    }
-    const nextProps = import_lodash.default.isPlainObject(nextPayload.props) ? nextPayload.props : void 0;
-    if (!nextProps) {
-      return;
-    }
-    const nextDecoratorProps = import_lodash.default.cloneDeep(nextPayload.decoratorProps ?? (current == null ? void 0 : current.decoratorProps) ?? {});
-    let changed = false;
-    if (Object.prototype.hasOwnProperty.call(nextProps, "height") && nextDecoratorProps.height !== nextProps.height) {
-      nextDecoratorProps.height = nextProps.height;
-      changed = true;
-    }
-    if (Object.prototype.hasOwnProperty.call(nextProps, "heightMode") && nextDecoratorProps.heightMode !== nextProps.heightMode) {
-      nextDecoratorProps.heightMode = nextProps.heightMode;
-      changed = true;
-    }
-    if (changed) {
-      nextPayload.decoratorProps = (0, import_service_utils.buildDefinedPayload)(nextDecoratorProps);
-    }
-  }
   async normalizeOpenViewForUpdateSettings(actionName, current, nextPayload, options = {}) {
     const openViewPaths = [
       ["popupSettings", "openView"],
@@ -8389,6 +8411,7 @@ class FlowSurfacesService {
       (0, import_errors.throwBadRequest)(`flowSurfaces setEventFlows is not supported on '${(current == null ? void 0 : current.use) || target.uid}'`);
     }
     const flows = values.flowRegistry || values.flows || {};
+    this.assertNoTreeConnectFieldsFlowRegistry(current, flows, "setEventFlows");
     this.contractGuard.validateFlowRegistry(current, flows);
     if (target.kind === "tab" && target.tabRoute) {
       await this.routeSync.persistTabSettings(
@@ -8504,10 +8527,13 @@ class FlowSurfacesService {
     });
     this.assertRemoveNodeResolvedTarget(resolved, node);
     if ((node == null ? void 0 : node.use) === "FilterFormItemModel") {
-      await this.removeFilterFormConnectConfig(resolved.uid, options.transaction);
+      await this.removeFilterSourceBindings(resolved.uid, options.transaction);
+    }
+    if ((node == null ? void 0 : node.use) === "TreeBlockModel") {
+      await this.removeFilterSourceBindings(resolved.uid, options.transaction);
     }
     if (FILTER_TARGET_BLOCK_USES.has((node == null ? void 0 : node.use) || "")) {
-      await this.removeFilterFormTargetBindings(resolved.uid, options.transaction);
+      await this.removeFilterTargetBindings(resolved.uid, options.transaction);
     }
     const approvalRoot = await this.findApprovalSurfaceRootForNode(resolved.uid, options.transaction);
     await this.removeNodeTreeWithBindings(resolved.uid, options.transaction);
@@ -9976,10 +10002,13 @@ class FlowSurfacesService {
       }
     }
     if (node.use === "FilterFormItemModel") {
-      await this.removeFilterFormConnectConfig(node.uid, transaction);
+      await this.removeFilterSourceBindings(node.uid, transaction);
+    }
+    if (node.use === "TreeBlockModel") {
+      await this.removeFilterSourceBindings(node.uid, transaction);
     }
     if (FILTER_TARGET_BLOCK_USES.has(node.use || "")) {
-      await this.removeFilterFormTargetBindings(node.uid, transaction);
+      await this.removeFilterTargetBindings(node.uid, transaction);
     }
   }
   async configurePage(target, changes, options) {
@@ -10047,15 +10076,11 @@ class FlowSurfacesService {
   }
   async configureTableBlock(target, changes, options) {
     const allowedKeys = (0, import_configure_options.getConfigureOptionKeysForUse)("TableBlockModel");
-    const cardSettings = (0, import_service_utils.buildBlockTitleDescriptionFromSemanticChanges)(changes);
+    const cardSettings = (0, import_service_utils.buildBlockCardSettingsFromSemanticChanges)(changes);
     (0, import_service_utils.assertSupportedSimpleChanges)("table", changes, allowedKeys);
     return this.updateSettings(
       {
         target,
-        decoratorProps: (0, import_service_utils.buildDefinedPayload)({
-          height: changes.height,
-          heightMode: (0, import_service_utils.normalizePublicBlockHeightMode)(changes.heightMode)
-        }),
         stepParams: {
           ...cardSettings ? { cardSettings } : {},
           ...changes.resource ? {
@@ -10096,7 +10121,7 @@ class FlowSurfacesService {
   async configureCalendarBlock(target, current, changes, options) {
     var _a;
     const allowedKeys = (0, import_configure_options.getConfigureOptionKeysForUse)("CalendarBlockModel");
-    const cardSettings = (0, import_service_utils.buildBlockTitleDescriptionFromSemanticChanges)(changes);
+    const cardSettings = (0, import_service_utils.buildBlockCardSettingsFromSemanticChanges)(changes);
     (0, import_service_utils.assertSupportedSimpleChanges)("calendar", changes, allowedKeys);
     this.validateCalendarSettingValues("configure", {
       defaultView: changes.defaultView,
@@ -10149,10 +10174,6 @@ class FlowSurfacesService {
           quickCreatePopupSettings,
           eventPopupSettings
         }),
-        decoratorProps: (0, import_service_utils.buildDefinedPayload)({
-          height: changes.height,
-          heightMode: (0, import_service_utils.normalizePublicBlockHeightMode)(changes.heightMode)
-        }),
         stepParams: {
           ...cardSettings ? { cardSettings } : {},
           ...changes.resource ? {
@@ -10199,14 +10220,14 @@ class FlowSurfacesService {
   async configureTreeBlock(target, current, changes, options) {
     var _a, _b;
     const allowedKeys = (0, import_configure_options.getConfigureOptionKeysForUse)("TreeBlockModel");
-    const cardSettings = (0, import_service_utils.buildBlockTitleDescriptionFromSemanticChanges)(changes);
+    const cardSettings = (0, import_service_utils.buildBlockCardSettingsFromSemanticChanges)(changes);
     (0, import_service_utils.assertSupportedSimpleChanges)("tree", changes, allowedKeys);
     const nextFieldNames = import_lodash.default.isPlainObject(changes.fieldNames) ? import_lodash.default.merge({}, ((_a = current == null ? void 0 : current.props) == null ? void 0 : _a.fieldNames) || {}, changes.fieldNames) : import_lodash.default.cloneDeep(((_b = current == null ? void 0 : current.props) == null ? void 0 : _b.fieldNames) || {});
     if ((0, import_service_utils.hasOwnDefined)(changes, "titleField")) {
       nextFieldNames.title = String(changes.titleField || "").trim();
     }
     const hasFieldNamesPatch = (0, import_service_utils.hasOwnDefined)(changes, "titleField") || import_lodash.default.isPlainObject(changes.fieldNames);
-    return this.updateSettings(
+    const result = await this.updateSettings(
       {
         target,
         props: (0, import_service_utils.buildDefinedPayload)({
@@ -10216,10 +10237,6 @@ class FlowSurfacesService {
           ...hasFieldNamesPatch ? { fieldNames: nextFieldNames } : {},
           ...(0, import_service_utils.hasOwnDefined)(changes, "pageSize") ? { pageSize: changes.pageSize } : {}
         }),
-        decoratorProps: (0, import_service_utils.buildDefinedPayload)({
-          height: changes.height,
-          heightMode: (0, import_service_utils.normalizePublicBlockHeightMode)(changes.heightMode)
-        }),
         stepParams: {
           ...cardSettings ? { cardSettings } : {},
           ...changes.resource ? {
@@ -10250,11 +10267,43 @@ class FlowSurfacesService {
       },
       options
     );
+    if ((0, import_service_utils.hasOwnDefined)(changes, "connectFields")) {
+      const effectiveTreeNode = changes.resource || hasFieldNamesPatch || (0, import_service_utils.hasDefinedValue)(changes, [
+        "searchable",
+        "defaultExpandAll",
+        "includeDescendants",
+        "titleField",
+        "pageSize",
+        "dataScope",
+        "sorting"
+      ]) ? await this.repository.findModelById(current.uid, {
+        transaction: options.transaction,
+        includeAsyncNode: true
+      }) : current;
+      await this.persistTreeConnectFields(
+        effectiveTreeNode,
+        changes.connectFields,
+        "configure tree",
+        options.transaction
+      );
+      return {
+        ...result,
+        updated: import_lodash.default.uniq([...result.updated || [], "connectFields"])
+      };
+    }
+    if ((0, import_service_utils.hasOwnDefined)(changes, "resource")) {
+      await this.removeFilterSourceBindings(current.uid, options.transaction);
+      return {
+        ...result,
+        updated: import_lodash.default.uniq([...result.updated || [], "connectFields"])
+      };
+    }
+    return result;
   }
   async configureKanbanBlock(target, current, changes, options) {
     var _a;
     const allowedKeys = (0, import_configure_options.getConfigureOptionKeysForUse)("KanbanBlockModel");
-    const blockCardSettings = (0, import_service_utils.buildBlockTitleDescriptionFromSemanticChanges)(changes);
+    const blockCardSettings = (0, import_service_utils.buildBlockCardSettingsFromSemanticChanges)(changes);
     (0, import_service_utils.assertSupportedSimpleChanges)("kanban", changes, allowedKeys);
     if (!import_lodash.default.isUndefined(changes.dragEnabled) && !import_lodash.default.isBoolean(changes.dragEnabled)) {
       (0, import_errors.throwBadRequest)("flowSurfaces configure kanban dragEnabled must be a boolean");
@@ -10533,15 +10582,11 @@ class FlowSurfacesService {
       } : {}
     });
     const updated = /* @__PURE__ */ new Set();
-    if (Object.keys(blockProps).length || Object.keys(blockStepParams).length || (0, import_service_utils.hasDefinedValue)(changes, ["height", "heightMode"])) {
+    if (Object.keys(blockProps).length || Object.keys(blockStepParams).length) {
       const blockResult = await this.updateSettings(
         {
           target,
           props: blockProps,
-          decoratorProps: (0, import_service_utils.buildDefinedPayload)({
-            height: changes.height,
-            heightMode: (0, import_service_utils.normalizePublicBlockHeightMode)(changes.heightMode)
-          }),
           stepParams: blockStepParams
         },
         options
@@ -10718,16 +10763,12 @@ class FlowSurfacesService {
   }
   async configureListBlock(target, changes, options) {
     const allowedKeys = (0, import_configure_options.getConfigureOptionKeysForUse)("ListBlockModel");
-    const cardSettings = (0, import_service_utils.buildBlockTitleDescriptionFromSemanticChanges)(changes);
+    const cardSettings = (0, import_service_utils.buildBlockCardSettingsFromSemanticChanges)(changes);
     (0, import_service_utils.assertSupportedSimpleChanges)("list", changes, allowedKeys);
     const layoutValue = (0, import_service_utils.normalizeSimpleLayoutValue)(changes.layout);
     return this.updateSettings(
       {
         target,
-        decoratorProps: (0, import_service_utils.buildDefinedPayload)({
-          height: changes.height,
-          heightMode: (0, import_service_utils.normalizePublicBlockHeightMode)(changes.heightMode)
-        }),
         stepParams: {
           ...cardSettings ? { cardSettings } : {},
           ...changes.resource ? {
@@ -10750,17 +10791,13 @@ class FlowSurfacesService {
   }
   async configureGridCardBlock(target, changes, options) {
     const allowedKeys = (0, import_configure_options.getConfigureOptionKeysForUse)("GridCardBlockModel");
-    const cardSettings = (0, import_service_utils.buildBlockTitleDescriptionFromSemanticChanges)(changes);
+    const cardSettings = (0, import_service_utils.buildBlockCardSettingsFromSemanticChanges)(changes);
     (0, import_service_utils.assertSupportedSimpleChanges)("gridCard", changes, allowedKeys);
     const layoutValue = (0, import_service_utils.normalizeSimpleLayoutValue)(changes.layout);
     const columns = (0, import_service_utils.normalizeGridCardColumns)(changes.columns);
     return this.updateSettings(
       {
         target,
-        decoratorProps: (0, import_service_utils.buildDefinedPayload)({
-          height: changes.height,
-          heightMode: (0, import_service_utils.normalizePublicBlockHeightMode)(changes.heightMode)
-        }),
         stepParams: {
           ...cardSettings ? { cardSettings } : {},
           ...changes.resource ? {
@@ -10929,15 +10966,11 @@ class FlowSurfacesService {
   }
   async configureMapBlock(target, changes, options) {
     const allowedKeys = (0, import_configure_options.getConfigureOptionKeysForUse)("MapBlockModel");
-    const cardSettings = (0, import_service_utils.buildBlockTitleDescriptionFromSemanticChanges)(changes);
+    const cardSettings = (0, import_service_utils.buildBlockCardSettingsFromSemanticChanges)(changes);
     (0, import_service_utils.assertSupportedSimpleChanges)("map", changes, allowedKeys);
     return this.updateSettings(
       {
         target,
-        decoratorProps: (0, import_service_utils.buildDefinedPayload)({
-          height: changes.height,
-          heightMode: (0, import_service_utils.normalizePublicBlockHeightMode)(changes.heightMode)
-        }),
         stepParams: (0, import_service_utils.buildDefinedPayload)({
           ...cardSettings ? { cardSettings } : {},
           ...changes.resource ? {
@@ -11292,6 +11325,7 @@ class FlowSurfacesService {
         fieldUid: innerUid,
         fieldUse: normalizedFieldComponentUse,
         targetCollection: fieldTypeResolution.targetCollection,
+        relationFieldInit: fieldSource.fieldSettingsInit,
         fields: (0, import_service_utils.hasOwnDefined)(changes, "fields") || shouldApplyFieldTypeDefaults ? fieldTypeResolution.fields : void 0,
         selectorFields: (0, import_service_utils.hasOwnDefined)(changes, "selectorFields") || shouldApplyFieldTypeDefaults ? fieldTypeResolution.selectorFields : void 0,
         titleField: relationTitleFieldToApply,
@@ -12233,6 +12267,222 @@ class FlowSurfacesService {
     }
     return null;
   }
+  assertNoTreeConnectFieldsFlowRegistry(node, flowRegistry, actionName) {
+    if ((node == null ? void 0 : node.use) !== "TreeBlockModel" || !import_lodash.default.isPlainObject(flowRegistry) || !Object.prototype.hasOwnProperty.call(flowRegistry, "connectFields")) {
+      return;
+    }
+    (0, import_errors.throwBadRequest)(
+      `flowSurfaces ${actionName} tree connectFields is not a flowRegistry key; use configure changes.connectFields`
+    );
+  }
+  normalizeTreeConnectFields(value, actionName) {
+    if (!import_lodash.default.isPlainObject(value)) {
+      (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} tree connectFields must be an object`);
+    }
+    if (!Array.isArray(value.targets)) {
+      (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} tree connectFields.targets must be an array`);
+    }
+    const seenTargetBlockUids = /* @__PURE__ */ new Set();
+    return value.targets.map((target, targetIndex) => {
+      if (!import_lodash.default.isPlainObject(target)) {
+        (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} tree connectFields.targets[${targetIndex}] must be an object`);
+      }
+      const targetBlockUid = String(target.targetId || target.targetBlockUid || "").trim();
+      if (!targetBlockUid) {
+        (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} tree connectFields.targets[${targetIndex}] requires targetId`);
+      }
+      if (seenTargetBlockUids.has(targetBlockUid)) {
+        (0, import_errors.throwBadRequest)(
+          `flowSurfaces ${actionName} tree connectFields.targets[${targetIndex}] duplicate targetId '${targetBlockUid}'`
+        );
+      }
+      seenTargetBlockUids.add(targetBlockUid);
+      let filterPaths;
+      if ((0, import_service_utils.hasOwnDefined)(target, "filterPaths")) {
+        if (!Array.isArray(target.filterPaths) || !target.filterPaths.length) {
+          (0, import_errors.throwBadRequest)(
+            `flowSurfaces ${actionName} tree connectFields.targets[${targetIndex}].filterPaths must be a non-empty string array`
+          );
+        }
+        filterPaths = target.filterPaths.map((path, pathIndex) => {
+          if (typeof path !== "string" || !path.trim()) {
+            (0, import_errors.throwBadRequest)(
+              `flowSurfaces ${actionName} tree connectFields.targets[${targetIndex}].filterPaths[${pathIndex}] must be a non-empty string`
+            );
+          }
+          return (0, import_service_helpers.normalizeFieldPath)(path);
+        });
+      }
+      return {
+        targetBlockUid,
+        ...filterPaths ? { filterPaths } : {}
+      };
+    });
+  }
+  getDataBlockResourceInit(blockNode) {
+    if ((blockNode == null ? void 0 : blockNode.use) === "ChartBlockModel") {
+      return (0, import_chart_config.getChartBuilderResourceInit)(import_lodash.default.get(blockNode, ["stepParams", "chartSettings", "configure"]));
+    }
+    const init = import_lodash.default.cloneDeep(import_lodash.default.get(blockNode, ["stepParams", "resourceSettings", "init"]) || {});
+    if (init.collectionName && !init.dataSourceKey) {
+      init.dataSourceKey = "main";
+    }
+    return init;
+  }
+  getTreeSelectedKeyFieldPath(treeNode, treeCollection) {
+    const configuredKey = String(import_lodash.default.get(treeNode, ["props", "fieldNames", "key"]) || "").trim();
+    return configuredKey ? (0, import_service_helpers.normalizeFieldPath)(configuredKey) : this.getCollectionFilterTargetKey(treeCollection);
+  }
+  normalizeTreeConnectFilterPaths(input) {
+    var _a, _b, _c, _d, _e, _f, _g;
+    const treeDataSourceKey = String(((_a = input.treeResourceInit) == null ? void 0 : _a.dataSourceKey) || "main").trim();
+    const treeCollectionName = String(((_b = input.treeResourceInit) == null ? void 0 : _b.collectionName) || "").trim();
+    const targetDataSourceKey = String(((_c = input.targetResourceInit) == null ? void 0 : _c.dataSourceKey) || "main").trim();
+    const targetCollectionName = String(((_d = input.targetResourceInit) == null ? void 0 : _d.collectionName) || "").trim();
+    if (!treeCollectionName) {
+      (0, import_errors.throwBadRequest)(
+        `flowSurfaces ${input.actionName} tree block '${((_e = input.treeNode) == null ? void 0 : _e.uid) || "unknown"}' requires resource.collectionName`
+      );
+    }
+    if (!targetCollectionName) {
+      (0, import_errors.throwBadRequest)(
+        `flowSurfaces ${input.actionName} tree connectFields target '${((_f = input.targetNode) == null ? void 0 : _f.uid) || "unknown"}' requires resource.collectionName`
+      );
+    }
+    const targetCollection = this.getCollection(targetDataSourceKey, targetCollectionName);
+    if (!targetCollection) {
+      (0, import_errors.throwBadRequest)(
+        `flowSurfaces ${input.actionName} tree connectFields target collection '${targetDataSourceKey}.${targetCollectionName}' not found`
+      );
+    }
+    const treeCollection = this.getCollection(treeDataSourceKey, treeCollectionName);
+    if (!treeCollection) {
+      (0, import_errors.throwBadRequest)(
+        `flowSurfaces ${input.actionName} tree connectFields source collection '${treeDataSourceKey}.${treeCollectionName}' not found`
+      );
+    }
+    const isSameCollection = treeDataSourceKey === targetDataSourceKey && treeCollectionName === targetCollectionName;
+    const normalizedPaths = input.filterPaths && input.filterPaths.length ? input.filterPaths : isSameCollection ? [this.getCollectionFilterTargetKey(targetCollection)] : void 0;
+    if (!(normalizedPaths == null ? void 0 : normalizedPaths.length)) {
+      (0, import_errors.throwBadRequest)(
+        `flowSurfaces ${input.actionName} tree connectFields target '${((_g = input.targetNode) == null ? void 0 : _g.uid) || "unknown"}' requires filterPaths when target collection differs from tree collection`
+      );
+    }
+    const filterTargetKey = this.getCollectionFilterTargetKey(targetCollection);
+    const treeKeyFieldPath = this.getTreeSelectedKeyFieldPath(input.treeNode, treeCollection);
+    const treeKeyField = this.resolveTreeConnectComparableField(treeCollection, treeKeyFieldPath);
+    const treeKeyKind = this.normalizeTreeConnectValueKind(treeKeyField);
+    return normalizedPaths.map((fieldPath) => {
+      const normalizedFieldPath = (0, import_service_helpers.normalizeFieldPath)(fieldPath);
+      const isBuiltInTargetPath = normalizedFieldPath === "id" || normalizedFieldPath === filterTargetKey;
+      const targetField = this.resolveTreeConnectComparableField(targetCollection, normalizedFieldPath);
+      if (!isBuiltInTargetPath && !targetField) {
+        (0, import_errors.throwBadRequest)(
+          `flowSurfaces ${input.actionName} tree connectFields filterPaths '${normalizedFieldPath}' does not exist on target collection '${targetDataSourceKey}.${targetCollectionName}'`
+        );
+      }
+      const targetKind = this.normalizeTreeConnectValueKind(targetField);
+      if (treeKeyKind && targetKind && treeKeyKind !== targetKind) {
+        (0, import_errors.throwBadRequest)(
+          `flowSurfaces ${input.actionName} tree connectFields filterPaths '${normalizedFieldPath}' is not type-compatible with tree selected key '${treeKeyFieldPath}'`
+        );
+      }
+      return normalizedFieldPath;
+    });
+  }
+  resolveTreeConnectComparableField(collection, fieldPath) {
+    const normalizedFieldPath = (0, import_service_helpers.normalizeFieldPath)(fieldPath);
+    const resolvedField = (0, import_service_helpers.resolveFieldFromCollection)(collection, normalizedFieldPath);
+    if (resolvedField) {
+      return resolvedField;
+    }
+    if (normalizedFieldPath === "id") {
+      return {
+        name: "id",
+        type: "bigInt",
+        interface: "integer"
+      };
+    }
+    return null;
+  }
+  normalizeTreeConnectValueKind(field) {
+    const fieldType = String((0, import_service_helpers.getFieldType)(field) || "").trim().toLowerCase();
+    const fieldInterface = String((0, import_service_helpers.getFieldInterface)(field) || "").trim().toLowerCase();
+    if (["bigint", "integer", "int", "number", "float", "double", "decimal", "real"].includes(fieldType) || ["bigint", "integer", "number", "percent"].includes(fieldInterface)) {
+      return "number";
+    }
+    if (["string", "text", "uid", "uuid", "varchar", "char"].includes(fieldType) || ["input", "textarea", "select", "radiogroup", "url", "email", "phone"].includes(fieldInterface)) {
+      return "string";
+    }
+    if (["date", "datetime", "time"].includes(fieldType) || ["date", "datetime", "time"].includes(fieldInterface)) {
+      return "date";
+    }
+    if (fieldType === "boolean" || fieldInterface === "boolean") {
+      return "boolean";
+    }
+    return void 0;
+  }
+  async persistTreeConnectFields(treeNode, connectFields, actionName, transaction) {
+    if ((treeNode == null ? void 0 : treeNode.use) !== "TreeBlockModel" || !(treeNode == null ? void 0 : treeNode.uid)) {
+      (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} connectFields is only supported on tree blocks`);
+    }
+    const targets = this.normalizeTreeConnectFields(connectFields, actionName);
+    const blockGrid = await this.findOwningBlockGrid(treeNode.uid, transaction);
+    if (!(blockGrid == null ? void 0 : blockGrid.uid)) {
+      (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} tree block '${treeNode.uid}' is not under a block grid`);
+    }
+    const treeResourceInit = this.getDataBlockResourceInit(treeNode);
+    const nextBindings = [];
+    for (const target of targets) {
+      if (target.targetBlockUid === treeNode.uid) {
+        (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} tree connectFields targetId cannot be the tree block itself`);
+      }
+      const targetNode = await this.repository.findModelById(target.targetBlockUid, {
+        transaction,
+        includeAsyncNode: true
+      });
+      if (!(targetNode == null ? void 0 : targetNode.uid)) {
+        (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} tree connectFields targetId '${target.targetBlockUid}' not found`);
+      }
+      if (!TREE_CONNECT_TARGET_BLOCK_USES.has(targetNode.use || "")) {
+        (0, import_errors.throwBadRequest)(
+          `flowSurfaces ${actionName} target '${target.targetBlockUid}' does not support tree connectFields`
+        );
+      }
+      const targetGrid = await this.findOwningBlockGrid(targetNode.uid, transaction);
+      if ((targetGrid == null ? void 0 : targetGrid.uid) !== blockGrid.uid) {
+        (0, import_errors.throwBadRequest)(
+          `flowSurfaces ${actionName} tree connectFields target '${target.targetBlockUid}' must be in the same block grid`
+        );
+      }
+      const targetResourceInit = this.getDataBlockResourceInit(targetNode);
+      nextBindings.push({
+        filterId: treeNode.uid,
+        targetId: targetNode.uid,
+        filterPaths: this.normalizeTreeConnectFilterPaths({
+          actionName,
+          treeNode,
+          treeResourceInit,
+          targetNode,
+          targetResourceInit,
+          filterPaths: target.filterPaths
+        })
+      });
+    }
+    const currentConfigs = import_lodash.default.castArray(blockGrid.filterManager || []);
+    const nextConfigs = currentConfigs.filter((config) => (config == null ? void 0 : config.filterId) !== treeNode.uid);
+    nextConfigs.push(...nextBindings);
+    if (import_lodash.default.isEqual(nextConfigs, currentConfigs)) {
+      return;
+    }
+    await this.repository.patch(
+      {
+        uid: blockGrid.uid,
+        filterManager: nextConfigs
+      },
+      { transaction }
+    );
+  }
   isFilterFormFieldPathAvailableForResource(resourceInit, fieldPath, associationPathName) {
     if (!(resourceInit == null ? void 0 : resourceInit.dataSourceKey) || !(resourceInit == null ? void 0 : resourceInit.collectionName) || !fieldPath) {
       return false;
@@ -12263,7 +12513,7 @@ class FlowSurfacesService {
       { transaction }
     );
   }
-  async removeFilterFormConnectConfig(filterModelUid, transaction) {
+  async removeFilterSourceBindings(filterModelUid, transaction) {
     const blockGrid = await this.findOwningBlockGrid(filterModelUid, transaction);
     if (!(blockGrid == null ? void 0 : blockGrid.uid)) {
       return;
@@ -12281,7 +12531,7 @@ class FlowSurfacesService {
       { transaction }
     );
   }
-  async removeFilterFormTargetBindings(targetBlockUid, transaction) {
+  async removeFilterTargetBindings(targetBlockUid, transaction) {
     const blockGrid = await this.findOwningBlockGrid(targetBlockUid, transaction);
     if (!(blockGrid == null ? void 0 : blockGrid.uid)) {
       return;
@@ -12382,7 +12632,7 @@ class FlowSurfacesService {
     const fieldInit = import_lodash.default.get(node, ["stepParams", "fieldSettings", "init"]) || {};
     const defaultTargetUid = import_lodash.default.get(node, ["stepParams", "filterFormItemSettings", "init", "defaultTargetUid"]);
     if (!(fieldInit == null ? void 0 : fieldInit.fieldPath) || !defaultTargetUid) {
-      await this.removeFilterFormConnectConfig(node.uid, transaction);
+      await this.removeFilterSourceBindings(node.uid, transaction);
       return;
     }
     const parentUid = await this.locator.findParentUid(node.uid, transaction);
@@ -12397,7 +12647,7 @@ class FlowSurfacesService {
       if (!options.skipIfTargetUnavailable) {
         throw error;
       }
-      await this.removeFilterFormConnectConfig(node.uid, transaction);
+      await this.removeFilterSourceBindings(node.uid, transaction);
       return null;
     });
     if (!target) {
@@ -12408,7 +12658,7 @@ class FlowSurfacesService {
       fieldInit.fieldPath,
       fieldInit.associationPathName
     )) {
-      await this.removeFilterFormConnectConfig(node.uid, transaction);
+      await this.removeFilterSourceBindings(node.uid, transaction);
       return;
     }
     await this.persistFilterFormConnectConfig(
@@ -14348,18 +14598,36 @@ class FlowSurfacesService {
     }
     return field;
   }
-  buildRelationTargetFieldInit(collection, fieldPath) {
+  buildRelationTargetFieldInit(input) {
+    var _a, _b, _c, _d, _e, _f;
+    const relationFieldPath = (0, import_service_helpers.normalizeFieldPath)(
+      (_a = input.relationFieldInit) == null ? void 0 : _a.fieldPath,
+      (_b = input.relationFieldInit) == null ? void 0 : _b.associationPathName
+    );
+    if (!relationFieldPath) {
+      return (0, import_service_utils.buildDefinedPayload)({
+        dataSourceKey: ((_c = input.targetCollection) == null ? void 0 : _c.dataSourceKey) || "main",
+        collectionName: (0, import_service_helpers.getCollectionName)(input.targetCollection),
+        fieldPath: input.targetFieldPath
+      });
+    }
+    const targetAssociationPath = input.targetFieldPath.includes(".") ? input.targetFieldPath.split(".").slice(0, -1).join(".") : void 0;
     return (0, import_service_utils.buildDefinedPayload)({
-      dataSourceKey: (collection == null ? void 0 : collection.dataSourceKey) || "main",
-      collectionName: (0, import_service_helpers.getCollectionName)(collection),
-      fieldPath
+      dataSourceKey: ((_d = input.relationFieldInit) == null ? void 0 : _d.dataSourceKey) || ((_e = input.targetCollection) == null ? void 0 : _e.dataSourceKey) || "main",
+      collectionName: ((_f = input.relationFieldInit) == null ? void 0 : _f.collectionName) || (0, import_service_helpers.getCollectionName)(input.targetCollection),
+      fieldPath: `${relationFieldPath}.${input.targetFieldPath}`,
+      associationPathName: targetAssociationPath ? `${relationFieldPath}.${targetAssociationPath}` : void 0
     });
   }
   buildRelationTargetTableColumnNode(input) {
     const field = this.getCollectionFieldOrBadRequest(input.collection, input.fieldPath, "fieldType.fields");
     const fieldUse = input.columnUse === "SubTableColumnModel" ? (0, import_service_helpers.inferFieldMenuEditableFieldUse)((0, import_service_helpers.getFieldInterface)(field)) || "InputFieldModel" : (0, import_service_helpers.inferAssociationLeafDisplayFieldUse)((0, import_service_helpers.getFieldInterface)(field)) || "DisplayTextFieldModel";
     const title = (0, import_service_helpers.getFieldTitle)(field);
-    const fieldInit = this.buildRelationTargetFieldInit(input.collection, input.fieldPath);
+    const fieldInit = this.buildRelationTargetFieldInit({
+      targetCollection: input.collection,
+      targetFieldPath: input.fieldPath,
+      relationFieldInit: input.relationFieldInit
+    });
     return {
       uid: (0, import_utils.uid)(),
       use: input.columnUse,
@@ -14403,7 +14671,11 @@ class FlowSurfacesService {
     const field = this.getCollectionFieldOrBadRequest(input.collection, input.fieldPath, "fieldType.fields");
     const fieldUse = input.wrapperUse === "FormItemModel" ? (0, import_service_helpers.inferFieldMenuEditableFieldUse)((0, import_service_helpers.getFieldInterface)(field)) || "InputFieldModel" : (0, import_service_helpers.inferAssociationLeafDisplayFieldUse)((0, import_service_helpers.getFieldInterface)(field)) || "DisplayTextFieldModel";
     const title = (0, import_service_helpers.getFieldTitle)(field);
-    const fieldInit = this.buildRelationTargetFieldInit(input.collection, input.fieldPath);
+    const fieldInit = this.buildRelationTargetFieldInit({
+      targetCollection: input.collection,
+      targetFieldPath: input.fieldPath,
+      relationFieldInit: input.relationFieldInit
+    });
     return {
       uid: (0, import_utils.uid)(),
       use: input.wrapperUse,
@@ -14547,7 +14819,8 @@ class FlowSurfacesService {
             (fieldPath) => this.buildRelationTargetTableColumnNode({
               collection: input.targetCollection,
               fieldPath,
-              columnUse: input.fieldUse === "SubTableFieldModel" ? "SubTableColumnModel" : "TableColumnModel"
+              columnUse: input.fieldUse === "SubTableFieldModel" ? "SubTableColumnModel" : "TableColumnModel",
+              relationFieldInit: input.relationFieldInit
             })
           ),
           transaction: input.transaction
@@ -14569,7 +14842,8 @@ class FlowSurfacesService {
               (fieldPath) => this.buildRelationTargetTableColumnNode({
                 collection: input.targetCollection,
                 fieldPath,
-                columnUse: "TableColumnModel"
+                columnUse: "TableColumnModel",
+                relationFieldInit: input.relationFieldInit
               })
             )
           ],
@@ -14590,7 +14864,8 @@ class FlowSurfacesService {
             (fieldPath) => this.buildRelationTargetGridItemNode({
               collection: input.targetCollection,
               fieldPath,
-              wrapperUse
+              wrapperUse,
+              relationFieldInit: input.relationFieldInit
             })
           ),
           transaction: input.transaction

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "前端流引擎",
   "description": "",
   "description.zh-CN": "",
-  "version": "2.1.0-alpha.25",
+  "version": "2.1.0-alpha.26",
   "main": "./dist/server/index.js",
   "license": "Apache-2.0",
   "devDependencies": {
@@ -24,5 +24,5 @@
     "@nocobase/test": "2.x",
     "@nocobase/utils": "2.x"
   },
-  "gitHead": "63e4aaa625f3108fe41238e85bb13dee37fe1f48"
+  "gitHead": "e6e6518030175b58080218bb4357642398bcb54a"
 }