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

package/dist/server/flow-surfaces/support-matrix.js

@@ -238,6 +238,17 @@ const FLOW_SURFACE_BLOCK_SUPPORT_MATRIX = [
     fixtureCaptured: true,
     readbackSupported: true,
     createSupported: true
+  },
+  {
+    key: "tree",
+    label: "Tree",
+    modelUse: "TreeBlockModel",
+    ownerPlugin: "@nocobase/plugin-block-tree",
+    topLevelAddable: true,
+    formalBuiltin: false,
+    fixtureCaptured: false,
+    readbackSupported: true,
+    createSupported: true
   }
 ];
 function hasFormalFlowSurfaceBlockKey(entry) {

package/dist/swagger/flow-surfaces.d.ts

@@ -117,6 +117,44 @@ declare const _default: {
                         fieldPath: {
                             type: string;
                         };
+                        fieldType: {
+                            type: string;
+                            enum: string[];
+                            description: string;
+                        };
+                        fields: {
+                            type: string;
+                            items: {
+                                type: string;
+                            };
+                            description: string;
+                        };
+                        selectorFields: {
+                            type: string;
+                            items: {
+                                type: string;
+                            };
+                            description: string;
+                        };
+                        titleField: {
+                            type: string;
+                        };
+                        openMode: {
+                            type: string;
+                            example: string;
+                        };
+                        popupSize: {
+                            type: string;
+                            example: string;
+                        };
+                        pageSize: {
+                            type: string;
+                            example: number;
+                        };
+                        showIndex: {
+                            type: string;
+                            example: boolean;
+                        };
                         renderer: {
                             type: string;
                             enum: string[];
@@ -157,6 +195,14 @@ declare const _default: {
                             additionalProperties: boolean;
                         };
                         fieldPath?: undefined;
+                        fieldType?: undefined;
+                        fields?: undefined;
+                        selectorFields?: undefined;
+                        titleField?: undefined;
+                        openMode?: undefined;
+                        popupSize?: undefined;
+                        pageSize?: undefined;
+                        showIndex?: undefined;
                         renderer?: undefined;
                         associationPathName?: undefined;
                         target?: undefined;
@@ -2025,6 +2071,44 @@ declare const _default: {
                         type: {
                             type: string;
                         };
+                        fieldType: {
+                            type: string;
+                            enum: string[];
+                            description: string;
+                        };
+                        fields: {
+                            type: string;
+                            items: {
+                                type: string;
+                            };
+                            description: string;
+                        };
+                        selectorFields: {
+                            type: string;
+                            items: {
+                                type: string;
+                            };
+                            description: string;
+                        };
+                        titleField: {
+                            type: string;
+                        };
+                        openMode: {
+                            type: string;
+                            example: string;
+                        };
+                        popupSize: {
+                            type: string;
+                            example: string;
+                        };
+                        pageSize: {
+                            type: string;
+                            example: number;
+                        };
+                        showIndex: {
+                            type: string;
+                            example: boolean;
+                        };
                         label: {
                             type: string;
                         };
@@ -3201,6 +3285,15 @@ declare const _default: {
                     resourceInit: {
                         $ref: string;
                     };
+                    fields: {
+                        type: string;
+                        items: {
+                            $ref: string;
+                        };
+                    };
+                    fieldsLayout: {
+                        $ref: string;
+                    };
                     settings: {
                         type: string;
                         additionalProperties: boolean;
@@ -3304,10 +3397,44 @@ declare const _default: {
                     collectionName: {
                         type: string;
                     };
-                    fieldUse: {
+                    fieldType: {
                         type: string;
+                        enum: string[];
+                        description: string;
+                    };
+                    fields: {
+                        type: string;
+                        items: {
+                            type: string;
+                        };
                         description: string;
                     };
+                    selectorFields: {
+                        type: string;
+                        items: {
+                            type: string;
+                        };
+                        description: string;
+                    };
+                    titleField: {
+                        type: string;
+                    };
+                    openMode: {
+                        type: string;
+                        example: string;
+                    };
+                    popupSize: {
+                        type: string;
+                        example: string;
+                    };
+                    pageSize: {
+                        type: string;
+                        example: number;
+                    };
+                    showIndex: {
+                        type: string;
+                        example: boolean;
+                    };
                     defaultTargetUid: {
                         type: string;
                     };
@@ -3513,6 +3640,15 @@ declare const _default: {
                     resourceInit: {
                         $ref: string;
                     };
+                    fields: {
+                        type: string;
+                        items: {
+                            $ref: string;
+                        };
+                    };
+                    fieldsLayout: {
+                        $ref: string;
+                    };
                     settings: {
                         type: string;
                         additionalProperties: boolean;
@@ -3567,8 +3703,43 @@ declare const _default: {
                     collectionName: {
                         type: string;
                     };
-                    fieldUse: {
+                    fieldType: {
+                        type: string;
+                        enum: string[];
+                        description: string;
+                    };
+                    fields: {
+                        type: string;
+                        items: {
+                            type: string;
+                        };
+                        description: string;
+                    };
+                    selectorFields: {
+                        type: string;
+                        items: {
+                            type: string;
+                        };
+                        description: string;
+                    };
+                    titleField: {
+                        type: string;
+                    };
+                    openMode: {
+                        type: string;
+                        example: string;
+                    };
+                    popupSize: {
+                        type: string;
+                        example: string;
+                    };
+                    pageSize: {
+                        type: string;
+                        example: number;
+                    };
+                    showIndex: {
                         type: string;
+                        example: boolean;
                     };
                     defaultTargetUid: {
                         type: string;

package/dist/swagger/flow-surfaces.examples.d.ts

@@ -1257,7 +1257,6 @@ export declare const flowSurfaceExamples: {
             settings: {
                 title: string;
                 pageSize: number;
-                content?: undefined;
             };
             defaultActionSettings: {
                 filter: {
@@ -1272,16 +1271,26 @@ export declare const flowSurfaceExamples: {
                     };
                 };
             };
+            fields?: undefined;
+            fieldsLayout?: undefined;
         } | {
             key: string;
             type: string;
-            settings: {
-                content: string;
-                title?: undefined;
-                pageSize?: undefined;
+            resourceInit: {
+                dataSourceKey: string;
+                collectionName: string;
+            };
+            fields: {
+                key: string;
+                fieldPath: string;
+                fieldType: string;
+                fields: string[];
+            }[];
+            fieldsLayout: {
+                rows: string[][];
             };
             defaultFilter?: undefined;
-            resourceInit?: undefined;
+            settings?: undefined;
             defaultActionSettings?: undefined;
         })[];
     };
@@ -1295,9 +1304,6 @@ export declare const flowSurfaceExamples: {
             settings: {
                 title: string;
                 width: number;
-                label?: undefined;
-                code?: undefined;
-                version?: undefined;
             };
             popup: {
                 mode: string;
@@ -1310,16 +1316,15 @@ export declare const flowSurfaceExamples: {
                     fields: string[];
                 }[];
             };
-            renderer?: undefined;
+            fieldType?: undefined;
+            fields?: undefined;
         } | {
             key: string;
             fieldPath: string;
-            renderer: string;
+            fieldType: string;
+            fields: string[];
             settings: {
-                label: string;
-                code: string;
-                version: string;
-                title?: undefined;
+                title: string;
                 width?: undefined;
             };
             popup?: undefined;

package/dist/swagger/flow-surfaces.examples.js

@@ -1508,17 +1508,29 @@ const flowSurfaceExamples = {
         }
       },
       {
-        key: "teamNotes",
-        type: "markdown",
-        settings: {
-          content: "# Team notes"
+        key: "userForm",
+        type: "createForm",
+        resourceInit: {
+          dataSourceKey: "main",
+          collectionName: "users"
+        },
+        fields: [
+          {
+            key: "rolesField",
+            fieldPath: "roles",
+            fieldType: "popupSubTable",
+            fields: ["title", "name"]
+          }
+        ],
+        fieldsLayout: {
+          rows: [["rolesField"]]
         }
       }
     ]
   },
   addFields: {
     target: {
-      uid: "table-block-uid"
+      uid: "create-form-block-uid"
     },
     fields: [
       {
@@ -1543,13 +1555,12 @@ const flowSurfaceExamples = {
         }
       },
       {
-        key: "nickname",
-        fieldPath: "nickname",
-        renderer: "js",
+        key: "rolesField",
+        fieldPath: "roles",
+        fieldType: "popupSubTable",
+        fields: ["title", "name"],
         settings: {
-          label: "Nickname (JS)",
-          code: "return value;",
-          version: "1.0.0"
+          title: "Roles"
         }
       }
     ]

package/dist/swagger/flow-surfaces.js

@@ -132,10 +132,37 @@ const APPLY_BLUEPRINT_BLOCK_TYPE_ENUM = [
   "iframe",
   "chart",
   "actionPanel",
-  "jsBlock"
+  "jsBlock",
+  "tree"
 ];
 const APPROVAL_BLUEPRINT_BLOCK_TYPE_ENUM = [...import_catalog_specs.APPROVAL_BLOCK_PUBLIC_KEYS];
 const COMPOSE_BLOCK_TYPE_ENUM = [...APPLY_BLUEPRINT_BLOCK_TYPE_ENUM, ...import_catalog_specs.APPROVAL_BLOCK_PUBLIC_KEYS];
+const RELATION_FIELD_TYPE_ENUM = [
+  "text",
+  "select",
+  "picker",
+  "subForm",
+  "subFormList",
+  "subDetails",
+  "subDetailsList",
+  "subTable",
+  "popupSubTable"
+];
+const RELATION_FIELD_TYPE_SCHEMA = {
+  type: "string",
+  enum: RELATION_FIELD_TYPE_ENUM,
+  description: "Public relation field UI presentation type. This is not the collection field data type/interface."
+};
+const RELATION_TARGET_FIELDS_SCHEMA = {
+  type: "array",
+  items: { type: "string" },
+  description: "Relation target record fields used as sub-table columns or embedded sub-form/detail fields."
+};
+const RELATION_SELECTOR_FIELDS_SCHEMA = {
+  type: "array",
+  items: { type: "string" },
+  description: "Record picker selector table fields. Do not mix with fields on the same field object."
+};
 const ADD_CHILD_TREE_TABLE_NOTE = "`addChild` is only valid when the live target `catalog.recordActions` exposes it, which normally means a table bound to a tree collection with `treeTable` enabled.";
 const APPLY_BLUEPRINT_ADD_CHILD_NOTE = "`addChild` is not auto-promoted from `actions`; author it only under `recordActions`, and only when the live target `catalog.recordActions` exposes it for a tree table.";
 const REACTION_FINGERPRINT_DESCRIPTION = "Optional optimistic-concurrency fingerprint from `getReactionMeta.capabilities[].fingerprint`. When provided, the write fails with HTTP 409 if the current slot fingerprint no longer matches.";
@@ -811,7 +838,7 @@ const actionDocs = {
     tags: [FLOW_SURFACES_TAG],
     summary: "Add a field wrapper and inner field under a field container",
     description: valuesCompatibilityNote(
-      "Automatically derives the wrapper/inner-field combination from the container use and the field interface. It can also import a form template through `template`, using `reference` or `copy` mode for the target form grid. `fieldUse` is only kept as a compatibility check and is no longer an arbitrary creation entry. Direct add does not accept raw `wrapperProps` / `fieldProps` / `props` / `decoratorProps` / `stepParams` / `flowRegistry`. Use `settings` and reuse the public configuration semantics from `configure.changes` plus the catalog item/node `configureOptions`. Popup-capable fields can also pass `popup` directly to append a local popup subtree or `popup.template` to reuse a saved popup template in `reference` / `copy` mode. `popup.tryTemplate=true` asks the backend to auto-select a compatible popup template first, preferring the same relation when one exists and otherwise falling back to a compatible non-relation template. It may be combined with `popup.saveAsTemplate={ name, description }`: a hit reuses the matched template directly, while a miss requires explicit local `popup.blocks` so the fallback popup can be saved as a template reference. When `popup.template` is present, `popup.title` still applies, while local `popup.mode` / `popup.blocks` / `popup.layout` are accepted but ignored. If local openView is enabled but no popup content is provided, the server fills in the popup page/tab/grid shell automatically. Under approval forms, direct field creation preserves the `PatternFormFieldModel` inner node semantics and does not allow standalone `jsItem`."
+      "Automatically derives the wrapper/inner-field combination from the container use and the field interface. Relation fields can request a public `fieldType` such as `picker`, `subTable`, or `popupSubTable`, with optional flat `fields`, `selectorFields`, and `titleField`. Direct add does not accept raw `wrapperProps` / `fieldProps` / `props` / `decoratorProps` / `stepParams` / `flowRegistry` or internal field model keys. Use `settings` and reuse the public configuration semantics from `configure.changes` plus the catalog item/node `configureOptions`. Popup-capable fields can also pass `popup` directly to append a local popup subtree or `popup.template` to reuse a saved popup template in `reference` / `copy` mode. `popup.tryTemplate=true` asks the backend to auto-select a compatible popup template first, preferring the same relation when one exists and otherwise falling back to a compatible non-relation template. It may be combined with `popup.saveAsTemplate={ name, description }`: a hit reuses the matched template directly, while a miss requires explicit local `popup.blocks` so the fallback popup can be saved as a template reference. When `popup.template` is present, `popup.title` still applies, while local `popup.mode` / `popup.blocks` / `popup.layout` are accepted but ignored. If local openView is enabled but no popup content is provided, the server fills in the popup page/tab/grid shell automatically. Under approval forms, direct field creation preserves the `PatternFormFieldModel` inner node semantics and does not allow standalone `jsItem`."
     ),
     requestBody: {
       required: true,
@@ -941,7 +968,7 @@ const actionDocs = {
     tags: [FLOW_SURFACES_TAG],
     summary: "Add multiple blocks sequentially under the same target",
     description: valuesCompatibilityNote(
-      "Creates multiple blocks sequentially under the same target. Each item may include `settings`, `defaultFilter`, `defaultActionSettings`, or `template`, but raw `props` / `decoratorProps` / `stepParams` / `flowRegistry` are not accepted. Direct `table` / `list` / `gridCard` / `calendar` / `kanban` items may use block-level `defaultFilter` to backfill the auto-created default filter action; backend runtime compatibility remains tolerant of omitted or empty values. Legacy `defaultActionSettings.filter.defaultFilter` is still supported for compatibility and wins when both are provided. Partial-success semantics apply: a failure in one item does not roll back the others. Results are returned in input order as `index/key/ok/result/error`, and each `error` always includes `message/type/code/status`."
+      "Creates multiple blocks sequentially under the same target. Each item may include `settings`, `defaultFilter`, `defaultActionSettings`, `template`, or inline `fields` / `fieldsLayout`, but raw `props` / `decoratorProps` / `stepParams` / `flowRegistry` are not accepted. Inline fields use the same public field semantics as compose/addField, including relation `fieldType`. Direct `table` / `list` / `gridCard` / `calendar` / `kanban` items may use block-level `defaultFilter` to backfill the auto-created default filter action; backend runtime compatibility remains tolerant of omitted or empty values. Legacy `defaultActionSettings.filter.defaultFilter` is still supported for compatibility and wins when both are provided. Partial-success semantics apply: a failure in one item does not roll back the others. Results are returned in input order as `index/key/ok/result/error`, and each `error` always includes `message/type/code/status`."
     ),
     requestBody: requestBody("FlowSurfaceAddBlocksRequest", import_flow_surfaces.flowSurfaceExamples.addBlocks),
     responses: responses("FlowSurfaceAddBlocksResult")
@@ -2124,6 +2151,14 @@ const schemas = {
           fieldPath: {
             type: "string"
           },
+          fieldType: RELATION_FIELD_TYPE_SCHEMA,
+          fields: RELATION_TARGET_FIELDS_SCHEMA,
+          selectorFields: RELATION_SELECTOR_FIELDS_SCHEMA,
+          titleField: { type: "string" },
+          openMode: { type: "string", example: "drawer" },
+          popupSize: { type: "string", example: "medium" },
+          pageSize: { type: "number", example: 10 },
+          showIndex: { type: "boolean", example: true },
           renderer: {
             type: "string",
             enum: ["js"],
@@ -3384,6 +3419,14 @@ const schemas = {
           associationPathName: { type: "string" },
           renderer: { type: "string" },
           type: { type: "string" },
+          fieldType: RELATION_FIELD_TYPE_SCHEMA,
+          fields: RELATION_TARGET_FIELDS_SCHEMA,
+          selectorFields: RELATION_SELECTOR_FIELDS_SCHEMA,
+          titleField: { type: "string" },
+          openMode: { type: "string", example: "drawer" },
+          popupSize: { type: "string", example: "medium" },
+          pageSize: { type: "number", example: 10 },
+          showIndex: { type: "boolean", example: true },
           label: { type: "string" },
           target: {
             type: "string",
@@ -4284,6 +4327,11 @@ const schemas = {
       template: ref("FlowSurfaceBlockTemplateRef"),
       resource: ref("FlowSurfaceBlockResourceInput"),
       resourceInit: ref("FlowSurfaceResourceInit"),
+      fields: {
+        type: "array",
+        items: ref("FlowSurfaceComposeFieldSpec")
+      },
+      fieldsLayout: ref("FlowSurfaceComposeLayout"),
       settings: ANY_OBJECT_SCHEMA,
       defaultFilter: {
         allOf: [ref("FlowSurfaceFilterGroup")],
@@ -4375,10 +4423,14 @@ const schemas = {
       collectionName: {
         type: "string"
       },
-      fieldUse: {
-        type: "string",
-        description: "Optional compatibility check. The server infers the actual field use from catalog capabilities."
-      },
+      fieldType: RELATION_FIELD_TYPE_SCHEMA,
+      fields: RELATION_TARGET_FIELDS_SCHEMA,
+      selectorFields: RELATION_SELECTOR_FIELDS_SCHEMA,
+      titleField: { type: "string" },
+      openMode: { type: "string", example: "drawer" },
+      popupSize: { type: "string", example: "medium" },
+      pageSize: { type: "number", example: 10 },
+      showIndex: { type: "boolean", example: true },
       defaultTargetUid: {
         type: "string"
       },
@@ -4553,6 +4605,11 @@ const schemas = {
       template: ref("FlowSurfaceBlockTemplateRef"),
       resource: ref("FlowSurfaceBlockResourceInput"),
       resourceInit: ref("FlowSurfaceResourceInit"),
+      fields: {
+        type: "array",
+        items: ref("FlowSurfaceComposeFieldSpec")
+      },
+      fieldsLayout: ref("FlowSurfaceComposeLayout"),
       settings: ANY_OBJECT_SCHEMA,
       defaultFilter: {
         allOf: [ref("FlowSurfaceFilterGroup")],
@@ -4597,9 +4654,14 @@ const schemas = {
       collectionName: {
         type: "string"
       },
-      fieldUse: {
-        type: "string"
-      },
+      fieldType: RELATION_FIELD_TYPE_SCHEMA,
+      fields: RELATION_TARGET_FIELDS_SCHEMA,
+      selectorFields: RELATION_SELECTOR_FIELDS_SCHEMA,
+      titleField: { type: "string" },
+      openMode: { type: "string", example: "drawer" },
+      popupSize: { type: "string", example: "medium" },
+      pageSize: { type: "number", example: 10 },
+      showIndex: { type: "boolean", example: true },
       defaultTargetUid: {
         type: "string"
       },