@nocobase/plugin-flow-engine 2.1.0-alpha.19 → 2.1.0-alpha.20

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

@@ -569,6 +569,12 @@ declare const _default: {
                             $ref: string;
                         };
                     };
+                    fieldsLayout: {
+                        allOf: {
+                            $ref: string;
+                        }[];
+                        description: string;
+                    };
                     actions: {
                         type: string;
                         description: string;
@@ -589,6 +595,9 @@ declare const _default: {
             FlowSurfaceApprovalBlueprintBlockSpec: {
                 type: string;
                 required: string[];
+                anyOf: {
+                    required: string[];
+                }[];
                 properties: {
                     key: {
                         type: string;
@@ -597,6 +606,9 @@ declare const _default: {
                         type: string;
                         enum: string[];
                     };
+                    template: {
+                        $ref: string;
+                    };
                     resource: {
                         $ref: string;
                     };
@@ -2164,6 +2176,12 @@ declare const _default: {
                             $ref: string;
                         };
                     };
+                    fieldsLayout: {
+                        allOf: {
+                            $ref: string;
+                        }[];
+                        description: string;
+                    };
                     actions: {
                         type: string;
                         description: string;

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

@@ -60,7 +60,16 @@ export declare const flowSurfaceExamples: {
                 key: string;
                 type: string;
                 collection: string;
-                fields: string[];
+                fields: (string | {
+                    key: string;
+                    field: string;
+                })[];
+                fieldsLayout: {
+                    rows: (string[] | {
+                        key: string;
+                        span: number;
+                    }[])[];
+                };
                 actions: string[];
             } | {
                 key: string;
@@ -71,6 +80,7 @@ export declare const flowSurfaceExamples: {
                     key: string;
                     type: string;
                 }[];
+                fieldsLayout?: undefined;
             })[];
             layout: {
                 rows: string[][];
@@ -318,6 +328,12 @@ export declare const flowSurfaceExamples: {
                 fieldPath: string;
                 target: string;
             }[];
+            fieldsLayout: {
+                rows: {
+                    key: string;
+                    span: number;
+                }[][];
+            };
             actions: string[];
             recordActions?: undefined;
         } | {
@@ -346,6 +362,7 @@ export declare const flowSurfaceExamples: {
                     }[];
                 };
             })[];
+            fieldsLayout?: undefined;
         })[];
         layout: {
             rows: {

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

@@ -87,7 +87,26 @@ const flowSurfaceExamples = {
             key: "employeeForm",
             type: "createForm",
             collection: "employees",
-            fields: ["nickname", "status", "amount", "taxRate", "subtotal", "total"],
+            fields: [
+              { key: "nicknameField", field: "nickname" },
+              { key: "statusField", field: "status" },
+              "amount",
+              "taxRate",
+              "subtotal",
+              "total"
+            ],
+            fieldsLayout: {
+              rows: [
+                ["nicknameField"],
+                [
+                  { key: "statusField", span: 12 },
+                  { key: "amount", span: 12 }
+                ],
+                ["taxRate"],
+                ["subtotal"],
+                ["total"]
+              ]
+            },
             actions: ["submit"]
           },
           {
@@ -437,6 +456,14 @@ const flowSurfaceExamples = {
             target: "table"
           }
         ],
+        fieldsLayout: {
+          rows: [
+            [
+              { key: "nickname", span: 12 },
+              { key: "username", span: 12 }
+            ]
+          ]
+        },
         actions: ["submit", "reset", "collapse"]
       },
       {

package/dist/swagger/flow-surfaces.js

@@ -491,7 +491,7 @@ const actionDocs = {
     tags: [FLOW_SURFACES_TAG],
     summary: "Apply an approval blueprint to initiator, approver, or task-card surfaces",
     description: valuesCompatibilityNote(
-      "Builds workflow-approval configuration surfaces through the existing flowSurfaces orchestration layer instead of a separate approval resource. This is the preferred whole-surface bootstrap / replace entry for approval initiator, approver, and task-card UIs. Unlike route-backed `applyBlueprint`, this action targets approval-bound FlowModel roots stored on approval workflow trigger config (`workflow.config.approvalUid` / `workflow.config.taskCardUid`) or approval node config (`node.config.approvalUid` / `node.config.taskCardUid`). The backend creates or reuses the correct approval root automatically, rewrites the binding uid, applies a `replace` blueprint to that root, and reconciles approval runtime config derived from approval actions such as withdraw / approve / reject / return / delegate / add-assignee. `surface='initiator'` requires `workflowId` and writes page-like `blocks + layout` into `TriggerChildPageModel -> TriggerChildPageTabModel -> TriggerBlockGridModel`. `surface='approver'` requires `nodeId` and writes page-like `blocks + layout` into `ApprovalChildPageModel -> ApprovalChildPageTabModel -> ApprovalBlockGridModel`. `surface='taskCard'` requires exactly one of `workflowId` or `nodeId` and writes `fields + layout` into `ApplyTaskCardDetailsModel` or `ApprovalTaskCardDetailsModel`. This v1 action does not cover legacy schema-config wiring; it focuses on approval FlowModel construction, binding persistence, and approval runtime-config synchronization. When `layout` is omitted, the backend generates a simple top-to-bottom layout for the resulting blocks or fields."
+      "Builds workflow-approval configuration surfaces through the existing flowSurfaces orchestration layer instead of a separate approval resource. This is the preferred whole-surface bootstrap / replace entry for approval initiator, approver, and task-card UIs. Unlike route-backed `applyBlueprint`, this action targets approval-bound FlowModel roots stored on approval workflow trigger config (`workflow.config.approvalUid` / `workflow.config.taskCardUid`) or approval node config (`node.config.approvalUid` / `node.config.taskCardUid`). The backend creates or reuses the correct approval root automatically, rewrites the binding uid, applies a `replace` blueprint to that root, and reconciles approval runtime config derived from approval actions such as withdraw / approve / reject / return / delegate / add-assignee. `surface='initiator'` requires `workflowId` and writes page-like `blocks + layout` into `TriggerChildPageModel -> TriggerChildPageTabModel -> TriggerBlockGridModel`. `surface='approver'` requires `nodeId` and writes page-like `blocks + layout` into `ApprovalChildPageModel -> ApprovalChildPageTabModel -> ApprovalBlockGridModel`. Page-like `blocks[]` may either declare a concrete `type` or reuse a saved block template through `template: { uid, mode }`. `surface='taskCard'` requires exactly one of `workflowId` or `nodeId` and writes `fields + layout` into `ApplyTaskCardDetailsModel` or `ApprovalTaskCardDetailsModel`. This v1 action does not cover legacy schema-config wiring; it focuses on approval FlowModel construction, binding persistence, and approval runtime-config synchronization. When `layout` is omitted, the backend generates a simple top-to-bottom layout for the resulting blocks or fields."
     ),
     requestBody: {
       required: true,
@@ -568,7 +568,7 @@ const actionDocs = {
     tags: [FLOW_SURFACES_TAG],
     summary: "Apply simple semantic changes to a page, tab, block, field or action",
     description: valuesCompatibilityNote(
-      "Uses simple `changes` to update high-frequency settings such as page/tab titles, table pageSize, field clickToOpen, and action openView/confirm without requiring the caller to know internal paths. For advanced reaction authoring, prefer `getReactionMeta` + `set*Rules`; the raw `assignRules` / `linkageRules` examples here are compatibility-only. Check `catalog.node.configureOptions` together with the relevant catalog item `configureOptions` before calling this action. On approval action nodes, this route also accepts approval-specific keys such as `approvalReturn` and `assigneesScope`, and flowSurfaces persists the matching approval runtime config. It does not replace `applyApprovalBlueprint` for whole-surface approval bootstrap."
+      "Uses simple `changes` to update high-frequency settings such as page/tab titles, table pageSize, field clickToOpen, and action openView/confirm without requiring the caller to know internal paths. For advanced reaction authoring, prefer `getReactionMeta` + `set*Rules`; the raw `assignRules` / `linkageRules` examples here are compatibility-only. Check `catalog.node.configureOptions` together with the relevant catalog item `configureOptions` before calling this action. On approval action nodes, this route also accepts approval-specific keys such as `confirm`, `assignValues`, `commentFormUid`, `approvalReturn`, and `assigneesScope`, and flowSurfaces persists the matching approval runtime config. It does not replace `applyApprovalBlueprint` for whole-surface approval bootstrap."
     ),
     requestBody: {
       required: true,
@@ -2392,6 +2392,10 @@ const schemas = {
         type: "array",
         items: ref("FlowSurfaceComposeFieldSpec")
       },
+      fieldsLayout: {
+        allOf: [ref("FlowSurfaceComposeLayout")],
+        description: "Optional inner field-grid layout for `createForm`, `editForm`, `details`, or `filterForm`. Uses the same public `{ rows: [[...]] }` shape as top-level layout, but references field keys inside the current block and must place every created field exactly once."
+      },
       actions: {
         type: "array",
         description: "Block-level actions. For table/list/gridCard, prefer block-wide collection actions here.",
@@ -2407,7 +2411,8 @@ const schemas = {
   },
   FlowSurfaceApprovalBlueprintBlockSpec: {
     type: "object",
-    required: ["key", "type"],
+    required: ["key"],
+    anyOf: [{ required: ["type"] }, { required: ["template"] }],
     properties: {
       key: {
         type: "string"
@@ -2416,6 +2421,7 @@ const schemas = {
         type: "string",
         enum: APPROVAL_BLUEPRINT_BLOCK_TYPE_ENUM
       },
+      template: ref("FlowSurfaceBlockTemplateRef"),
       resource: ref("FlowSurfaceBlockResourceInput"),
       settings: ANY_OBJECT_SCHEMA,
       fields: {
@@ -3276,7 +3282,7 @@ const schemas = {
   },
   FlowSurfaceApplyBlueprintLayout: {
     type: "object",
-    description: "Layout object allowed only on tabs and inline popup documents, never on individual blocks.",
+    description: "Layout object used by tab/popup `layout` and field-grid-block `fieldsLayout`. Block-level `layout` is still not allowed; use `fieldsLayout` only on `createForm`, `editForm`, `details`, or `filterForm`.",
     properties: {
       rows: {
         type: "array",
@@ -3406,7 +3412,7 @@ const schemas = {
   },
   FlowSurfaceApplyBlueprintBlockSpec: {
     type: "object",
-    description: "Public applyBlueprint block spec. Blocks do not accept a `layout` property; use tab.layout or popup.layout instead. Generic `form` is not supported here; use `editForm` or `createForm`.",
+    description: "Public applyBlueprint block spec. Blocks do not accept a `layout` property; use tab.layout or popup.layout instead. `fieldsLayout` is available only on `createForm`, `editForm`, `details`, and `filterForm`. Generic `form` is not supported here; use `editForm` or `createForm`.",
     anyOf: [{ required: ["type"] }, { required: ["template"] }],
     properties: {
       key: { type: "string" },
@@ -3440,6 +3446,10 @@ const schemas = {
         type: "array",
         items: ref("FlowSurfaceApplyBlueprintFieldSpec")
       },
+      fieldsLayout: {
+        allOf: [ref("FlowSurfaceApplyBlueprintLayout")],
+        description: "Optional inner field-grid layout for `createForm`, `editForm`, `details`, or `filterForm`. Uses the same public `{ rows: [[...]] }` shape as tab/popup layout, but references field keys inside the current block and must place every created field exactly once."
+      },
       actions: {
         type: "array",
         description: `Block-level actions. On record-capable blocks, \`view\`, \`edit\`, \`updateRecord\`, \`delete\`, and \`duplicate\` should normally go to \`recordActions\`; applyBlueprint auto-promotes those common record actions when they are written here. ${APPLY_BLUEPRINT_ADD_CHILD_NOTE}`,
@@ -3629,7 +3639,7 @@ const schemas = {
   FlowSurfaceApplyApprovalBlueprintRequest: {
     type: "object",
     required: ["surface"],
-    description: "Simplified approval-surface blueprint request for workflow approval UIs. This is the preferred bootstrap / replace route for approval initiator, approver, and task-card surfaces. `version` may be omitted and defaults to '1'. `mode` may be omitted and defaults to `replace`; v1 only supports `replace`. Runtime validation enforces binding rules: `initiator` requires `workflowId`, `approver` requires `nodeId`, and `taskCard` requires exactly one of `workflowId` or `nodeId`. Page-like surfaces (`initiator`, `approver`) accept `blocks + layout`; `taskCard` accepts `fields + layout`. This route does not perform schema wiring, but it does persist binding fields and reconcile approval runtime config from approval actions.",
+    description: "Simplified approval-surface blueprint request for workflow approval UIs. This is the preferred bootstrap / replace route for approval initiator, approver, and task-card surfaces. `version` may be omitted and defaults to '1'. `mode` may be omitted and defaults to `replace`; v1 only supports `replace`. Runtime validation enforces binding rules: `initiator` requires `workflowId`, `approver` requires `nodeId`, and `taskCard` requires exactly one of `workflowId` or `nodeId`. Page-like surfaces (`initiator`, `approver`) accept `blocks + layout`; each block may declare `type` directly or reuse `template: { uid, mode }`. `taskCard` accepts `fields + layout`. This route does not perform schema wiring, but it does persist binding fields and reconcile approval runtime config from approval actions.",
     properties: {
       version: {
         type: "string",

package/dist/swagger/index.d.ts

@@ -569,6 +569,12 @@ declare const _default: {
                             $ref: string;
                         };
                     };
+                    fieldsLayout: {
+                        allOf: {
+                            $ref: string;
+                        }[];
+                        description: string;
+                    };
                     actions: {
                         type: string;
                         description: string;
@@ -589,6 +595,9 @@ declare const _default: {
             FlowSurfaceApprovalBlueprintBlockSpec: {
                 type: string;
                 required: string[];
+                anyOf: {
+                    required: string[];
+                }[];
                 properties: {
                     key: {
                         type: string;
@@ -597,6 +606,9 @@ declare const _default: {
                         type: string;
                         enum: string[];
                     };
+                    template: {
+                        $ref: string;
+                    };
                     resource: {
                         $ref: string;
                     };
@@ -2164,6 +2176,12 @@ declare const _default: {
                             $ref: string;
                         };
                     };
+                    fieldsLayout: {
+                        allOf: {
+                            $ref: string;
+                        }[];
+                        description: string;
+                    };
                     actions: {
                         type: string;
                         description: string;

package/package.json

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