@nocobase/plugin-flow-engine 2.1.0-beta.20 → 2.1.0-beta.22

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

@@ -57,6 +57,7 @@ var import_errors = require("./errors");
 var import_field_semantics = require("./field-semantics");
 var import_core_field_default_bindings = require("./core-field-default-bindings");
 var import_field_binding_registry = require("./field-binding-registry");
+var import_association_interfaces = require("./association-interfaces");
 var import_service_helpers = require("./service-helpers");
 var import_support_matrix = require("./support-matrix");
 const ANY_VALUE_SCHEMA = {};
@@ -71,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]
 };
@@ -294,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
   }
 };
@@ -333,6 +346,36 @@ const CALENDAR_SETTINGS_GROUP = {
     "linkageRules.value": ARRAY_SCHEMA
   }
 };
+const TREE_BLOCK_PROP_SCHEMAS = {
+  searchable: BOOLEAN_SCHEMA,
+  defaultExpandAll: BOOLEAN_SCHEMA,
+  includeDescendants: BOOLEAN_SCHEMA,
+  fieldNames: OBJECT_SCHEMA,
+  pageSize: NUMBER_SCHEMA
+};
+const TREE_SETTINGS_GROUP = {
+  allowedPaths: [
+    "searchable.searchable",
+    "defaultExpandAll.defaultExpandAll",
+    "includeDescendants.includeDescendants",
+    "titleField.titleField",
+    "pageSize.pageSize",
+    "dataScope.filter",
+    "defaultSorting.sort"
+  ],
+  clearable: true,
+  mergeStrategy: "deep",
+  eventBindingSteps: ["treeSettings", "dataScope", "defaultSorting"],
+  pathSchemas: {
+    "searchable.searchable": BOOLEAN_SCHEMA,
+    "defaultExpandAll.defaultExpandAll": BOOLEAN_SCHEMA,
+    "includeDescendants.includeDescendants": BOOLEAN_SCHEMA,
+    "titleField.titleField": STRING_SCHEMA,
+    "pageSize.pageSize": NUMBER_SCHEMA,
+    "dataScope.filter": FILTER_GROUP_SCHEMA,
+    "defaultSorting.sort": ARRAY_SCHEMA
+  }
+};
 const KANBAN_SETTINGS_GROUP = {
   allowedPaths: [
     "grouping.groupField",
@@ -426,6 +469,7 @@ const REGISTERED_FILTER_FIELD_USE_SET = (0, import_field_binding_registry.getReg
 const EDITABLE_FIELD_USE_SET = /* @__PURE__ */ new Set([
   ...JS_EDITABLE_FIELD_USE_SET,
   "RecordSelectFieldModel",
+  "RecordPickerFieldModel",
   "JsonFieldModel",
   "TextareaFieldModel",
   "IconFieldModel",
@@ -443,11 +487,15 @@ const EDITABLE_FIELD_USE_SET = /* @__PURE__ */ new Set([
   "TimeFieldModel",
   "CollectionSelectorFieldModel",
   "RichTextFieldModel",
-  "InputFieldModel"
+  "InputFieldModel",
+  "SubFormListFieldModel",
+  "SubTableFieldModel",
+  "PopupSubTableFieldModel"
 ]);
 const DISPLAY_FIELD_USE_SET = /* @__PURE__ */ new Set([
   ...JS_DISPLAY_FIELD_USE_SET,
   "DisplaySubItemFieldModel",
+  "DisplaySubListFieldModel",
   "DisplaySubTableFieldModel",
   "DisplayHtmlFieldModel",
   "DisplayNumberFieldModel",
@@ -479,7 +527,6 @@ const APPROVAL_DETAILS_FIELD_COMPONENT_WRAPPER_USE_SET = /* @__PURE__ */ new Set
   "ApplyTaskCardDetailsItemModel",
   "ApprovalTaskCardDetailsItemModel"
 ]);
-const SINGLE_VALUE_ASSOCIATION_INTERFACES = /* @__PURE__ */ new Set(["m2o", "o2o", "oho", "obo", "updatedBy", "createdBy"]);
 const KNOWN_FIELD_NODE_USES = /* @__PURE__ */ new Set([
   ...EDITABLE_FIELD_USE_SET,
   ...DISPLAY_FIELD_USE_SET,
@@ -798,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: {
@@ -907,7 +952,6 @@ const CALENDAR_BLOCK_CONTRACT = createContract({
     "quickCreatePopupSettings",
     "eventPopupSettings"
   ],
-  decoratorProps: ["height", "heightMode"],
   stepParams: ["resourceSettings", "calendarSettings", "cardSettings"],
   flowRegistry: true,
   eventCapabilities: {
@@ -920,6 +964,26 @@ CALENDAR_BLOCK_CONTRACT.domains.stepParams = groupedDomain({
   calendarSettings: CALENDAR_SETTINGS_GROUP,
   cardSettings: BLOCK_CARD_SETTINGS_GROUP
 });
+const TREE_BLOCK_CONTRACT = createContract({
+  editableDomains: ["props", "decoratorProps", "stepParams", "flowRegistry"],
+  props: ["searchable", "defaultExpandAll", "includeDescendants", "fieldNames", "pageSize"],
+  stepParams: ["resourceSettings", "treeSettings", "cardSettings"],
+  flowRegistry: true,
+  eventCapabilities: {
+    direct: DEFAULT_DIRECT_EVENTS,
+    object: ["click"]
+  }
+});
+TREE_BLOCK_CONTRACT.domains.props = keyedDomain(
+  ["searchable", "defaultExpandAll", "includeDescendants", "fieldNames", "pageSize"],
+  "deep",
+  TREE_BLOCK_PROP_SCHEMAS
+);
+TREE_BLOCK_CONTRACT.domains.stepParams = groupedDomain({
+  resourceSettings: RESOURCE_SETTINGS_GROUP,
+  treeSettings: TREE_SETTINGS_GROUP,
+  cardSettings: BLOCK_CARD_SETTINGS_GROUP
+});
 const KANBAN_BLOCK_CONTRACT = createContract({
   editableDomains: ["props", "decoratorProps", "stepParams", "flowRegistry"],
   props: [
@@ -941,7 +1005,6 @@ const KANBAN_BLOCK_CONTRACT = createContract({
     "pageSize",
     "columnWidth"
   ],
-  decoratorProps: ["height", "heightMode"],
   stepParams: ["resourceSettings", "kanbanSettings", "cardSettings"],
   flowRegistry: true,
   eventCapabilities: {
@@ -957,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: {
@@ -997,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: {
@@ -1161,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({
@@ -1238,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: {
@@ -2385,6 +2435,7 @@ const NODE_CONTRACT_ENTRIES = [
   ["ApprovalBlockGridModel", GRID_NODE_CONTRACT],
   ["TableBlockModel", TABLE_BLOCK_CONTRACT],
   ["CalendarBlockModel", CALENDAR_BLOCK_CONTRACT],
+  ["TreeBlockModel", TREE_BLOCK_CONTRACT],
   ["KanbanBlockModel", KANBAN_BLOCK_CONTRACT],
   ["CreateFormModel", CREATE_FORM_BLOCK_CONTRACT],
   ["EditFormModel", EDIT_FORM_BLOCK_CONTRACT],
@@ -2544,7 +2595,7 @@ function getAllowedFieldUseSet(containerUse, enabledPackages) {
       return null;
   }
 }
-function canUseNestedApprovalAssociationFieldComponent(input) {
+function canUseNestedAssociationFieldComponent(input) {
   var _a;
   const getCollection = input.getCollection || (() => null);
   const targetCollection = (0, import_service_helpers.resolveFieldTargetCollection)(input.field, input.dataSourceKey || "main", getCollection);
@@ -2559,40 +2610,65 @@ function getSupportedFieldComponentUseSet(input) {
   if (!baseAllowedFieldUses || !fieldInterface) {
     return baseAllowedFieldUses;
   }
-  const wrapperUse = (0, import_approval.getApprovalFieldWrapperUse)(input.containerUse) || String(input.containerUse || "").trim();
+  const wrapperUse = (0, import_approval.getApprovalFieldWrapperUse)(input.containerUse) || getFieldWrapperUseForContainer(input.containerUse) || String(input.containerUse || "").trim();
   const inferredFieldUse = inferFieldUseByContainer(input.containerUse, input.field, {
     enabledPackages: input.enabledPackages,
     dataSourceKey: input.dataSourceKey,
     getCollection: input.getCollection
   });
   if (wrapperUse === "PatternFormItemModel") {
-    if (SINGLE_VALUE_ASSOCIATION_INTERFACES.has(fieldInterface)) {
+    if (import_association_interfaces.SINGLE_VALUE_ASSOCIATION_INTERFACES.has(fieldInterface)) {
+      return new Set(
+        [
+          "RecordSelectFieldModel",
+          "RecordPickerFieldModel",
+          canUseNestedAssociationFieldComponent(input) ? "SubFormFieldModel" : void 0,
+          inferredFieldUse
+        ].filter(Boolean)
+      );
+    }
+    if (import_association_interfaces.MULTI_VALUE_ASSOCIATION_INTERFACES.has(fieldInterface)) {
+      return new Set(
+        [
+          "RecordSelectFieldModel",
+          "RecordPickerFieldModel",
+          canUseNestedAssociationFieldComponent(input) ? "SubFormListFieldModel" : void 0,
+          canUseNestedAssociationFieldComponent(input) ? "SubTableFieldModel" : void 0,
+          canUseNestedAssociationFieldComponent(input) ? "PopupSubTableFieldModel" : void 0,
+          inferredFieldUse
+        ].filter(Boolean)
+      );
+    }
+  }
+  if (wrapperUse === "FormItemModel") {
+    if (import_association_interfaces.SINGLE_VALUE_ASSOCIATION_INTERFACES.has(fieldInterface)) {
       return new Set(
         [
           "RecordSelectFieldModel",
           "RecordPickerFieldModel",
-          canUseNestedApprovalAssociationFieldComponent(input) ? "SubFormFieldModel" : void 0,
+          canUseNestedAssociationFieldComponent(input) ? "SubFormFieldModel" : void 0,
           inferredFieldUse
         ].filter(Boolean)
       );
     }
-    if (import_field_semantics.MULTI_VALUE_ASSOCIATION_INTERFACES.has(fieldInterface)) {
+    if (import_association_interfaces.MULTI_VALUE_ASSOCIATION_INTERFACES.has(fieldInterface)) {
       return new Set(
         [
           "RecordSelectFieldModel",
           "RecordPickerFieldModel",
-          canUseNestedApprovalAssociationFieldComponent(input) ? "SubFormListFieldModel" : void 0,
-          canUseNestedApprovalAssociationFieldComponent(input) ? "PatternSubTableFieldModel" : void 0,
+          canUseNestedAssociationFieldComponent(input) ? "SubFormListFieldModel" : void 0,
+          canUseNestedAssociationFieldComponent(input) ? "SubTableFieldModel" : void 0,
+          canUseNestedAssociationFieldComponent(input) ? "PopupSubTableFieldModel" : void 0,
           inferredFieldUse
         ].filter(Boolean)
       );
     }
   }
   if (APPROVAL_DETAILS_FIELD_COMPONENT_WRAPPER_USE_SET.has(wrapperUse)) {
-    if (SINGLE_VALUE_ASSOCIATION_INTERFACES.has(fieldInterface)) {
+    if (import_association_interfaces.SINGLE_VALUE_ASSOCIATION_INTERFACES.has(fieldInterface)) {
       return new Set(["DisplayTextFieldModel", "DisplaySubItemFieldModel", inferredFieldUse].filter(Boolean));
     }
-    if (import_field_semantics.MULTI_VALUE_ASSOCIATION_INTERFACES.has(fieldInterface)) {
+    if (import_association_interfaces.MULTI_VALUE_ASSOCIATION_INTERFACES.has(fieldInterface)) {
       return new Set(
         ["DisplayTextFieldModel", "DisplaySubListFieldModel", "DisplaySubTableFieldModel", inferredFieldUse].filter(
           Boolean
@@ -2600,6 +2676,33 @@ function getSupportedFieldComponentUseSet(input) {
       );
     }
   }
+  if (wrapperUse === "DetailsItemModel") {
+    if (import_association_interfaces.SINGLE_VALUE_ASSOCIATION_INTERFACES.has(fieldInterface)) {
+      return new Set(["DisplayTextFieldModel", "DisplaySubItemFieldModel", inferredFieldUse].filter(Boolean));
+    }
+    if (import_association_interfaces.MULTI_VALUE_ASSOCIATION_INTERFACES.has(fieldInterface)) {
+      return new Set(
+        ["DisplayTextFieldModel", "DisplaySubListFieldModel", "DisplaySubTableFieldModel", inferredFieldUse].filter(
+          Boolean
+        )
+      );
+    }
+  }
+  if (wrapperUse === "FormAssociationItemModel" || wrapperUse === "TableColumnModel") {
+    if (import_association_interfaces.SINGLE_VALUE_ASSOCIATION_INTERFACES.has(fieldInterface)) {
+      return new Set(["DisplayTextFieldModel", inferredFieldUse].filter(Boolean));
+    }
+    if (import_association_interfaces.MULTI_VALUE_ASSOCIATION_INTERFACES.has(fieldInterface)) {
+      return new Set(
+        ["DisplayTextFieldModel", "DisplaySubListFieldModel", "DisplaySubTableFieldModel", inferredFieldUse].filter(
+          Boolean
+        )
+      );
+    }
+  }
+  if (inferredFieldUse) {
+    return /* @__PURE__ */ new Set([inferredFieldUse]);
+  }
   return baseAllowedFieldUses;
 }
 function inferFieldUseByContainer(containerUse, field, options = {}) {
@@ -2737,12 +2840,18 @@ function resolveSupportedFieldCapability(input) {
     }
     throw new import_errors.FlowSurfaceBadRequestError(`flowSurfaces field '${input.containerUse}' requires a supported fieldUse`);
   }
-  if (input.requestedFieldUse && inferredFieldUse && input.requestedFieldUse !== inferredFieldUse && KNOWN_FIELD_NODE_USES.has(input.requestedFieldUse)) {
+  if (input.requestedFieldUse && inferredFieldUse && input.requestedFieldUse !== inferredFieldUse && input.requestedFieldUseMode !== "fieldType" && KNOWN_FIELD_NODE_USES.has(input.requestedFieldUse)) {
     throw new import_errors.FlowSurfaceBadRequestError(
       `flowSurfaces fieldUse '${input.requestedFieldUse}' does not match inferred fieldUse '${inferredFieldUse}' under '${input.containerUse}'`
     );
   }
-  const allowedFieldUses = getAllowedFieldUseSet(input.containerUse, input.enabledPackages);
+  const allowedFieldUses = input.requestedFieldUseMode === "fieldType" && input.field ? getSupportedFieldComponentUseSet({
+    containerUse: input.containerUse,
+    field: input.field,
+    enabledPackages: input.enabledPackages,
+    dataSourceKey: input.dataSourceKey,
+    getCollection: input.getCollection
+  }) : getAllowedFieldUseSet(input.containerUse, input.enabledPackages);
   if (!(allowedFieldUses == null ? void 0 : allowedFieldUses.has(fieldUse))) {
     throw new import_errors.FlowSurfaceBadRequestError(
       `flowSurfaces fieldUse '${fieldUse}' is not allowed under '${input.containerUse}'`
@@ -2810,6 +2919,7 @@ function getAvailableActionCatalogItems(containerUse, scope, enabledPackages) {
 const COLLECTION_RESOURCE_REQUIRED = /* @__PURE__ */ new Set([
   "TableBlockModel",
   "CalendarBlockModel",
+  "TreeBlockModel",
   "KanbanBlockModel",
   "CreateFormModel",
   "EditFormModel",

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

@@ -23,6 +23,14 @@ export type FlowSurfaceComposeNormalizedFieldSpec = {
     associationPathName?: string;
     renderer?: string;
     type?: string;
+    fieldType?: string;
+    fields?: string[];
+    selectorFields?: string[];
+    titleField?: string;
+    openMode?: string;
+    popupSize?: string;
+    pageSize?: number;
+    showIndex?: boolean;
     target?: string | Record<string, unknown>;
     settings?: FlowSurfaceComposeObject;
     popup?: FlowSurfaceComposeObject;
@@ -105,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-compiler.js

@@ -123,6 +123,14 @@ function buildComposeFieldCreatePayload(fieldSpec) {
     ...fieldSpec.associationPathName ? { associationPathName: fieldSpec.associationPathName } : {},
     ...fieldSpec.renderer ? { renderer: fieldSpec.renderer } : {},
     ...fieldSpec.type ? { type: fieldSpec.type } : {},
+    ...fieldSpec.fieldType ? { fieldType: fieldSpec.fieldType } : {},
+    ...typeof fieldSpec.fields !== "undefined" ? { fields: fieldSpec.fields } : {},
+    ...typeof fieldSpec.selectorFields !== "undefined" ? { selectorFields: fieldSpec.selectorFields } : {},
+    ...fieldSpec.titleField ? { titleField: fieldSpec.titleField } : {},
+    ...fieldSpec.openMode ? { openMode: fieldSpec.openMode } : {},
+    ...fieldSpec.popupSize ? { popupSize: fieldSpec.popupSize } : {},
+    ...typeof fieldSpec.pageSize !== "undefined" ? { pageSize: fieldSpec.pageSize } : {},
+    ...typeof fieldSpec.showIndex !== "undefined" ? { showIndex: fieldSpec.showIndex } : {},
     ...fieldSpec.popup ? { popup: fieldSpec.popup } : {},
     ...fieldSpec.__autoPopupForRelationField ? { __autoPopupForRelationField: true } : {},
     ...fieldSpec[import_defaults.FLOW_SURFACE_APPLY_BLUEPRINT_POPUP_DEFAULTS_KEY] ? {

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

@@ -34,6 +34,7 @@ __export(configure_options_exports, {
 });
 module.exports = __toCommonJS(configure_options_exports);
 var import_approval = require("./approval");
+var import_field_type_resolver = require("./field-type-resolver");
 const stringOption = (description, extra = {}) => ({
   type: "string",
   ...description ? { description } : {},
@@ -79,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",
@@ -90,9 +101,25 @@ const DISPLAY_STYLE = stringOption("Display style", {
   enum: ["text", "tag"],
   example: "tag"
 });
-const FIELD_COMPONENT = stringOption("Field component model use", {
-  example: "DisplayTextFieldModel"
+const FIELD_TYPE = stringOption("Public relation field presentation type", {
+  enum: [...import_field_type_resolver.FLOW_SURFACE_PUBLIC_RELATION_FIELD_TYPES],
+  example: "popupSubTable"
+});
+const RELATION_FIELDS = arrayOption("Relation target fields", {
+  example: ["title", "name"]
 });
+const SELECTOR_FIELDS = arrayOption("Record picker selector fields", {
+  example: ["title", "code"]
+});
+const RELATION_FIELD_TYPE_OPTIONS = {
+  fieldType: FIELD_TYPE,
+  fields: RELATION_FIELDS,
+  selectorFields: SELECTOR_FIELDS,
+  openMode: stringOption("Popup open mode", { example: "drawer" }),
+  popupSize: stringOption("Popup size", { example: "medium" }),
+  pageSize: numberOption("Page size", { example: 10 }),
+  showIndex: booleanOption("Whether to show index", { example: true })
+};
 const CONFIRM = objectOption("Confirmation dialog configuration. You can also pass a boolean directly.", {
   example: {
     enable: true,
@@ -219,6 +246,20 @@ const CALENDAR_OPTIONS = {
   quickCreatePopup: OPEN_VIEW,
   eventPopup: OPEN_VIEW
 };
+const TREE_OPTIONS = {
+  ...COMMON_BLOCK_HEADER_OPTIONS,
+  ...COMMON_HEIGHT_OPTIONS,
+  resource: COMMON_RESOURCE,
+  searchable: booleanOption("Whether search is enabled", { example: true }),
+  defaultExpandAll: booleanOption("Whether all tree nodes are expanded by default", { example: false }),
+  includeDescendants: booleanOption("Whether child nodes are included when filtering", { example: true }),
+  titleField: stringOption("Tree node title field", { example: "title" }),
+  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,
+  connectFields: CONNECT_FIELDS
+};
 const KANBAN_OPTIONS = {
   ...COMMON_BLOCK_HEADER_OPTIONS,
   ...COMMON_HEIGHT_OPTIONS,
@@ -386,7 +427,7 @@ const TABLE_FIELD_WRAPPER_OPTIONS = {
   editable: booleanOption("Whether editable", { example: false }),
   dataIndex: stringOption("Data index"),
   titleField: stringOption("Association display title field", { example: "title" }),
-  fieldComponent: FIELD_COMPONENT,
+  ...RELATION_FIELD_TYPE_OPTIONS,
   clickToOpen: booleanOption("Whether clicking can open details", { example: true }),
   openView: OPEN_VIEW,
   code: JS_CODE,
@@ -402,7 +443,7 @@ const DETAILS_FIELD_WRAPPER_OPTIONS = {
   disabled: booleanOption("Whether disabled", { example: false }),
   pattern: stringOption("Display mode"),
   titleField: stringOption("Association display title field", { example: "title" }),
-  fieldComponent: FIELD_COMPONENT,
+  ...RELATION_FIELD_TYPE_OPTIONS,
   labelWidth: stringOption("Label width", { example: "120px" }),
   labelWrap: booleanOption("Whether labels should wrap", { example: false }),
   clickToOpen: booleanOption("Whether clicking can open details", { example: true }),
@@ -422,7 +463,7 @@ const FILTER_FIELD_WRAPPER_OPTIONS = {
   allowMultiple: booleanOption("Whether multiple selection is allowed", { example: false }),
   maxCount: numberOption("Maximum count", { example: 5 }),
   name: stringOption("Field name override"),
-  fieldComponent: FIELD_COMPONENT,
+  ...RELATION_FIELD_TYPE_OPTIONS,
   labelWidth: stringOption("Label width", { example: "120px" }),
   labelWrap: booleanOption("Whether labels should wrap", { example: false }),
   clickToOpen: booleanOption("Whether clicking can open details", { example: false }),
@@ -446,7 +487,7 @@ const FORM_FIELD_WRAPPER_OPTIONS = {
   pattern: stringOption("Input mode"),
   titleField: stringOption("Association display title field", { example: "title" }),
   name: stringOption("Field name override"),
-  fieldComponent: FIELD_COMPONENT,
+  ...RELATION_FIELD_TYPE_OPTIONS,
   labelWidth: stringOption("Label width", { example: "120px" }),
   labelWrap: booleanOption("Whether labels should wrap", { example: false }),
   clickToOpen: booleanOption("Whether clicking can open details", { example: false }),
@@ -744,6 +785,9 @@ function getConfigureOptionsForUse(use) {
     case "CalendarBlockModel":
       options = cloneOptions(CALENDAR_OPTIONS);
       break;
+    case "TreeBlockModel":
+      options = cloneOptions(TREE_OPTIONS);
+      break;
     case "KanbanBlockModel":
       options = cloneOptions(KANBAN_OPTIONS);
       break;

package/dist/server/flow-surfaces/default-action-popup.js

@@ -50,7 +50,7 @@ __export(default_action_popup_exports, {
 });
 module.exports = __toCommonJS(default_action_popup_exports);
 var import_lodash = __toESM(require("lodash"));
-var import_field_semantics = require("./field-semantics");
+var import_association_interfaces = require("./association-interfaces");
 var import_service_helpers = require("./service-helpers");
 const DEFAULT_ACTION_POPUP_SYSTEM_FIELD_NAMES = /* @__PURE__ */ new Set(["id", "createdBy", "createdById", "updatedBy", "updatedById"]);
 const DEFAULT_ACTION_POPUP_SYSTEM_FIELD_INTERFACES = /* @__PURE__ */ new Set([
@@ -198,7 +198,7 @@ function isFlowSurfaceDefaultActionPopupAuditTimestampField(field) {
 }
 function isFlowSurfaceDefaultActionPopupMultiValueAssociationField(field) {
   const fieldInterface = String((0, import_service_helpers.getFieldInterface)(field) || "").trim();
-  return import_field_semantics.MULTI_VALUE_ASSOCIATION_INTERFACES.has(fieldInterface);
+  return import_association_interfaces.MULTI_VALUE_ASSOCIATION_INTERFACES.has(fieldInterface);
 }
 function isFlowSurfaceDefaultActionPopupAssociationField(field) {
   const fieldType = String((0, import_service_helpers.getFieldType)(field) || "").trim();

package/dist/server/flow-surfaces/field-binding-registry.d.ts

@@ -6,6 +6,7 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
+export { MULTI_VALUE_ASSOCIATION_INTERFACES, SINGLE_VALUE_ASSOCIATION_INTERFACES } from './association-interfaces';
 export type FlowSurfaceFieldBindingScope = 'display' | 'editable' | 'filter';
 export type FlowSurfaceFieldBindingResolution = {
     modelClassName: string;

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

@@ -26,12 +26,15 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var field_binding_registry_exports = {};
 __export(field_binding_registry_exports, {
+  MULTI_VALUE_ASSOCIATION_INTERFACES: () => import_association_interfaces2.MULTI_VALUE_ASSOCIATION_INTERFACES,
+  SINGLE_VALUE_ASSOCIATION_INTERFACES: () => import_association_interfaces2.SINGLE_VALUE_ASSOCIATION_INTERFACES,
   getRegisteredFieldUses: () => getRegisteredFieldUses,
   resolveRegisteredFieldBinding: () => resolveRegisteredFieldBinding
 });
 module.exports = __toCommonJS(field_binding_registry_exports);
 var import_field_semantics = require("./field-semantics");
 var import_service_helpers = require("./service-helpers");
+var import_association_interfaces2 = require("./association-interfaces");
 const FILE_MANAGER_PLUGIN = "@nocobase/plugin-file-manager";
 const ATTACHMENT_URL_PLUGIN = "@nocobase/plugin-field-attachment-url";
 const CODE_PLUGIN = "@nocobase/plugin-field-code";
@@ -100,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"
@@ -386,6 +389,8 @@ function resolveRegisteredFieldBinding(input) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  MULTI_VALUE_ASSOCIATION_INTERFACES,
+  SINGLE_VALUE_ASSOCIATION_INTERFACES,
   getRegisteredFieldUses,
   resolveRegisteredFieldBinding
 });

package/dist/server/flow-surfaces/field-semantics.d.ts

@@ -6,7 +6,7 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-export declare const MULTI_VALUE_ASSOCIATION_INTERFACES: Set<string>;
+export { MULTI_VALUE_ASSOCIATION_INTERFACES } from './association-interfaces';
 export declare function normalizeFieldContainerKind(containerUse?: string): "form" | "details" | "table" | "filter-form";
 export declare function shouldUseAssociationTitleTextDisplay(input: {
     containerUse?: string;

package/dist/server/flow-surfaces/field-semantics.js

@@ -26,12 +26,14 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var field_semantics_exports = {};
 __export(field_semantics_exports, {
-  MULTI_VALUE_ASSOCIATION_INTERFACES: () => MULTI_VALUE_ASSOCIATION_INTERFACES,
+  MULTI_VALUE_ASSOCIATION_INTERFACES: () => import_association_interfaces2.MULTI_VALUE_ASSOCIATION_INTERFACES,
   normalizeFieldContainerKind: () => normalizeFieldContainerKind,
   shouldUseAssociationTitleTextDisplay: () => shouldUseAssociationTitleTextDisplay
 });
 module.exports = __toCommonJS(field_semantics_exports);
 var import_approval = require("./approval");
+var import_association_interfaces = require("./association-interfaces");
+var import_association_interfaces2 = require("./association-interfaces");
 const FORM_FIELD_CONTAINER_USES = /* @__PURE__ */ new Set([
   "FormBlockModel",
   "CreateFormModel",
@@ -54,7 +56,6 @@ const DETAILS_FIELD_CONTAINER_USES = /* @__PURE__ */ new Set([
 ]);
 const FILTER_FIELD_CONTAINER_USES = /* @__PURE__ */ new Set(["FilterFormBlockModel", "FilterFormGridModel", "FilterFormItemModel"]);
 const TABLE_FIELD_CONTAINER_USES = /* @__PURE__ */ new Set(["TableBlockModel", "TableColumnModel"]);
-const MULTI_VALUE_ASSOCIATION_INTERFACES = /* @__PURE__ */ new Set(["m2m", "o2m", "mbm"]);
 function normalizeFieldContainerKind(containerUse) {
   const normalized = (0, import_approval.normalizeApprovalSemanticUse)(containerUse);
   if (FORM_FIELD_CONTAINER_USES.has(normalized)) {
@@ -73,7 +74,7 @@ function normalizeFieldContainerKind(containerUse) {
 }
 function shouldUseAssociationTitleTextDisplay(input) {
   const containerKind = normalizeFieldContainerKind(input.containerUse);
-  return (containerKind === "table" || containerKind === "details") && !String(input.associationPathName || "").trim() && MULTI_VALUE_ASSOCIATION_INTERFACES.has(String(input.fieldInterface || "").trim());
+  return (containerKind === "table" || containerKind === "details") && !String(input.associationPathName || "").trim() && import_association_interfaces.MULTI_VALUE_ASSOCIATION_INTERFACES.has(String(input.fieldInterface || "").trim());
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {