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

package/dist/externalVersion.js

@@ -8,15 +8,15 @@
  */
 
 module.exports = {
-  "@nocobase/client": "2.1.0-alpha.19",
+  "@nocobase/client": "2.1.0-alpha.20",
   "lodash": "4.18.1",
-  "@nocobase/database": "2.1.0-alpha.19",
-  "@nocobase/data-source-manager": "2.1.0-alpha.19",
-  "@nocobase/resourcer": "2.1.0-alpha.19",
-  "@nocobase/utils": "2.1.0-alpha.19",
-  "@nocobase/cache": "2.1.0-alpha.19",
-  "@nocobase/plugin-localization": "2.1.0-alpha.19",
-  "@nocobase/server": "2.1.0-alpha.19",
-  "@nocobase/actions": "2.1.0-alpha.19",
-  "@nocobase/ai": "2.1.0-alpha.19"
+  "@nocobase/database": "2.1.0-alpha.20",
+  "@nocobase/data-source-manager": "2.1.0-alpha.20",
+  "@nocobase/resourcer": "2.1.0-alpha.20",
+  "@nocobase/utils": "2.1.0-alpha.20",
+  "@nocobase/cache": "2.1.0-alpha.20",
+  "@nocobase/plugin-localization": "2.1.0-alpha.20",
+  "@nocobase/server": "2.1.0-alpha.20",
+  "@nocobase/actions": "2.1.0-alpha.20",
+  "@nocobase/ai": "2.1.0-alpha.20"
 };

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-19T04:12:22.128Z"}
+{"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-20T10:43:10.802Z"}

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-19T04:12:23.144Z"}
+{"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-20T10:43:11.885Z"}

package/dist/server/flow-surfaces/approval/blueprint.js

@@ -96,9 +96,6 @@ function normalizeBlocks(input) {
     if (!import_lodash.default.isPlainObject(block)) {
       (0, import_errors.throwBadRequest)(`flowSurfaces applyApprovalBlueprint blocks[${index}] must be an object`);
     }
-    if (!import_lodash.default.isUndefined(block.template)) {
-      (0, import_errors.throwBadRequest)(`flowSurfaces applyApprovalBlueprint blocks[${index}] does not accept template`);
-    }
   });
   return normalized;
 }

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

@@ -43,6 +43,7 @@ module.exports = __toCommonJS(compile_blocks_exports);
 var import_lodash = __toESM(require("lodash"));
 var import_errors = require("../errors");
 var import_service_utils = require("../service-utils");
