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

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

@@ -39,20 +39,24 @@ __export(catalog_exports, {
   blockCatalog: () => blockCatalog,
   filterAvailableCatalogItems: () => filterAvailableCatalogItems,
   getAvailableActionCatalogItems: () => getAvailableActionCatalogItems,
+  getAvailableBlockCatalogItems: () => getAvailableBlockCatalogItems,
   getEditableDomainsForUse: () => getEditableDomainsForUse,
   getLayoutCapabilitiesForUse: () => getLayoutCapabilitiesForUse,
   getNodeContract: () => getNodeContract,
   getSettingsSchemaForUse: () => getSettingsSchemaForUse,
+  getSupportedFieldComponentUseSet: () => getSupportedFieldComponentUseSet,
   isCatalogItemAvailable: () => isCatalogItemAvailable,
   resolveSupportedActionCatalogItem: () => resolveSupportedActionCatalogItem,
   resolveSupportedBlockCatalogItem: () => resolveSupportedBlockCatalogItem,
   resolveSupportedFieldCapability: () => resolveSupportedFieldCapability
 });
 module.exports = __toCommonJS(catalog_exports);
+var import_approval = require("./approval");
 var import_action_scope = require("./action-scope");
 var import_errors = require("./errors");
 var import_field_semantics = require("./field-semantics");
 var import_field_binding_registry = require("./field-binding-registry");
+var import_service_helpers = require("./service-helpers");
 var import_support_matrix = require("./support-matrix");
 const ANY_VALUE_SCHEMA = {};
 const STRING_SCHEMA = { type: "string" };
@@ -115,7 +119,8 @@ const OPEN_VIEW_ALLOWED_PATHS = [
   "openView.navigation",
   "openView.template",
   "openView.template.uid",
-  "openView.template.mode"
+  "openView.template.mode",
+  "openView.tryTemplate"
 ];
 const OPEN_VIEW_PATH_SCHEMAS = {
   "openView.mode": OPEN_VIEW_MODE_SCHEMA,
@@ -136,7 +141,8 @@ const OPEN_VIEW_PATH_SCHEMAS = {
   "openView.template.mode": {
     type: "string",
     enum: ["reference", "copy"]
-  }
+  },
+  "openView.tryTemplate": BOOLEAN_SCHEMA
 };
 const CONFIRM_ALLOWED_PATHS = ["confirm.enable", "confirm.title", "confirm.content"];
 const TABLE_COLUMN_ALLOWED_PATHS = ["title.title"];
@@ -378,6 +384,12 @@ const FILTER_FIELD_USE_SET = /* @__PURE__ */ new Set([
   "PercentFieldModel",
   "InputFieldModel"
 ]);
+const APPROVAL_DETAILS_FIELD_COMPONENT_WRAPPER_USE_SET = /* @__PURE__ */ new Set([
+  "ApprovalDetailsItemModel",
+  "ApplyTaskCardDetailsItemModel",
+  "ApprovalTaskCardDetailsItemModel"
+]);
+const SINGLE_VALUE_ASSOCIATION_INTERFACES = /* @__PURE__ */ new Set(["m2o", "o2o", "oho", "obo", "updatedBy", "createdBy"]);
 const KNOWN_FIELD_NODE_USES = /* @__PURE__ */ new Set([
   ...EDITABLE_FIELD_USE_SET,
   ...DISPLAY_FIELD_USE_SET,
@@ -591,6 +603,81 @@ PAGE_NODE_CONTRACT.domains.stepParams = groupedDomain({
     }
   }
 });
