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

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-20T10:43:11.885Z"}
+{"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-23T22:20:03.373Z"}

package/dist/server/flow-surfaces/action-scope.d.ts

@@ -8,6 +8,7 @@
  */
 import type { FlowSurfaceActionScope } from './types';
 export declare const TABLE_BLOCK_ACTION_CONTAINER_USES: string[];
+export declare const CALENDAR_BLOCK_ACTION_CONTAINER_USES: string[];
 export declare const TABLE_ROW_ACTION_CONTAINER_USES: string[];
 export declare const LIST_BLOCK_ACTION_CONTAINER_USES: string[];
 export declare const LIST_RECORD_ACTION_CONTAINER_USES: string[];

package/dist/server/flow-surfaces/action-scope.js

@@ -28,6 +28,7 @@ var action_scope_exports = {};
 __export(action_scope_exports, {
   ACTION_CONTAINER_SCOPE_BY_USE: () => ACTION_CONTAINER_SCOPE_BY_USE,
   ACTION_PANEL_ACTION_CONTAINER_USES: () => ACTION_PANEL_ACTION_CONTAINER_USES,
+  CALENDAR_BLOCK_ACTION_CONTAINER_USES: () => CALENDAR_BLOCK_ACTION_CONTAINER_USES,
   COLLECTION_BLOCK_ACTION_CONTAINER_USES: () => COLLECTION_BLOCK_ACTION_CONTAINER_USES,
   DETAILS_ACTION_CONTAINER_USES: () => DETAILS_ACTION_CONTAINER_USES,
   FILTER_FORM_ACTION_CONTAINER_USES: () => FILTER_FORM_ACTION_CONTAINER_USES,
@@ -48,6 +49,7 @@ var import_approval = require("./approval");
 var import_errors = require("./errors");
 const ACTION_SCOPE_SET = /* @__PURE__ */ new Set(["block", "record", "form", "filterForm", "actionPanel"]);
 const TABLE_BLOCK_ACTION_CONTAINER_USES = ["TableBlockModel"];
+const CALENDAR_BLOCK_ACTION_CONTAINER_USES = ["CalendarBlockModel"];
 const TABLE_ROW_ACTION_CONTAINER_USES = ["TableActionsColumnModel"];
 const LIST_BLOCK_ACTION_CONTAINER_USES = ["ListBlockModel", "GridCardBlockModel"];
 const LIST_RECORD_ACTION_CONTAINER_USES = ["ListItemModel", "GridCardItemModel"];
@@ -57,6 +59,7 @@ const FILTER_FORM_ACTION_CONTAINER_USES = ["FilterFormBlockModel"];
 const ACTION_PANEL_ACTION_CONTAINER_USES = ["ActionPanelBlockModel"];
 const COLLECTION_BLOCK_ACTION_CONTAINER_USES = [
   ...TABLE_BLOCK_ACTION_CONTAINER_USES,
+  ...CALENDAR_BLOCK_ACTION_CONTAINER_USES,
   ...LIST_BLOCK_ACTION_CONTAINER_USES
 ];
 const RECORD_ACTION_CONTAINER_USES = [
@@ -131,6 +134,7 @@ function assertRequestedActionScope(input) {
 0 && (module.exports = {
   ACTION_CONTAINER_SCOPE_BY_USE,
   ACTION_PANEL_ACTION_CONTAINER_USES,
+  CALENDAR_BLOCK_ACTION_CONTAINER_USES,
   COLLECTION_BLOCK_ACTION_CONTAINER_USES,
   DETAILS_ACTION_CONTAINER_USES,
   FILTER_FORM_ACTION_CONTAINER_USES,

package/dist/server/flow-surfaces/apply/compiler.js

@@ -582,7 +582,7 @@ function createActionNode(ops, state, parentRef, desiredNode, currentParent) {
 function createFieldNode(ops, state, parentRef, desiredNode) {
   var _a;
   const popup = normalizeApplyPopup(desiredNode, `flowSurfaces apply field '${desiredNode.use}'`);
-  const standaloneType = desiredNode.use === "JSColumnModel" ? "jsColumn" : desiredNode.use === "JSItemModel" ? "jsItem" : void 0;
+  const standaloneType = desiredNode.use === "JSColumnModel" ? "jsColumn" : desiredNode.use === "JSItemModel" ? "jsItem" : desiredNode.use === "DividerItemModel" ? "divider" : void 0;
   if (standaloneType) {
     if (popup) {
       throw new import_errors.FlowSurfaceBadRequestError(

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

@@ -148,7 +148,7 @@ function buildApprovalActionDefaults(use) {
     case "ApplyFormSubmitModel":
       return {
         props: {
-          title: "Submit",
+          title: '{{t("Submit")}}',
           type: "primary",
           htmlType: "submit"
         }
@@ -156,7 +156,7 @@ function buildApprovalActionDefaults(use) {
     case "ApplyFormSaveDraftModel":
       return {
         props: {
-          title: "Save draft",
+          title: '{{t("Save draft", { ns: "@nocobase/plugin-workflow-approval" })}}',
           type: "default",
           htmlType: "submit"
         }
@@ -164,7 +164,7 @@ function buildApprovalActionDefaults(use) {
     case "ApplyFormWithdrawModel":
       return {
         props: {
-          title: "Withdraw",
+          title: '{{t("Withdraw", { ns: "@nocobase/plugin-workflow-approval" })}}',
           type: "default",
           htmlType: "submit"
         }
@@ -172,14 +172,14 @@ function buildApprovalActionDefaults(use) {
     case "ProcessFormApproveModel":
       return {
         props: {
-          title: "Approve",
+          title: '{{t("Approve", { ns: "@nocobase/plugin-workflow-approval" })}}',
           type: "primary"
         }
       };
     case "ProcessFormRejectModel":
       return {
         props: {
-          title: "Reject",
+          title: '{{t("Reject", { ns: "@nocobase/plugin-workflow-approval" })}}',
           type: "default",
           danger: true
         }
@@ -187,21 +187,21 @@ function buildApprovalActionDefaults(use) {
     case "ProcessFormReturnModel":
       return {
         props: {
-          title: "Return",
+          title: '{{t("Return", { ns: "@nocobase/plugin-workflow-approval" })}}',
           type: "default"
         }
       };
     case "ProcessFormDelegateModel":
       return {
         props: {
-          title: "Delegate",
+          title: '{{t("Delegate", { ns: "@nocobase/plugin-workflow-approval" })}}',
           type: "default"
         }
       };
     case "ProcessFormAddAssigneeModel":
       return {
         props: {
-          title: "Add assignee",
+          title: '{{t("Add assignee", { ns: "@nocobase/plugin-workflow-approval" })}}',
           type: "default"
         }
       };

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

@@ -44,9 +44,12 @@ 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_public_data_surface_default_filter = require("../public-data-surface-default-filter");
+var import_defaults = require("./defaults");
 var import_private_utils = require("./private-utils");
 const APPLY_BLUEPRINT_BLOCK_TYPE_ENUM = [
   "table",
+  "calendar",
   "createForm",
   "editForm",
   "details",
@@ -72,7 +75,9 @@ const APPLY_BLUEPRINT_BLOCK_ALLOWED_KEYS = [
   "template",
   "settings",
   "fields",
+  "fieldGroups",
   "fieldsLayout",
+  "defaultFilter",
   "actions",
   "recordActions",
   "script",
@@ -91,6 +96,7 @@ const APPLY_BLUEPRINT_FIELD_ALLOWED_KEYS = [
   "script",
   "chart"
 ];
+const APPLY_BLUEPRINT_FIELD_GROUP_ALLOWED_KEYS = ["key", "title", "fields"];
 const APPLY_BLUEPRINT_ACTION_ALLOWED_KEYS = ["key", "type", "title", "settings", "popup", "script", "chart"];
 const APPLY_BLUEPRINT_POPUP_ALLOWED_KEYS = [
   "title",
@@ -130,6 +136,7 @@ const APPLY_BLUEPRINT_BLOCK_RESOURCE_SHORTHAND_KEYS = [
 ];
 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_FIELD_GROUP_BLOCK_TYPES = /* @__PURE__ */ new Set(["createForm", "editForm", "details"]);
 const APPLY_BLUEPRINT_AUTO_PROMOTED_RECORD_ACTION_TYPES = /* @__PURE__ */ new Set([
   "view",
   "edit",
@@ -137,6 +144,7 @@ const APPLY_BLUEPRINT_AUTO_PROMOTED_RECORD_ACTION_TYPES = /* @__PURE__ */ new Se
   "updateRecord",
   "duplicate"
 ]);
+const APPLY_BLUEPRINT_DEFAULT_POPUP_ACTION_TYPES = /* @__PURE__ */ new Set(["addNew", "view", "edit"]);
 const APPLY_BLUEPRINT_BLOCK_TYPES = new Set(APPLY_BLUEPRINT_BLOCK_TYPE_ENUM);
 const APPLY_BLUEPRINT_ADD_CHILD_RECORD_ACTION_ERROR = "type 'addChild' must be authored under recordActions and is only valid when the live target catalog.recordActions exposes it for a tree collection table with treeTable enabled";
 function assertNoBlockLevelLayout(input, context) {
@@ -153,6 +161,26 @@ function assertApplyBlueprintFieldsLayoutHost(block, context) {
   }
   (0, import_errors.throwBadRequest)(`${context}.fieldsLayout is only supported on createForm, editForm, details or filterForm`);
 }
+function assertApplyBlueprintCalendarMainContent(block, context) {
+  if ((0, import_private_utils.readOptionalString)(block.type) !== "calendar") {
+    return;
+  }
+  if (Object.prototype.hasOwnProperty.call(block, "fields")) {
+    (0, import_errors.throwBadRequest)(
+      `${context}.fields is not supported on calendar main blocks; add event fields under the quick-create or event-view popup host instead`
+    );
+  }
+  if (Object.prototype.hasOwnProperty.call(block, "fieldGroups")) {
+    (0, import_errors.throwBadRequest)(
+      `${context}.fieldGroups is not supported on calendar main blocks; add grouped fields under the quick-create or event-view popup host instead`
+    );
+  }
+  if (Object.prototype.hasOwnProperty.call(block, "recordActions")) {
+    (0, import_errors.throwBadRequest)(
+      `${context}.recordActions is not supported on calendar main blocks; configure event actions inside the event-view popup host instead`
+    );
+  }
+}
 function assertApplyBlueprintBlockType(type, context) {
   if (!type) {
     return;
@@ -508,6 +536,107 @@ function compileScopedLayout(layout, keysByLocalKey, context, kind) {
     })
   };
 }
+function buildCompactFieldLayoutRow(keys, blockType) {
+  const normalizedKeys = keys.filter(Boolean);
+  if (!normalizedKeys.length) {
+    return [];
+  }
+  if (blockType === "filterForm") {
+    const span = normalizedKeys.length === 1 ? 24 : normalizedKeys.length === 2 ? 12 : 8;
+    return normalizedKeys.map((key) => ({ key, span }));
+  }
+  if (normalizedKeys.length === 1) {
+    return [{ key: normalizedKeys[0], span: 24 }];
+  }
+  return normalizedKeys.map((key) => ({ key, span: 12 }));
+}
+function buildAutoCompiledFieldsLayout(fields, blockType) {
+  if (!APPLY_BLUEPRINT_FIELD_GRID_BLOCK_TYPES.has(blockType || "") || !fields.length) {
+    return void 0;
+  }
+  const rows = [];
+  const chunkSize = blockType === "filterForm" ? 3 : 2;
+  let pendingKeys = [];
+  const flushPending = () => {
+    if (!pendingKeys.length) {
+      return;
+    }
+    rows.push(buildCompactFieldLayoutRow(pendingKeys, blockType));
+    pendingKeys = [];
+  };
+  fields.forEach((field) => {
+    const key = (0, import_private_utils.readOptionalString)(field == null ? void 0 : field.key);
+    if (!key) {
+      return;
+    }
+    if ((0, import_private_utils.readOptionalString)(field == null ? void 0 : field.type) === "divider") {
+      flushPending();
+      rows.push([{ key, span: 24 }]);
+      return;
+    }
+    pendingKeys.push(key);
+    if (pendingKeys.length >= chunkSize) {
+      flushPending();
+    }
+  });
+  flushPending();
+  return rows.length ? { rows } : void 0;
+}
+function compileFieldGroups(fieldGroups, context) {
+  const expanded = [];
+  fieldGroups.forEach((group, groupIndex) => {
+    const groupContext = `${context}[${groupIndex}]`;
+    if (!import_lodash.default.isPlainObject(group)) {
+      (0, import_errors.throwBadRequest)(`${groupContext} must be an object`);
+    }
+    (0, import_private_utils.assertOnlyAllowedKeys)(group, groupContext, APPLY_BLUEPRINT_FIELD_GROUP_ALLOWED_KEYS);
+    const title = (0, import_private_utils.assertNonEmptyString)(group.title, `${groupContext}.title`);
+    const groupFields = readOptionalItems(group.fields, `${groupContext}.fields`);
+    if (!groupFields.length) {
+      (0, import_errors.throwBadRequest)(`${groupContext}.fields must be a non-empty array`);
+    }
+    const groupLocalKey = (0, import_private_utils.normalizeBlueprintLocalKey)(
+      group.key,
+      title || `group_${groupIndex + 1}`,
+      `${groupContext}.key`
+    );
+    expanded.push({
+      key: `${groupLocalKey}_divider`,
+      type: "divider",
+      settings: {
+        label: title,
+        orientation: "left"
+      }
+    });
+    expanded.push(...groupFields);
+  });
+  return expanded;
+}
+function resolveBlockFieldInputs(block, context) {
+  const hasFields = Object.prototype.hasOwnProperty.call(block, "fields");
+  const hasFieldGroups = Object.prototype.hasOwnProperty.call(block, "fieldGroups");
+  if (hasFields && hasFieldGroups) {
+    (0, import_errors.throwBadRequest)(`${context} cannot mix fields with fieldGroups`);
+  }
+  if (!hasFieldGroups) {
+    return readOptionalItems(block.fields, `${context}.fields`);
+  }
+  const blockType = (0, import_private_utils.readOptionalString)(block.type);
+  if (!APPLY_BLUEPRINT_FIELD_GROUP_BLOCK_TYPES.has(blockType || "")) {
+    (0, import_errors.throwBadRequest)(`${context}.fieldGroups is only supported on createForm, editForm or details`);
+  }
+  if (Object.prototype.hasOwnProperty.call(block, "fieldsLayout")) {
+    (0, import_errors.throwBadRequest)(`${context}.fieldsLayout cannot be combined with ${context}.fieldGroups`);
+  }
+  const fieldGroups = (0, import_private_utils.readOptionalArray)(
+    block.fieldGroups,
+    `${context}.fieldGroups`
+  );
+  if (!(fieldGroups == null ? void 0 : fieldGroups.length)) {
+    (0, import_errors.throwBadRequest)(`${context}.fieldGroups must be a non-empty array`);
+  }
+  return compileFieldGroups(fieldGroups, `${context}.fieldGroups`);
+}
 function resolveApplyBlueprintFieldLocalKey(input, index, context) {
   if (typeof input === "string") {
     return (0, import_private_utils.assertNonEmptyString)(input, `${context}[${index}]`);
@@ -545,7 +674,13 @@ function buildCompiledFieldKeyMap(inputs, compiledFields, context) {
   });
   return fieldKeysByLocalKey;
 }
-function compilePopup(popup, scopePrefix, assets, context, options = {}) {
+function shouldAttachDefaultPopupMetadata(popup, itemType, options = {}) {
+  return !import_lodash.default.isUndefined(popup) || options.autoRelationField || APPLY_BLUEPRINT_DEFAULT_POPUP_ACTION_TYPES.has(itemType || "");
+}
+function attachCompiledPopupDefaults(popup, metadata) {
+  return (0, import_defaults.attachFlowSurfaceApplyBlueprintPopupDefaults)(popup, metadata);
+}
+function compilePopup(popup, scopePrefix, assets, context, defaults, options = {}) {
   if (import_lodash.default.isUndefined(popup)) {
     return {};
   }
@@ -569,9 +704,6 @@ function compilePopup(popup, scopePrefix, assets, context, options = {}) {
   if (saveAsTemplate && template) {
     (0, import_errors.throwBadRequest)(`${context}.saveAsTemplate cannot be combined with ${context}.template`);
   }
-  if (saveAsTemplate && !import_lodash.default.isUndefined(tryTemplate)) {
-    (0, import_errors.throwBadRequest)(`${context}.saveAsTemplate cannot be combined with ${context}.tryTemplate`);
-  }
   if (template) {
     return {
       popup: {
@@ -582,7 +714,7 @@ function compilePopup(popup, scopePrefix, assets, context, options = {}) {
   }
   const rawPopupBlocks = readOptionalItems(popup.blocks, `${context}.blocks`);
   const popupBlocks = options.ownerActionType === "edit" && rawPopupBlocks.length ? normalizeEditPopupBlocks(rawPopupBlocks, context) : rawPopupBlocks;
-  if (saveAsTemplate && !popupBlocks.length) {
+  if (saveAsTemplate && !popupBlocks.length && tryTemplate !== true) {
     (0, import_errors.throwBadRequest)(`${context}.saveAsTemplate requires explicit popup.blocks`);
   }
   const compiledBlocks = popupBlocks.length ? compileBlocks(
@@ -590,6 +722,7 @@ function compilePopup(popup, scopePrefix, assets, context, options = {}) {
     scopePrefix,
     assets,
     `${context}.blocks`,
+    defaults,
     collectReferencedBlockKeys(popup.layout, `${context}.layout`)
   ) : { blocks: [], blockKeysByLocalKey: /* @__PURE__ */ new Map() };
   const layout = popupBlocks.length || popup.layout ? compileLayout(
@@ -625,13 +758,14 @@ function resolveTargetBlockKey(value, localBlockKeys, context) {
   }
   (0, import_errors.throwBadRequest)(`${context} must be a string block key`);
 }
-function compileField(input, index, scopePrefix, assets, localBlockKeys, context) {
+function compileField(input, index, scopePrefix, assets, localBlockKeys, context, popupDefaultsMetadata, defaults) {
   if (typeof input === "string") {
     const fieldPath2 = (0, import_private_utils.assertNonEmptyString)(input, `${context}[${index}]`);
     return {
       key: (0, import_service_utils.normalizeFlowSurfaceComposeKey)((0, import_private_utils.buildScopedKey)(scopePrefix, fieldPath2), `${context}[${index}]`),
       fieldPath: fieldPath2,
-      __autoPopupForRelationField: true
+      __autoPopupForRelationField: true,
+      ...popupDefaultsMetadata ? { [import_defaults.FLOW_SURFACE_APPLY_BLUEPRINT_POPUP_DEFAULTS_KEY]: import_lodash.default.cloneDeep(popupDefaultsMetadata) } : {}
     };
   }
   if (!import_lodash.default.isPlainObject(input)) {
@@ -656,8 +790,9 @@ function compileField(input, index, scopePrefix, assets, localBlockKeys, context
   if ((0, import_private_utils.readOptionalString)(input.label) && import_lodash.default.isUndefined(settings.label)) {
     settings.label = (0, import_private_utils.readOptionalString)(input.label);
   }
-  const popupResult = compilePopup(input.popup, `${key}.popup`, assets, `${context}[${index}].popup`);
+  const popupResult = compilePopup(input.popup, `${key}.popup`, assets, `${context}[${index}].popup`, defaults);
   settings = resolvePopupTitleSettings(settings, popupResult.popupTitle);
+  const popup = shouldAttachDefaultPopupMetadata(input.popup, void 0) ? attachCompiledPopupDefaults(popupResult.popup, popupDefaultsMetadata) : popupResult.popup;
   return (0, import_service_utils.buildDefinedPayload)({
     key,
     fieldPath,
@@ -666,15 +801,16 @@ function compileField(input, index, scopePrefix, assets, localBlockKeys, context
     type: syntheticType,
     target: resolveTargetBlockKey(input.target, localBlockKeys, `${context}[${index}].target`),
     settings: Object.keys(settings).length ? settings : void 0,
-    popup: popupResult.popup
+    popup
   });
 }
-function compileAction(input, index, scopePrefix, assets, context) {
+function compileAction(input, index, scopePrefix, assets, context, popupDefaultsMetadata, defaults) {
   if (typeof input === "string") {
     const type2 = (0, import_private_utils.assertNonEmptyString)(input, `${context}[${index}]`);
     return {
       key: (0, import_service_utils.normalizeFlowSurfaceComposeKey)((0, import_private_utils.buildScopedKey)(scopePrefix, `${type2}_${index + 1}`), `${context}[${index}]`),
-      type: type2
+      type: type2,
+      ...APPLY_BLUEPRINT_DEFAULT_POPUP_ACTION_TYPES.has(type2) ? { popup: attachCompiledPopupDefaults(void 0, popupDefaultsMetadata) } : {}
     };
   }
   if (!import_lodash.default.isPlainObject(input)) {
@@ -688,36 +824,41 @@ function compileAction(input, index, scopePrefix, assets, context) {
   if ((0, import_private_utils.readOptionalString)(input.title) && import_lodash.default.isUndefined(settings.title)) {
     settings.title = (0, import_private_utils.readOptionalString)(input.title);
   }
-  const popupResult = compilePopup(input.popup, `${key}.popup`, assets, `${context}[${index}].popup`, {
+  const popupResult = compilePopup(input.popup, `${key}.popup`, assets, `${context}[${index}].popup`, defaults, {
     ownerActionType: type
   });
   settings = resolvePopupTitleSettings(settings, popupResult.popupTitle);
+  const popup = shouldAttachDefaultPopupMetadata(input.popup, type) ? attachCompiledPopupDefaults(popupResult.popup, popupDefaultsMetadata) : popupResult.popup;
   return (0, import_service_utils.buildDefinedPayload)({
     key,
     type,
     settings: Object.keys(settings).length ? settings : void 0,
-    popup: popupResult.popup
+    popup
   });
 }
-function compileInjectedDefaultAction(descriptor, scopePrefix, context, index) {
+function compileInjectedDefaultAction(descriptor, scopePrefix, context, index, popupDefaultsMetadata) {
+  const descriptorPopup = descriptor.popup ? import_lodash.default.cloneDeep(descriptor.popup) : void 0;
+  const popup = shouldAttachDefaultPopupMetadata(descriptorPopup, descriptor.type) ? attachCompiledPopupDefaults(descriptorPopup, popupDefaultsMetadata) : void 0;
   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
+    popup
   });
 }
-function compileBlocks(input, scopePrefix, assets, context, requiredExplicitBlockKeys = /* @__PURE__ */ new Set()) {
+function compileBlocks(input, scopePrefix, assets, context, defaults, requiredExplicitBlockKeys = /* @__PURE__ */ new Set()) {
   const blockKeysByLocalKey = /* @__PURE__ */ new Map();
   const referencedBlockKeys = new Set(requiredExplicitBlockKeys);
   const rawBlocks = import_lodash.default.castArray(input || []);
+  const popupDefaultsMetadata = (0, import_defaults.buildFlowSurfaceApplyBlueprintPopupDefaultsMetadata)(defaults);
   rawBlocks.forEach((block, index) => {
     if (!import_lodash.default.isPlainObject(block)) {
       (0, import_errors.throwBadRequest)(`${context}[${index}] must be an object`);
     }
-    const fields = readOptionalItems(block == null ? void 0 : block.fields, `${context}[${index}].fields`);
+    assertApplyBlueprintCalendarMainContent(block, `${context}[${index}]`);
+    const fields = resolveBlockFieldInputs(block, `${context}[${index}]`);
     fields.forEach((field, fieldIndex) => {
       if (typeof (field == null ? void 0 : field.target) !== "string" || !field.target.trim()) {
         return;
@@ -735,6 +876,7 @@ function compileBlocks(input, scopePrefix, assets, context, requiredExplicitBloc
     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}]`);
+    assertApplyBlueprintCalendarMainContent(block, `${context}[${index}]`);
     const explicitKey = (0, import_private_utils.readString)(block.key);
     const fallback = block.type ? `${block.type}_${index + 1}` : `block_${index + 1}`;
     const localKey = (0, import_private_utils.normalizeBlueprintLocalKey)(block.key, fallback, `${context}[${index}].key`);
@@ -764,30 +906,45 @@ function compileBlocks(input, scopePrefix, assets, context, requiredExplicitBloc
     if ((0, import_private_utils.readOptionalString)(block.title) && import_lodash.default.isUndefined(settings.title)) {
       settings.title = (0, import_private_utils.readOptionalString)(block.title);
     }
+    const blockType = (0, import_private_utils.readOptionalString)(block.type);
     const template = ensureOptionalTemplate(block.template, `${blockContext}.template`);
-    const fieldInputs = readOptionalItems(block.fields, `${blockContext}.fields`);
+    const blockDefaultFilter = (0, import_public_data_surface_default_filter.normalizeFlowSurfacePublicBlockDefaultFilter)("applyBlueprint", block.defaultFilter, {
+      blockType,
+      template,
+      path: blockContext
+    });
+    const fieldInputs = resolveBlockFieldInputs(block, blockContext);
     const fields = fieldInputs.map(
-      (field, fieldIndex) => compileField(field, fieldIndex, key, assets, blockKeysByLocalKey, `${blockContext}.fields`)
+      (field, fieldIndex) => compileField(
+        field,
+        fieldIndex,
+        key,
+        assets,
+        blockKeysByLocalKey,
+        `${blockContext}.fields`,
+        popupDefaultsMetadata,
+        defaults
+      )
     );
     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;
+    ) : buildAutoCompiledFieldsLayout(fields, (0, import_private_utils.readOptionalString)(block.type));
     const { actions, recordActions } = splitApplyBlueprintBlockActionsByScope(block, blockContext);
     const explicitActions = actions.map(
-      (action, actionIndex) => compileAction(action, actionIndex, key, assets, `${blockContext}.actions`)
+      (action, actionIndex) => compileAction(action, actionIndex, key, assets, `${blockContext}.actions`, popupDefaultsMetadata, defaults)
     );
     const explicitRecordActions = recordActions.map(
-      (action, actionIndex) => compileAction(action, actionIndex, key, assets, `${blockContext}.recordActions`)
+      (action, actionIndex) => compileAction(action, actionIndex, key, assets, `${blockContext}.recordActions`, popupDefaultsMetadata, defaults)
     );
     const injectedActionIndexes = {
       actions: explicitActions.length,
       recordActions: explicitRecordActions.length
     };
     const mergedActions = (0, import_default_block_actions.mergeFlowSurfaceDefaultBlockActions)({
-      blockType: (0, import_private_utils.readOptionalString)(block.type),
+      blockType,
       template,
       actions: explicitActions,
       recordActions: explicitRecordActions,
@@ -795,19 +952,24 @@ function compileBlocks(input, scopePrefix, assets, context, requiredExplicitBloc
         descriptor,
         key,
         `${blockContext}.${descriptor.scope}`,
-        injectedActionIndexes[descriptor.scope]++
+        injectedActionIndexes[descriptor.scope]++,
+        popupDefaultsMetadata
       )
     });
+    const actionsWithDefaultFilter = (0, import_public_data_surface_default_filter.backfillFlowSurfaceFilterActionDefaultFilter)(
+      mergedActions.actions,
+      blockDefaultFilter
+    );
     return (0, import_service_utils.buildDefinedPayload)({
       key,
-      type: (0, import_private_utils.readOptionalString)(block.type),
+      type: blockType,
       resource: buildBlockResource(block, blockContext),
       template,
       settings: Object.keys(settings).length ? settings : void 0,
-      fields,
-      fieldsLayout,
-      actions: mergedActions.actions,
-      recordActions: mergedActions.recordActions
+      fields: blockType === "calendar" ? void 0 : fields,
+      fieldsLayout: blockType === "calendar" ? void 0 : fieldsLayout,
+      actions: actionsWithDefaultFilter,
+      recordActions: blockType === "calendar" ? void 0 : mergedActions.recordActions
     });
   });
   return {
@@ -824,6 +986,7 @@ function compileTabComposeValues(tab, document, tabIndex, options) {
     tab.key,
     document.assets,
     blocksPath,
+    document.defaults,
     collectReferencedBlockKeys(tab.layout, layoutPath)
   );
   const layout = compileLayout(

package/dist/server/flow-surfaces/blueprint/defaults.d.ts

@@ -0,0 +1,26 @@
+/**
+ * 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.
+ */
+import type { FlowSurfaceApplyBlueprintDefaultCollection, FlowSurfaceApplyBlueprintDefaults, FlowSurfaceApplyBlueprintDefaultPopupName } from './public-types';
+export declare const FLOW_SURFACE_APPLY_BLUEPRINT_POPUP_DEFAULTS_KEY = "__flowSurfaceApplyBlueprintPopupDefaults";
+export type FlowSurfaceApplyBlueprintPopupDefaultActionType = 'addNew' | 'view' | 'edit';
+export type FlowSurfaceApplyBlueprintPopupDefaultsMetadata = {
+    collections?: FlowSurfaceApplyBlueprintDefaults['collections'];
+};
+export declare function hasFlowSurfaceApplyBlueprintDefaults(defaults?: FlowSurfaceApplyBlueprintDefaults): boolean;
+export declare function buildFlowSurfaceApplyBlueprintPopupDefaultsMetadata(defaults?: FlowSurfaceApplyBlueprintDefaults): FlowSurfaceApplyBlueprintPopupDefaultsMetadata | undefined;
+export declare function attachFlowSurfaceApplyBlueprintPopupDefaults<T extends Record<string, any> | undefined>(popup: T, metadata: FlowSurfaceApplyBlueprintPopupDefaultsMetadata | undefined): T | Record<string, any> | undefined;
+export declare function readFlowSurfaceApplyBlueprintPopupDefaultsMetadata(value: Record<string, any> | undefined): FlowSurfaceApplyBlueprintPopupDefaultsMetadata | undefined;
+export declare function getFlowSurfaceApplyBlueprintDefaultCollection(metadata: FlowSurfaceApplyBlueprintPopupDefaultsMetadata | undefined, collectionName?: string): FlowSurfaceApplyBlueprintDefaultCollection | undefined;
+export declare function resolveFlowSurfaceApplyBlueprintDefaultPopupMetadata(input: {
+    metadata?: FlowSurfaceApplyBlueprintPopupDefaultsMetadata;
+    actionType?: FlowSurfaceApplyBlueprintPopupDefaultActionType;
+    sourceCollectionName?: string;
+    associationField?: string;
+    targetCollectionName?: string;
+}): FlowSurfaceApplyBlueprintDefaultPopupName | undefined;