+var import_default_block_actions = require("../default-block-actions");
 var import_private_utils = require("./private-utils");
 const APPLY_BLUEPRINT_BLOCK_TYPE_ENUM = [
   "table",
@@ -71,6 +72,7 @@ const APPLY_BLUEPRINT_BLOCK_ALLOWED_KEYS = [
   "template",
   "settings",
   "fields",
+  "fieldsLayout",
   "actions",
   "recordActions",
   "script",
@@ -127,6 +129,7 @@ const APPLY_BLUEPRINT_BLOCK_RESOURCE_SHORTHAND_KEYS = [
   "associationField"
 ];
 const APPLY_BLUEPRINT_RECORD_CAPABLE_BLOCK_TYPES = /* @__PURE__ */ new Set(["table", "details", "list", "gridCard"]);
+const APPLY_BLUEPRINT_FIELD_GRID_BLOCK_TYPES = /* @__PURE__ */ new Set(["createForm", "editForm", "details", "filterForm"]);
 const APPLY_BLUEPRINT_AUTO_PROMOTED_RECORD_ACTION_TYPES = /* @__PURE__ */ new Set([
   "view",
   "edit",
@@ -141,6 +144,15 @@ function assertNoBlockLevelLayout(input, context) {
     (0, import_errors.throwBadRequest)(`${context}.layout is not supported; layout is only allowed on tabs[] and popup`);
   }
 }
+function assertApplyBlueprintFieldsLayoutHost(block, context) {
+  if (!Object.prototype.hasOwnProperty.call(block, "fieldsLayout")) {
+    return;
+  }
+  if (APPLY_BLUEPRINT_FIELD_GRID_BLOCK_TYPES.has((0, import_private_utils.readOptionalString)(block.type) || "")) {
+    return;
+  }
+  (0, import_errors.throwBadRequest)(`${context}.fieldsLayout is only supported on createForm, editForm, details or filterForm`);
+}
 function assertApplyBlueprintBlockType(type, context) {
   if (!type) {
     return;
@@ -464,6 +476,16 @@ function collectReferencedBlockKeys(layout, context) {
   return referenced;
 }
 function compileLayout(layout, blockKeysByLocalKey, context) {
+  return compileScopedLayout(layout, blockKeysByLocalKey, context, "block");
+}
+function resolveScopedLayoutKey(rawKey, keysByLocalKey, context, kind) {
+  const resolved = keysByLocalKey.get(rawKey) || [...keysByLocalKey.values()].find((value) => value === rawKey);
+  if (!resolved) {
+    (0, import_errors.throwBadRequest)(`${context} references unknown ${kind} '${rawKey}'`);
+  }
+  return resolved;
+}
+function compileScopedLayout(layout, keysByLocalKey, context, kind) {
   const rows = ensureLayoutRows(layout, context);
   if (!rows) {
     return void 0;
@@ -471,24 +493,58 @@ function compileLayout(layout, blockKeysByLocalKey, context) {
   return {
     rows: rows.map((row, rowIndex) => {
       return row.map((item, itemIndex) => {
+        const cellContext = `${context}.rows[${rowIndex}][${itemIndex}]`;
         if (typeof item === "string") {
           const itemKey = (0, import_private_utils.readString)(item);
-          const resolved2 = blockKeysByLocalKey.get(itemKey) || [...blockKeysByLocalKey.values()].find((value) => value === itemKey);
-          if (!resolved2) {
-            (0, import_errors.throwBadRequest)(`${context}.rows[${rowIndex}][${itemIndex}] references unknown block '${item}'`);
-          }
-          return resolved2;
+          return resolveScopedLayoutKey(itemKey, keysByLocalKey, cellContext, kind);
         }
-        const rawKey = (0, import_private_utils.assertNonEmptyString)(item.key, `${context}.rows[${rowIndex}][${itemIndex}].key`);
-        const resolved = blockKeysByLocalKey.get(rawKey) || [...blockKeysByLocalKey.values()].find((value) => value === rawKey) || rawKey;
+        const rawKey = (0, import_private_utils.assertNonEmptyString)(item.key, `${cellContext}.key`);
+        const resolved = resolveScopedLayoutKey(rawKey, keysByLocalKey, cellContext, kind);
         return (0, import_service_utils.buildDefinedPayload)({
           key: resolved,
-          span: import_lodash.default.isUndefined(item.span) ? void 0 : import_lodash.default.isNumber(item.span) ? item.span : (0, import_errors.throwBadRequest)(`${context}.rows[${rowIndex}][${itemIndex}].span must be a number`)
+          span: import_lodash.default.isUndefined(item.span) ? void 0 : import_lodash.default.isNumber(item.span) ? item.span : (0, import_errors.throwBadRequest)(`${cellContext}.span must be a number`)
         });
       });
     })
   };
 }
+function resolveApplyBlueprintFieldLocalKey(input, index, context) {
+  if (typeof input === "string") {
+    return (0, import_private_utils.assertNonEmptyString)(input, `${context}[${index}]`);
+  }
+  if (!import_lodash.default.isPlainObject(input)) {
+    (0, import_errors.throwBadRequest)(`${context}[${index}] must be a string or object`);
+  }
+  const fieldPath = (0, import_private_utils.readOptionalString)(input.field);
+  const syntheticType = (0, import_private_utils.readOptionalString)(input.type);
+  if (!fieldPath && !syntheticType) {
+    (0, import_errors.throwBadRequest)(`${context}[${index}] requires field or type`);
+  }
+  if (fieldPath && syntheticType) {
+    (0, import_errors.throwBadRequest)(`${context}[${index}] cannot mix field with synthetic type`);
+  }
+  return (0, import_private_utils.normalizeBlueprintLocalKey)(
+    input.key,
+    fieldPath || (syntheticType ? `${syntheticType}_${index + 1}` : `field_${index + 1}`),
+    `${context}[${index}].key`
+  );
+}
+function buildCompiledFieldKeyMap(inputs, compiledFields, context) {
+  const fieldKeysByLocalKey = /* @__PURE__ */ new Map();
+  inputs.forEach((input, index) => {
+    var _a;
+    const localKey = resolveApplyBlueprintFieldLocalKey(input, index, context);
+    const compiledKey = (0, import_private_utils.readOptionalString)((_a = compiledFields[index]) == null ? void 0 : _a.key);
+    if (!compiledKey) {
+      (0, import_errors.throwBadRequest)(`${context}[${index}] key '${localKey}' is missing after field key compilation`);
+    }
+    if (fieldKeysByLocalKey.has(localKey)) {
+      (0, import_errors.throwBadRequest)(`${context}[${index}] key '${localKey}' is duplicated`);
+    }
+    fieldKeysByLocalKey.set(localKey, compiledKey);
+  });
+  return fieldKeysByLocalKey;
+}
 function compilePopup(popup, scopePrefix, assets, context, options = {}) {
   if (import_lodash.default.isUndefined(popup)) {
     return {};
@@ -643,6 +699,16 @@ function compileAction(input, index, scopePrefix, assets, context) {
     popup: popupResult.popup
   });
 }
+function compileInjectedDefaultAction(descriptor, scopePrefix, context, index) {
+  return (0, import_service_utils.buildDefinedPayload)({
+    key: (0, import_service_utils.normalizeFlowSurfaceComposeKey)(
+      (0, import_private_utils.buildScopedKey)(scopePrefix, `${descriptor.type}_default_${index + 1}`),
+      `${context}[${index}]`
+    ),
+    type: descriptor.type,
+    popup: descriptor.popup ? import_lodash.default.cloneDeep(descriptor.popup) : void 0
+  });
+}
 function compileBlocks(input, scopePrefix, assets, context, requiredExplicitBlockKeys = /* @__PURE__ */ new Set()) {
   const blockKeysByLocalKey = /* @__PURE__ */ new Map();
   const referencedBlockKeys = new Set(requiredExplicitBlockKeys);
@@ -666,6 +732,7 @@ function compileBlocks(input, scopePrefix, assets, context, requiredExplicitBloc
       (0, import_errors.throwBadRequest)(`${context}[${index}] must be an object`);
     }
     assertNoBlockLevelLayout(block, `${context}[${index}]`);
+    assertApplyBlueprintFieldsLayoutHost(block, `${context}[${index}]`);
     (0, import_private_utils.assertOnlyAllowedKeys)(block, `${context}[${index}]`, APPLY_BLUEPRINT_BLOCK_ALLOWED_KEYS);
     assertApplyBlueprintBlockType((0, import_private_utils.readOptionalString)(block.type), `${context}[${index}]`);
     const explicitKey = (0, import_private_utils.readString)(block.key);
@@ -698,23 +765,49 @@ function compileBlocks(input, scopePrefix, assets, context, requiredExplicitBloc
       settings.title = (0, import_private_utils.readOptionalString)(block.title);
     }
     const template = ensureOptionalTemplate(block.template, `${blockContext}.template`);
-    const fields = readOptionalItems(block.fields, `${blockContext}.fields`);
+    const fieldInputs = readOptionalItems(block.fields, `${blockContext}.fields`);
+    const fields = fieldInputs.map(
+      (field, fieldIndex) => compileField(field, fieldIndex, key, assets, blockKeysByLocalKey, `${blockContext}.fields`)
+    );
+    const fieldsLayout = Object.prototype.hasOwnProperty.call(block, "fieldsLayout") ? compileScopedLayout(
+      import_lodash.default.isUndefined(block.fieldsLayout) ? void 0 : import_lodash.default.isPlainObject(block.fieldsLayout) ? block.fieldsLayout : (0, import_errors.throwBadRequest)(`${blockContext}.fieldsLayout must be an object`),
+      buildCompiledFieldKeyMap(fieldInputs, fields, `${blockContext}.fields`),
+      `${blockContext}.fieldsLayout`,
+      "field"
+    ) : void 0;
     const { actions, recordActions } = splitApplyBlueprintBlockActionsByScope(block, blockContext);
+    const explicitActions = actions.map(
+      (action, actionIndex) => compileAction(action, actionIndex, key, assets, `${blockContext}.actions`)
+    );
+    const explicitRecordActions = recordActions.map(
+      (action, actionIndex) => compileAction(action, actionIndex, key, assets, `${blockContext}.recordActions`)
+    );
+    const injectedActionIndexes = {
+      actions: explicitActions.length,
+      recordActions: explicitRecordActions.length
+    };
+    const mergedActions = (0, import_default_block_actions.mergeFlowSurfaceDefaultBlockActions)({
+      blockType: (0, import_private_utils.readOptionalString)(block.type),
+      template,
+      actions: explicitActions,
+      recordActions: explicitRecordActions,
+      createAction: (descriptor) => compileInjectedDefaultAction(
+        descriptor,
+        key,
+        `${blockContext}.${descriptor.scope}`,
+        injectedActionIndexes[descriptor.scope]++
+      )
+    });
     return (0, import_service_utils.buildDefinedPayload)({
       key,
       type: (0, import_private_utils.readOptionalString)(block.type),
       resource: buildBlockResource(block, blockContext),
       template,
       settings: Object.keys(settings).length ? settings : void 0,
-      fields: fields.map(
-        (field, fieldIndex) => compileField(field, fieldIndex, key, assets, blockKeysByLocalKey, `${blockContext}.fields`)
-      ),
-      actions: actions.map(
-        (action, actionIndex) => compileAction(action, actionIndex, key, assets, `${blockContext}.actions`)
-      ),
-      recordActions: recordActions.map(
-        (action, actionIndex) => compileAction(action, actionIndex, key, assets, `${blockContext}.recordActions`)
-      )
+      fields,
+      fieldsLayout,
+      actions: mergedActions.actions,
+      recordActions: mergedActions.recordActions
     });
   });
   return {

package/dist/server/flow-surfaces/blueprint/public-types.d.ts

@@ -117,6 +117,7 @@ export type FlowSurfaceApplyBlueprintBlockSpec = {
     template?: Record<string, any>;
     settings?: Record<string, any>;
     fields?: FlowSurfaceApplyBlueprintFieldSpec[];
+    fieldsLayout?: FlowSurfaceApplyBlueprintLayout;
     actions?: FlowSurfaceApplyBlueprintActionSpec[];
     recordActions?: FlowSurfaceApplyBlueprintActionSpec[];
     script?: string;

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

@@ -42,6 +42,7 @@ export type FlowSurfaceComposeNormalizedBlockSpec = {
     template?: FlowSurfaceComposeObject;
     settings?: FlowSurfaceComposeObject;
     fields: FlowSurfaceComposeNormalizedFieldSpec[];
+    fieldsLayout?: FlowSurfaceComposeObject;
     actions: FlowSurfaceComposeNormalizedActionSpec[];
     recordActions: FlowSurfaceComposeNormalizedActionSpec[];
 };

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

@@ -31,6 +31,10 @@ export type FlowSurfaceComposeActionResult = {
 export type FlowSurfaceComposeRuntimeBlockState = {
     spec: FlowSurfaceComposeNormalizedBlockSpec;
     result: FlowSurfaceComposeBlockResult;
+    createdFields: Array<{
+        spec: FlowSurfaceComposeNormalizedFieldSpec;
+        result: FlowSurfaceComposeFieldResult;
+    }>;
     fieldResults: Array<Record<string, unknown>>;
     actionResults: Array<Record<string, unknown>>;
     recordActionResults: Array<Record<string, unknown>>;
@@ -77,7 +81,7 @@ export type FlowSurfaceComposeRuntimeDeps = {
     buildExplicitLayoutPayload?: (input: {
         layout?: FlowSurfaceComposeObject;
         createdByKey: Record<string, FlowSurfaceComposeTargetKey & Partial<FlowSurfaceComposeBlockResult>>;
-        gridUid: string;
+        targetUid: string;
     }) => Promise<Record<string, unknown>> | Record<string, unknown>;
     buildAppendLayoutPayload?: (input: {
         gridUid: string;

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

@@ -40,6 +40,7 @@ async function executeComposeRuntime(plan, deps) {
   await createBlocks(plan, deps, state);
   await applyBlockSettings(deps, state);
   await createFields(plan, deps, state);
+  await applyBlockFieldLayouts(deps, state);
   await createActions(plan, deps, state);
   await createRecordActions(plan, deps, state);
   const layoutResult = await applyComposeLayout(plan, deps, state);
@@ -118,6 +119,7 @@ async function createBlocks(plan, deps, state) {
     state.blocks.push({
       spec: blockTask.spec,
       result,
+      createdFields: [],
       fieldResults: [],
       actionResults: [],
       recordActionResults: []
@@ -181,12 +183,44 @@ async function createFields(plan, deps, state) {
     if (!createdField) {
       continue;
     }
+    block.createdFields.push({
+      spec: fieldTask.spec,
+      result: createdField
+    });
     if (deps.applyFieldSettings && hasInlineSettings(fieldTask.spec.settings)) {
       await deps.applyFieldSettings("compose field", createdField, fieldTask.spec.settings);
     }
     block.fieldResults.push(buildFieldResultSummary(fieldTask.spec, createdField));
   }
 }
+async function applyBlockFieldLayouts(deps, state) {
+  const buildExplicitLayoutPayload = deps.buildExplicitLayoutPayload;
+  const setLayout = deps.setLayout;
+  for (const block of state.blocks) {
+    if (!hasInlineSettings(block.spec.fieldsLayout)) {
+      continue;
+    }
+    requireComposeRuntimeDep("buildExplicitLayoutPayload", buildExplicitLayoutPayload, "field layout");
+    requireComposeRuntimeDep("setLayout", setLayout, "field layout");
+    const createdByKey = Object.fromEntries(
+      block.createdFields.flatMap(({ spec, result }) => {
+        const uid = resolveComposeFieldLayoutUid(result);
+        return uid ? [[spec.key, { uid }]] : [];
+      })
+    );
+    const layoutPayload = await buildExplicitLayoutPayload({
+      layout: block.spec.fieldsLayout,
+      createdByKey,
+      targetUid: block.result.uid
+    });
+    await setLayout({
+      target: {
+        uid: block.result.uid
+      },
+      ...layoutPayload
+    });
+  }
+}
 async function createActions(plan, deps, state) {
   for (const actionTask of plan.actions) {
     const block = requireBlockState(actionTask.blockKey, state);
@@ -252,7 +286,7 @@ async function applyComposeLayout(plan, deps, state) {
     const layoutPayload2 = await buildExplicitLayoutPayload({
       layout: plan.layoutPlan.layout,
       createdByKey: state.keyMap,
-      gridUid: plan.gridUid
+      targetUid: plan.gridUid
     });
     return setLayout2({
       target: {
@@ -316,6 +350,9 @@ function buildActionResultSummary(spec, createdAction, actionKeys) {
 function hasInlineSettings(value) {
   return !!value && Object.keys(value).length > 0;
 }
+function resolveComposeFieldLayoutUid(result) {
+  return result.wrapperUid || result.uid;
+}
 function hasPopupAfterEffect(value) {
   return typeof value !== "undefined";
 }

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

@@ -443,6 +443,11 @@ const ACTION_ASSIGN_OPTIONS = {
   assignValues: objectOption("Bulk or single-record assigned values", { example: { status: "published" } }),
   updateMode: stringOption("Update mode", { example: "overwrite" })
 };
+const APPROVAL_ASSIGN_ACTION_OPTIONS = {
+  assignValues: objectOption("Assigned values persisted with the approval action payload", {
+    example: { department: "finance" }
+  })
+};
 const ACTION_LINKAGE_OPTIONS = {
   linkageRules: arrayOption(
     "Raw linkage-rules payload. For AI/CLI authoring, prefer `getReactionMeta` + `setActionLinkageRules` instead of guessing this configure key directly.",
@@ -461,6 +466,11 @@ const APPROVAL_RETURN_ACTION_OPTIONS = {
     }
   })
 };
+const APPROVAL_COMMENT_ACTION_OPTIONS = {
+  commentFormUid: stringOption("Comment form model uid", {
+    example: "comment-form-uid"
+  })
+};
 const APPROVAL_REASSIGN_ACTION_OPTIONS = {
   assigneesScope: objectOption("Approval reassignee scope", {
     example: {
@@ -569,11 +579,6 @@ function getActionConfigureOptionsByUse(use) {
     case "ExportActionModel":
     case "ExportAttachmentActionModel":
     case "ImportActionModel":
-    case "ApplyFormSubmitModel":
-    case "ApplyFormSaveDraftModel":
-    case "ApplyFormWithdrawModel":
-    case "ProcessFormApproveModel":
-    case "ProcessFormRejectModel":
     case "TemplatePrintCollectionActionModel":
     case "TemplatePrintRecordActionModel":
     case "CollectionTriggerWorkflowActionModel":
@@ -586,8 +591,16 @@ function getActionConfigureOptionsByUse(use) {
     case "FilterFormSubmitActionModel":
     case "FilterFormResetActionModel":
       return merged(ACTION_LINKAGE_OPTIONS);
+    case "ApplyFormSubmitModel":
+    case "ApplyFormSaveDraftModel":
+      return merged(ACTION_CONFIRM_OPTIONS, APPROVAL_ASSIGN_ACTION_OPTIONS, ACTION_LINKAGE_OPTIONS);
+    case "ApplyFormWithdrawModel":
+      return merged(ACTION_CONFIRM_OPTIONS, ACTION_LINKAGE_OPTIONS);
+    case "ProcessFormApproveModel":
+    case "ProcessFormRejectModel":
+      return merged(APPROVAL_COMMENT_ACTION_OPTIONS, ACTION_LINKAGE_OPTIONS);
     case "ProcessFormReturnModel":
-      return merged(ACTION_LINKAGE_OPTIONS, APPROVAL_RETURN_ACTION_OPTIONS);
+      return merged(APPROVAL_COMMENT_ACTION_OPTIONS, ACTION_LINKAGE_OPTIONS, APPROVAL_RETURN_ACTION_OPTIONS);
     case "ProcessFormDelegateModel":
     case "ProcessFormAddAssigneeModel":
       return merged(ACTION_LINKAGE_OPTIONS, APPROVAL_REASSIGN_ACTION_OPTIONS);

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

@@ -81,8 +81,8 @@ const FLOW_SURFACE_DEFAULT_ACTION_POPUP_CONFIGS = [
       key: "defaultSubmit",
       type: "submit",
       settings: {
-        title: "Save",
-        type: "",
+        title: "Submit",
+        type: "primary",
         confirm: false
       }
     }
@@ -128,8 +128,8 @@ const FLOW_SURFACE_DEFAULT_ACTION_POPUP_CONFIGS = [
       key: "defaultSubmit",
       type: "submit",
       settings: {
-        title: "Save Changes",
-        type: "",
+        title: "Submit",
+        type: "primary",
         confirm: false
       }
     }

package/dist/server/flow-surfaces/default-block-actions.d.ts

@@ -0,0 +1,32 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * 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 FLOW_SURFACE_INTERNAL_AUTO_SAVE_DEFAULT_POPUP_TEMPLATE_KEY = "__flowSurfaceAutoSaveDefaultPopupTemplate";
+export type FlowSurfaceDefaultBlockActionScope = 'actions' | 'recordActions';
+export type FlowSurfaceDefaultBlockActionDescriptor = {
+    type: string;
+    scope: FlowSurfaceDefaultBlockActionScope;
+    popup?: Record<string, any>;
+};
+export declare function getFlowSurfaceDefaultBlockActions(input: {
+    blockType?: string;
+    template?: unknown;
+}): FlowSurfaceDefaultBlockActionDescriptor[];
+export declare function mergeFlowSurfaceDefaultBlockActions<T extends {
+    type?: string;
+    popup?: Record<string, any>;
+}>(input: {
+    blockType?: string;
+    template?: unknown;
+    actions?: T[];
+    recordActions?: T[];
+    createAction: (descriptor: FlowSurfaceDefaultBlockActionDescriptor) => T;
+}): {
+    actions: T[];
+    recordActions: T[];
+};