+const TRIGGER_CHILD_PAGE_NODE_CONTRACT = createContract({
+  editableDomains: ["props", "stepParams", "flowRegistry"],
+  props: ["title", "displayTitle", "enableTabs", "icon", "enableHeader"],
+  stepParams: ["pageSettings", "TriggerChildPageSettings"],
+  flowRegistry: true,
+  eventCapabilities: {
+    direct: DEFAULT_DIRECT_EVENTS
+  },
+  eventBindings: {
+    pageSettings: {
+      stepKeys: ["general"]
+    }
+  }
+});
+TRIGGER_CHILD_PAGE_NODE_CONTRACT.domains.stepParams = groupedDomain({
+  pageSettings: {
+    allowedPaths: [
+      "general.title",
+      "general.documentTitle",
+      "general.displayTitle",
+      "general.enableTabs",
+      "general.icon",
+      "general.enableHeader"
+    ],
+    mergeStrategy: "deep",
+    eventBindingSteps: ["general"],
+    pathSchemas: {
+      "general.title": STRING_SCHEMA,
+      "general.documentTitle": STRING_SCHEMA,
+      "general.displayTitle": BOOLEAN_SCHEMA,
+      "general.enableTabs": BOOLEAN_SCHEMA,
+      "general.icon": STRING_SCHEMA,
+      "general.enableHeader": BOOLEAN_SCHEMA
+    }
+  },
+  TriggerChildPageSettings: RESOURCE_SETTINGS_GROUP
+});
+const APPROVAL_CHILD_PAGE_NODE_CONTRACT = createContract({
+  editableDomains: ["props", "stepParams", "flowRegistry"],
+  props: ["title", "displayTitle", "enableTabs", "icon", "enableHeader"],
+  stepParams: ["pageSettings", "ApprovalChildPageSettings", "resourceSettings"],
+  flowRegistry: true,
+  eventCapabilities: {
+    direct: DEFAULT_DIRECT_EVENTS
+  },
+  eventBindings: {
+    pageSettings: {
+      stepKeys: ["general"]
+    }
+  }
+});
+APPROVAL_CHILD_PAGE_NODE_CONTRACT.domains.stepParams = groupedDomain({
+  pageSettings: {
+    allowedPaths: [
+      "general.title",
+      "general.documentTitle",
+      "general.displayTitle",
+      "general.enableTabs",
+      "general.icon",
+      "general.enableHeader"
+    ],
+    mergeStrategy: "deep",
+    eventBindingSteps: ["general"],
+    pathSchemas: {
+      "general.title": STRING_SCHEMA,
+      "general.documentTitle": STRING_SCHEMA,
+      "general.displayTitle": BOOLEAN_SCHEMA,
+      "general.enableTabs": BOOLEAN_SCHEMA,
+      "general.icon": STRING_SCHEMA,
+      "general.enableHeader": BOOLEAN_SCHEMA
+    }
+  },
+  ApprovalChildPageSettings: RESOURCE_SETTINGS_GROUP,
+  resourceSettings: RESOURCE_SETTINGS_GROUP
+});
 const TAB_NODE_CONTRACT = createContract({
   editableDomains: ["props", "stepParams", "flowRegistry"],
   props: ["title", "icon"],
@@ -1808,6 +1895,129 @@ JS_ACTION_CONTRACT.domains.stepParams = groupedDomain({
   buttonSettings: ACTION_BUTTON_SETTINGS_GROUP,
   clickSettings: RUN_JS_SETTINGS_GROUP
 });
+const APPROVAL_FORM_BLOCK_CONTRACT = createContract({
+  editableDomains: ["props", "decoratorProps", "stepParams", "flowRegistry"],
+  props: ["title", "displayTitle", "labelWidth", "labelWrap"],
+  decoratorProps: ["labelWidth", "labelWrap"],
+  stepParams: ["resourceSettings", "formModelSettings", "eventSettings", "cardSettings", "patternSettings"],
+  flowRegistry: true,
+  eventCapabilities: {
+    direct: DEFAULT_DIRECT_EVENTS,
+    object: ["submit"]
+  }
+});
+APPROVAL_FORM_BLOCK_CONTRACT.domains.stepParams = groupedDomain({
+  resourceSettings: RESOURCE_SETTINGS_GROUP,
+  formModelSettings: FORM_MODEL_SETTINGS_GROUP,
+  eventSettings: EVENT_SETTINGS_GROUP,
+  cardSettings: BLOCK_LINKAGE_CARD_SETTINGS_GROUP,
+  patternSettings: {
+    allowedPaths: ["pattern.pattern"],
+    mergeStrategy: "deep",
+    eventBindingSteps: ["pattern"],
+    pathSchemas: {
+      "pattern.pattern": STRING_SCHEMA
+    }
+  }
+});
+const PATTERN_FORM_FIELD_NODE_CONTRACT = createContract({
+  editableDomains: ["props", "decoratorProps", "stepParams", "flowRegistry"],
+  props: [
+    "title",
+    "icon",
+    "titleField",
+    "clickToOpen",
+    "autoSize",
+    "allowMultiple",
+    "multiple",
+    "quickCreate",
+    "allowClear",
+    "displayStyle",
+    "options"
+  ],
+  decoratorProps: ["labelWidth", "labelWrap"],
+  stepParams: ["fieldSettings", "fieldBinding", "displayFieldSettings", "popupSettings", "jsSettings"],
+  flowRegistry: true,
+  eventCapabilities: {
+    direct: ACTION_DIRECT_EVENTS,
+    object: ACTION_OBJECT_EVENTS
+  },
+  eventBindings: {
+    displayFieldSettings: {
+      stepKeys: ["displayStyle", "clickToOpen"]
+    },
+    popupSettings: {
+      stepKeys: ["openView"]
+    },
+    jsSettings: {
+      stepKeys: ["runJs"]
+    },
+    fieldBinding: {
+      stepKeys: ["use"]
+    }
+  }
+});
+PATTERN_FORM_FIELD_NODE_CONTRACT.domains.stepParams = groupedDomain({
+  fieldSettings: FIELD_SETTINGS_INIT_GROUP,
+  fieldBinding: {
+    allowedPaths: ["use"],
+    mergeStrategy: "deep",
+    eventBindingSteps: ["use"],
+    pathSchemas: {
+      use: STRING_SCHEMA
+    }
+  },
+  displayFieldSettings: {
+    allowedPaths: ["displayStyle.displayStyle", "clickToOpen.clickToOpen"],
+    clearable: true,
+    mergeStrategy: "deep",
+    eventBindingSteps: ["displayStyle", "clickToOpen"],
+    pathSchemas: {
+      "displayStyle.displayStyle": STRING_SCHEMA,
+      "clickToOpen.clickToOpen": BOOLEAN_SCHEMA
+    }
+  },
+  popupSettings: {
+    allowedPaths: OPEN_VIEW_ALLOWED_PATHS,
+    clearable: true,
+    mergeStrategy: "deep",
+    eventBindingSteps: ["openView"],
+    pathSchemas: OPEN_VIEW_PATH_SCHEMAS
+  },
+  jsSettings: RUN_JS_SETTINGS_GROUP
+});
+const APPROVAL_ACTION_CONTRACT = createContract({
+  editableDomains: ["props", "decoratorProps", "stepParams", "flowRegistry"],
+  props: ACTION_PROP_KEYS,
+  decoratorProps: ["labelWidth", "labelWrap"],
+  stepParams: ["buttonSettings", "clickSettings"],
+  flowRegistry: true,
+  eventCapabilities: {
+    direct: ACTION_DIRECT_EVENTS,
+    object: ACTION_OBJECT_EVENTS
+  },
+  eventBindings: {
+    buttonSettings: {
+      stepKeys: ["general", "linkageRules"]
+    },
+    clickSettings: {
+      stepKeys: "*"
+    }
+  }
+});
+APPROVAL_ACTION_CONTRACT.domains.stepParams = groupedDomain({
+  buttonSettings: ACTION_BUTTON_SETTINGS_GROUP,
+  clickSettings: {
+    allowedPaths: ["*"],
+    clearable: true,
+    mergeStrategy: "deep",
+    eventBindingSteps: "*",
+    schema: {
+      type: "object",
+      additionalProperties: true
+    }
+  }
+});
 const nodeContracts = /* @__PURE__ */ new Map();
 function registerNodeContract(use, contract) {
   nodeContracts.set(use, contract);
@@ -1815,13 +2025,20 @@ function registerNodeContract(use, contract) {
 const NODE_CONTRACT_ENTRIES = [
   ["RootPageModel", PAGE_NODE_CONTRACT],
   ["ChildPageModel", PAGE_NODE_CONTRACT],
+  ["TriggerChildPageModel", TRIGGER_CHILD_PAGE_NODE_CONTRACT],
+  ["ApprovalChildPageModel", APPROVAL_CHILD_PAGE_NODE_CONTRACT],
   ["RootPageTabModel", TAB_NODE_CONTRACT],
   ["ChildPageTabModel", TAB_NODE_CONTRACT],
+  ...import_approval.APPROVAL_TAB_MODEL_USES.map((use) => [use, TAB_NODE_CONTRACT]),
   ["BlockGridModel", GRID_NODE_CONTRACT],
   ["FormGridModel", FORM_GRID_NODE_CONTRACT],
   ["DetailsGridModel", GRID_NODE_CONTRACT],
   ["FilterFormGridModel", GRID_NODE_CONTRACT],
   ["AssignFormGridModel", FORM_GRID_NODE_CONTRACT],
+  ...import_approval.APPROVAL_FORM_GRID_USES.map((use) => [use, FORM_GRID_NODE_CONTRACT]),
+  ...import_approval.APPROVAL_DETAILS_GRID_USES.map((use) => [use, GRID_NODE_CONTRACT]),
+  ["TriggerBlockGridModel", GRID_NODE_CONTRACT],
+  ["ApprovalBlockGridModel", GRID_NODE_CONTRACT],
   ["TableBlockModel", TABLE_BLOCK_CONTRACT],
   ["CreateFormModel", CREATE_FORM_BLOCK_CONTRACT],
   ["EditFormModel", EDIT_FORM_BLOCK_CONTRACT],
@@ -1831,6 +2048,8 @@ const NODE_CONTRACT_ENTRIES = [
   ["FilterFormBlockModel", FILTER_FORM_BLOCK_CONTRACT],
   ["ListBlockModel", LIST_BLOCK_CONTRACT],
   ["GridCardBlockModel", GRID_CARD_BLOCK_CONTRACT],
+  ...import_approval.APPROVAL_FORM_BLOCK_USES.map((use) => [use, APPROVAL_FORM_BLOCK_CONTRACT]),
+  ...import_approval.APPROVAL_DETAILS_BLOCK_USES.map((use) => [use, DETAILS_BLOCK_CONTRACT]),
   ["JSBlockModel", JS_BLOCK_CONTRACT],
   ["MarkdownBlockModel", MARKDOWN_BLOCK_CONTRACT],
   ["IframeBlockModel", IFRAME_BLOCK_CONTRACT],
@@ -1843,9 +2062,14 @@ const NODE_CONTRACT_ENTRIES = [
   ["FormAssociationItemModel", DETAILS_ITEM_CONTRACT],
   ["DetailsItemModel", DETAILS_ITEM_CONTRACT],
   ["FilterFormItemModel", FILTER_FORM_ITEM_CONTRACT],
+  ["PatternFormItemModel", FORM_ITEM_CONTRACT],
+  ["ApprovalDetailsItemModel", DETAILS_ITEM_CONTRACT],
+  ["ApplyTaskCardDetailsItemModel", DETAILS_ITEM_CONTRACT],
+  ["ApprovalTaskCardDetailsItemModel", DETAILS_ITEM_CONTRACT],
   ["SubFormFieldModel", SUB_FORM_FIELD_NODE_CONTRACT],
   ["SubFormListFieldModel", SUB_FORM_FIELD_NODE_CONTRACT],
   ["TableColumnModel", TABLE_COLUMN_CONTRACT],
+  ["PatternFormFieldModel", PATTERN_FORM_FIELD_NODE_CONTRACT],
   ["JSColumnModel", JS_COLUMN_CONTRACT],
   ["JSItemModel", JS_ITEM_CONTRACT],
   ["FormJSFieldItemModel", JS_ITEM_CONTRACT],
@@ -1884,7 +2108,15 @@ const NODE_CONTRACT_ENTRIES = [
   ["JSFormActionModel", JS_ACTION_CONTRACT],
   ["FilterFormJSActionModel", JS_ACTION_CONTRACT],
   ["JSItemActionModel", JS_ACTION_CONTRACT],
-  ["JSActionModel", JS_ACTION_CONTRACT]
+  ["JSActionModel", JS_ACTION_CONTRACT],
+  ["ApplyFormSubmitModel", APPROVAL_ACTION_CONTRACT],
+  ["ApplyFormSaveDraftModel", APPROVAL_ACTION_CONTRACT],
+  ["ApplyFormWithdrawModel", APPROVAL_ACTION_CONTRACT],
+  ["ProcessFormApproveModel", APPROVAL_ACTION_CONTRACT],
+  ["ProcessFormRejectModel", APPROVAL_ACTION_CONTRACT],
+  ["ProcessFormReturnModel", APPROVAL_ACTION_CONTRACT],
+  ["ProcessFormDelegateModel", APPROVAL_ACTION_CONTRACT],
+  ["ProcessFormAddAssigneeModel", APPROVAL_ACTION_CONTRACT]
 ];
 NODE_CONTRACT_ENTRIES.forEach(([use, contract]) => registerNodeContract(use, contract));
 KNOWN_FIELD_NODE_USES.forEach(
@@ -1908,6 +2140,10 @@ function normalizeFieldContainerUse(containerUse) {
   return (0, import_field_semantics.normalizeFieldContainerKind)(containerUse);
 }
 function getFieldWrapperUseForContainer(containerUse) {
+  const approvalWrapperUse = (0, import_approval.getApprovalFieldWrapperUse)(containerUse);
+  if (approvalWrapperUse) {
+    return approvalWrapperUse;
+  }
   switch (normalizeFieldContainerUse(containerUse)) {
     case "form":
       return "FormItemModel";
@@ -2045,6 +2281,64 @@ function getAllowedFieldUseSet(containerUse, enabledPackages) {
       return null;
   }
 }
+function canUseNestedApprovalAssociationFieldComponent(input) {
+  var _a;
+  const getCollection = input.getCollection || (() => null);
+  const targetCollection = (0, import_service_helpers.resolveFieldTargetCollection)(input.field, input.dataSourceKey || "main", getCollection);
+  if (!targetCollection) {
+    return true;
+  }
+  return ((targetCollection == null ? void 0 : targetCollection.template) || ((_a = targetCollection == null ? void 0 : targetCollection.options) == null ? void 0 : _a.template)) !== "file";
+}
+function getSupportedFieldComponentUseSet(input) {
+  const baseAllowedFieldUses = getAllowedFieldUseSet(input.containerUse, input.enabledPackages);
+  const fieldInterface = String((0, import_service_helpers.getFieldInterface)(input.field) || "").trim();
+  if (!baseAllowedFieldUses || !fieldInterface) {
+    return baseAllowedFieldUses;
+  }
+  const wrapperUse = (0, import_approval.getApprovalFieldWrapperUse)(input.containerUse) || String(input.containerUse || "").trim();
+  const inferredFieldUse = inferFieldUseByContainer(input.containerUse, input.field, {
+    enabledPackages: input.enabledPackages,
+    dataSourceKey: input.dataSourceKey,
+    getCollection: input.getCollection
+  });
+  if (wrapperUse === "PatternFormItemModel") {
+    if (SINGLE_VALUE_ASSOCIATION_INTERFACES.has(fieldInterface)) {
+      return new Set(
+        [
+          "RecordSelectFieldModel",
+          "RecordPickerFieldModel",
+          canUseNestedApprovalAssociationFieldComponent(input) ? "SubFormFieldModel" : void 0,
+          inferredFieldUse
+        ].filter(Boolean)
+      );
+    }
+    if (import_field_semantics.MULTI_VALUE_ASSOCIATION_INTERFACES.has(fieldInterface)) {
+      return new Set(
+        [
+          "RecordSelectFieldModel",
+          "RecordPickerFieldModel",
+          canUseNestedApprovalAssociationFieldComponent(input) ? "SubFormListFieldModel" : void 0,
+          canUseNestedApprovalAssociationFieldComponent(input) ? "PatternSubTableFieldModel" : void 0,
+          inferredFieldUse
+        ].filter(Boolean)
+      );
+    }
+  }
+  if (APPROVAL_DETAILS_FIELD_COMPONENT_WRAPPER_USE_SET.has(wrapperUse)) {
+    if (SINGLE_VALUE_ASSOCIATION_INTERFACES.has(fieldInterface)) {
+      return new Set(["DisplayTextFieldModel", "DisplaySubItemFieldModel", inferredFieldUse].filter(Boolean));
+    }
+    if (import_field_semantics.MULTI_VALUE_ASSOCIATION_INTERFACES.has(fieldInterface)) {
+      return new Set(
+        ["DisplayTextFieldModel", "DisplaySubListFieldModel", "DisplaySubTableFieldModel", inferredFieldUse].filter(
+          Boolean
+        )
+      );
+    }
+  }
+  return baseAllowedFieldUses;
+}
 function inferFieldUseByContainer(containerUse, field, options = {}) {
   var _a;
   const fieldInterface = (field == null ? void 0 : field.interface) || ((_a = field == null ? void 0 : field.options) == null ? void 0 : _a.interface);
@@ -2245,10 +2539,12 @@ const COLLECTION_RESOURCE_REQUIRED = /* @__PURE__ */ new Set([
   "ListBlockModel",
   "GridCardBlockModel",
   "MapBlockModel",
-  "CommentsBlockModel"
+  "CommentsBlockModel",
+  ...import_approval.APPROVAL_FORM_BLOCK_USES,
+  ...import_approval.APPROVAL_DETAILS_BLOCK_USES
 ]);
 const PUBLIC_BLOCK_SUPPORT_MATRIX = import_support_matrix.FLOW_SURFACE_BLOCK_SUPPORT_MATRIX.filter((entry) => entry.topLevelAddable);
-const blockCatalog = PUBLIC_BLOCK_SUPPORT_MATRIX.map(
+const baseBlockCatalog = PUBLIC_BLOCK_SUPPORT_MATRIX.map(
   (entry) => makeCatalogItem({
     key: entry.key,
     label: entry.label,
@@ -2258,6 +2554,52 @@ const blockCatalog = PUBLIC_BLOCK_SUPPORT_MATRIX.map(
     createSupported: entry.createSupported
   })
 );
+const approvalBlockCatalog = import_approval.APPROVAL_BLOCK_CATALOG_SPECS.map(
+  (entry) => makeCatalogItem({
+    key: entry.key,
+    label: entry.label,
+    kind: "block",
+    use: entry.use,
+    requiredInitParams: entry.requiredInitParams,
+    allowedContainerUses: entry.allowedContainerUses,
+    createSupported: entry.createSupported
+  })
+);
+const blockCatalog = [...baseBlockCatalog, ...approvalBlockCatalog];
+const APPROVAL_PAGE_LIKE_BLOCK_CONTAINER_USE_SET = /* @__PURE__ */ new Set([...import_approval.APPROVAL_BLOCK_GRID_USES]);
+const APPROVAL_PAGE_LIKE_GENERIC_BLOCK_KEY_SET = /* @__PURE__ */ new Set(["markdown", "jsBlock"]);
+const APPROVAL_EXCLUSIVE_BLOCK_CONTAINER_USE_SET = /* @__PURE__ */ new Set([...import_approval.APPROVAL_TASK_CARD_GRID_USES]);
+function isApprovalPageLikeBlockContainerUse(containerUse) {
+  return APPROVAL_PAGE_LIKE_BLOCK_CONTAINER_USE_SET.has(String(containerUse || "").trim());
+}
+function isApprovalExclusiveBlockContainerUse(containerUse) {
+  return APPROVAL_EXCLUSIVE_BLOCK_CONTAINER_USE_SET.has(String(containerUse || "").trim());
+}
+function isBlockAllowedInContainer(item, containerUse) {
+  var _a, _b, _c;
+  const normalizedContainerUse = String(containerUse || "").trim();
+  if (isApprovalExclusiveBlockContainerUse(normalizedContainerUse) && !((_a = item.allowedContainerUses) == null ? void 0 : _a.length)) {
+    return false;
+  }
+  if (isApprovalPageLikeBlockContainerUse(normalizedContainerUse)) {
+    if (!((_b = item.allowedContainerUses) == null ? void 0 : _b.length)) {
+      return APPROVAL_PAGE_LIKE_GENERIC_BLOCK_KEY_SET.has(item.key);
+    }
+    return item.allowedContainerUses.includes(normalizedContainerUse);
+  }
+  if (!((_c = item.allowedContainerUses) == null ? void 0 : _c.length)) {
+    return true;
+  }
+  if (!normalizedContainerUse) {
+    return false;
+  }
+  return item.allowedContainerUses.includes(normalizedContainerUse);
+}
+function getAvailableBlockCatalogItems(containerUse, enabledPackages) {
+  return filterAvailableCatalogItems(blockCatalog, enabledPackages).filter(
+    (item) => isBlockAllowedInContainer(item, containerUse)
+  );
+}
 const actionRegistry = [
   {
     publicKey: "filter",
@@ -2638,7 +2980,17 @@ const actionRegistry = [
     ownerPlugin: "@nocobase/plugin-workflow-custom-action-trigger",
     allowedContainerUses: import_action_scope.ACTION_PANEL_ACTION_CONTAINER_USES,
     createSupported: true
-  }
+  },
+  ...import_approval.APPROVAL_ACTION_CATALOG_SPECS.map((item) => ({
+    publicKey: item.publicKey,
+    label: item.label,
+    scope: item.scope,
+    scene: item.scene,
+    use: item.use,
+    ownerPlugin: import_approval.APPROVAL_FLOW_SURFACE_OWNER_PLUGIN,
+    allowedContainerUses: item.allowedContainerUses,
+    createSupported: item.createSupported
+  }))
 ];
 const FLOW_SURFACE_ACTION_OWNER_PLUGIN_BY_USE = actionRegistry.reduce((map, item) => {
   if (!map.has(item.use)) {
@@ -2703,10 +3055,10 @@ const BLOCK_KEY_BY_USE = new Map(import_support_matrix.FLOW_SURFACE_BLOCK_SUPPOR
 const ACTION_KEY_BY_USE = new Map(actionCatalog.map((item) => [item.use, toPublicActionCatalogItem(item).key]));
 function getCatalogItemOwnerPlugin(item) {
   if (item.kind === "block") {
-    return FLOW_SURFACE_BLOCK_OWNER_PLUGIN_BY_USE.get(item.use);
+    return import_approval.APPROVAL_BLOCK_OWNER_PLUGIN_BY_USE.get(item.use) || FLOW_SURFACE_BLOCK_OWNER_PLUGIN_BY_USE.get(item.use);
   }
   if (item.kind === "action") {
-    return FLOW_SURFACE_ACTION_OWNER_PLUGIN_BY_USE.get(item.use);
+    return import_approval.APPROVAL_ACTION_OWNER_PLUGIN_BY_USE.get(item.use) || FLOW_SURFACE_ACTION_OWNER_PLUGIN_BY_USE.get(item.use);
   }
   return void 0;
 }
@@ -2749,6 +3101,11 @@ function resolveSupportedBlockCatalogItem(input, options = {}) {
       requestedUse: input.use
     });
   }
+  if (!options.skipContainerValidation && !isBlockAllowedInContainer(item, input.containerUse)) {
+    throw new import_errors.FlowSurfaceBadRequestError(
+      `flowSurfaces addBlock '${input.type || input.use || item.key}' is not allowed under '${input.containerUse || "unknown"}'`
+    );
+  }
   if (options.requireCreateSupported && item.createSupported === false) {
     throw new import_errors.FlowSurfaceBadRequestError(`flowSurfaces addBlock does not support creating '${item.key}' yet`);
   }
@@ -2853,7 +3210,7 @@ function resolveSupportedActionCatalogItem(input, options = {}) {
 }
 function getNodeContract(use) {
   if (use) {
-    const contract = nodeContracts.get(use);
+    const contract = nodeContracts.get(use) || nodeContracts.get((0, import_approval.normalizeApprovalSemanticUse)(use));
     if (contract) {
       return contract;
     }
@@ -2884,10 +3241,12 @@ function getLayoutCapabilitiesForUse(use) {
   blockCatalog,
   filterAvailableCatalogItems,
   getAvailableActionCatalogItems,
+  getAvailableBlockCatalogItems,
   getEditableDomainsForUse,
   getLayoutCapabilitiesForUse,
   getNodeContract,
   getSettingsSchemaForUse,
+  getSupportedFieldComponentUseSet,
   isCatalogItemAvailable,
   resolveSupportedActionCatalogItem,
   resolveSupportedBlockCatalogItem,

package/dist/server/flow-surfaces/chart-config.d.ts

@@ -99,7 +99,7 @@ export declare function getChartBuilderResourceInit(configure: any): {
 };
 export declare function getChartBuilderQueryOutputs(configure: any): ChartBuilderQueryOutput[];
 export declare function getChartBuilderQueryAliases(configure: any): string[];
-export declare function getChartSupportedVisualTypes(): ("line" | "area" | "bar" | "barHorizontal" | "pie" | "doughnut" | "funnel" | "scatter")[];
+export declare function getChartSupportedVisualTypes(): ("bar" | "line" | "area" | "barHorizontal" | "pie" | "doughnut" | "funnel" | "scatter")[];
 export declare function getChartSupportedMappingsByType(): {
     [k: string]: {
         allowed: string[];

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

@@ -25,6 +25,7 @@ export type FlowSurfaceComposeNormalizedFieldSpec = {
     target?: string | Record<string, unknown>;
     settings?: FlowSurfaceComposeObject;
     popup?: FlowSurfaceComposeObject;
+    __autoPopupForRelationField?: boolean;
 };
 export type FlowSurfaceComposeNormalizedActionSpec = {
     key: string;

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

@@ -122,7 +122,8 @@ function buildComposeFieldCreatePayload(fieldSpec) {
     ...fieldSpec.associationPathName ? { associationPathName: fieldSpec.associationPathName } : {},
     ...fieldSpec.renderer ? { renderer: fieldSpec.renderer } : {},
     ...fieldSpec.type ? { type: fieldSpec.type } : {},
-    ...fieldSpec.popup ? { popup: fieldSpec.popup } : {}
+    ...fieldSpec.popup ? { popup: fieldSpec.popup } : {},
+    ...fieldSpec.__autoPopupForRelationField ? { __autoPopupForRelationField: true } : {}
   };
 }
 function buildComposeActionCreatePayload(actionSpec) {

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

@@ -33,6 +33,7 @@ __export(configure_options_exports, {
   getConfigureOptionsForUse: () => getConfigureOptionsForUse
 });
 module.exports = __toCommonJS(configure_options_exports);
+var import_approval = require("./approval");
 const stringOption = (description, extra = {}) => ({
   type: "string",
   ...description ? { description } : {},
@@ -452,6 +453,22 @@ const ACTION_JS_OPTIONS = {
   code: JS_CODE,
   version: JS_VERSION
 };
+const APPROVAL_RETURN_ACTION_OPTIONS = {
+  approvalReturn: objectOption("Approval return-node settings", {
+    example: {
+      type: "specific",
+      target: "approval-node-key"
+    }
+  })
+};
+const APPROVAL_REASSIGN_ACTION_OPTIONS = {
+  assigneesScope: objectOption("Approval reassignee scope", {
+    example: {
+      assignees: [1, "{{$context.user.id}}"],
+      extraFieldKey: "departmentId"
+    }
+  })
+};
 const ACTION_EDIT_MODE_OPTIONS = {
   editMode: stringOption("Bulk edit mode", { example: "drawer" })
 };
@@ -473,11 +490,16 @@ const GLOBAL_FLOW_CONTEXT_OPTION_KEYS = /* @__PURE__ */ new Set([
   "defaultValues",
   "initialValue",
   "linkageRules",
-  "assignValues"
+  "assignValues",
+  "assigneesScope"
 ]);
 const FLOW_CONTEXT_OPTION_KEYS_BY_USE = {
   RootPageModel: ["documentTitle"],
-  RootPageTabModel: ["documentTitle"]
+  RootPageTabModel: ["documentTitle"],
+  TriggerChildPageModel: ["documentTitle"],
+  ApprovalChildPageModel: ["documentTitle"],
+  TriggerChildPageTabModel: ["documentTitle"],
+  ApprovalChildPageTabModel: ["documentTitle"]
 };
 function cloneOptions(options) {
   return Object.fromEntries(Object.entries(options).map(([key, value]) => [key, { ...value }]));
@@ -547,6 +569,11 @@ 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":
@@ -559,14 +586,45 @@ function getActionConfigureOptionsByUse(use) {
     case "FilterFormSubmitActionModel":
     case "FilterFormResetActionModel":
       return merged(ACTION_LINKAGE_OPTIONS);
+    case "ProcessFormReturnModel":
+      return merged(ACTION_LINKAGE_OPTIONS, APPROVAL_RETURN_ACTION_OPTIONS);
+    case "ProcessFormDelegateModel":
+    case "ProcessFormAddAssigneeModel":
+      return merged(ACTION_LINKAGE_OPTIONS, APPROVAL_REASSIGN_ACTION_OPTIONS);
     default:
       return {};
   }
 }
 function getConfigureOptionsForUse(use) {
   const normalized = String(use || "").trim();
+  const semanticUse = (0, import_approval.normalizeApprovalSemanticUse)(normalized);
   let options;
   switch (normalized) {
+    case "TriggerChildPageModel":
+    case "ApprovalChildPageModel":
+      options = cloneOptions(PAGE_OPTIONS);
+      break;
+    case "TriggerChildPageTabModel":
+    case "ApprovalChildPageTabModel":
+      options = cloneOptions(TAB_OPTIONS);
+      break;
+    case "ApplyFormModel":
+    case "ProcessFormModel":
+      options = cloneOptions(FORM_COMMON_OPTIONS);
+      break;
+    case "ApprovalDetailsModel":
+    case "ApplyTaskCardDetailsModel":
+    case "ApprovalTaskCardDetailsModel":
+      options = cloneOptions(DETAILS_OPTIONS);
+      break;
+    case "PatternFormItemModel":
+      options = cloneOptions(FORM_FIELD_WRAPPER_OPTIONS);
+      break;
+    case "ApprovalDetailsItemModel":
+    case "ApplyTaskCardDetailsItemModel":
+    case "ApprovalTaskCardDetailsItemModel":
+      options = cloneOptions(DETAILS_FIELD_WRAPPER_OPTIONS);
+      break;
     case "RootPageModel":
       options = cloneOptions(PAGE_OPTIONS);
       break;
@@ -640,7 +698,7 @@ function getConfigureOptionsForUse(use) {
       options = cloneOptions(JS_ITEM_OPTIONS);
       break;
     default:
-      if (isGenericFieldNodeUse(normalized)) {
+      if (isGenericFieldNodeUse(normalized) || isGenericFieldNodeUse(semanticUse)) {
         options = cloneOptions(FIELD_NODE_OPTIONS);
         break;
       }