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

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

@@ -106,8 +106,12 @@ const JS_CODE = stringOption("JS code", {
 const JS_VERSION = stringOption("JS code version", {
   example: "v2"
 });
-const COMMON_BLOCK_TITLE_OPTIONS = {
+const COMMON_BLOCK_HEADER_OPTIONS = {
   title: stringOption("Title", { example: "User Table" }),
+  description: stringOption("Description", { example: "Team directory and summary" })
+};
+const FILTER_FORM_HEADER_OPTIONS = {
+  title: stringOption("Title", { example: "User filters" }),
   displayTitle: booleanOption("Whether to display the title", { example: true })
 };
 const COMMON_HEIGHT_OPTIONS = {
@@ -131,7 +135,7 @@ const TAB_OPTIONS = {
   documentTitle: stringOption("Browser document title", { example: "User Overview" })
 };
 const TABLE_OPTIONS = {
-  ...COMMON_BLOCK_TITLE_OPTIONS,
+  ...COMMON_BLOCK_HEADER_OPTIONS,
   ...COMMON_HEIGHT_OPTIONS,
   resource: COMMON_RESOURCE,
   pageSize: numberOption("Page size", { example: 20 }),
@@ -146,7 +150,7 @@ const TABLE_OPTIONS = {
   dragSortBy: stringOption("Drag-sort field", { example: "sort" })
 };
 const FORM_COMMON_OPTIONS = {
-  ...COMMON_BLOCK_TITLE_OPTIONS,
+  ...COMMON_BLOCK_HEADER_OPTIONS,
   resource: COMMON_RESOURCE,
   layout: stringOption("Layout key", { example: "vertical" }),
   labelAlign: stringOption("Label alignment", { example: "left" }),
@@ -163,7 +167,7 @@ const EDIT_FORM_OPTIONS = {
   dataScope: FILTER_GROUP
 };
 const DETAILS_OPTIONS = {
-  ...COMMON_BLOCK_TITLE_OPTIONS,
+  ...COMMON_BLOCK_HEADER_OPTIONS,
   resource: COMMON_RESOURCE,
   layout: stringOption("Layout key", { example: "vertical" }),
   labelAlign: stringOption("Label alignment", { example: "left" }),
@@ -178,7 +182,7 @@ const DETAILS_OPTIONS = {
   )
 };
 const FILTER_FORM_OPTIONS = {
-  ...COMMON_BLOCK_TITLE_OPTIONS,
+  ...FILTER_FORM_HEADER_OPTIONS,
   resource: COMMON_RESOURCE,
   layout: stringOption("Layout key", { example: "vertical" }),
   labelAlign: stringOption("Label alignment", { example: "left" }),
@@ -187,7 +191,7 @@ const FILTER_FORM_OPTIONS = {
   defaultValues: objectOption("Default filter values", { example: { status: "draft" } })
 };
 const LIST_OPTIONS = {
-  ...COMMON_BLOCK_TITLE_OPTIONS,
+  ...COMMON_BLOCK_HEADER_OPTIONS,
   ...COMMON_HEIGHT_OPTIONS,
   resource: COMMON_RESOURCE,
   pageSize: numberOption("Page size", { example: 20 }),
@@ -195,8 +199,28 @@ const LIST_OPTIONS = {
   sorting: SORTING,
   layout: stringOption("List layout", { example: "vertical" })
 };
+const CALENDAR_OPTIONS = {
+  ...COMMON_BLOCK_HEADER_OPTIONS,
+  ...COMMON_HEIGHT_OPTIONS,
+  resource: COMMON_RESOURCE,
+  titleField: stringOption("Calendar event title field", { example: "title" }),
+  colorField: stringOption("Calendar event color field", { example: "status" }),
+  startField: stringOption("Calendar event start field", { example: "startAt" }),
+  endField: stringOption("Calendar event end field", { example: "endAt" }),
+  defaultView: stringOption("Default calendar view", { enum: ["month", "week", "day"], example: "month" }),
+  quickCreateEvent: booleanOption("Whether slot quick-create is enabled", { example: true }),
+  showLunar: booleanOption("Whether lunar labels are displayed", { example: false }),
+  weekStart: numberOption("Week start day. Use 1 for Monday or 0 for Sunday.", { example: 1 }),
+  dataScope: FILTER_GROUP,
+  linkageRules: arrayOption(
+    "Raw linkage-rules payload. For AI/CLI authoring, prefer `getReactionMeta` + `setBlockLinkageRules` instead of guessing this configure key directly.",
+    { example: [] }
+  ),
+  quickCreatePopup: OPEN_VIEW,
+  eventPopup: OPEN_VIEW
+};
 const GRID_CARD_OPTIONS = {
-  ...COMMON_BLOCK_TITLE_OPTIONS,
+  ...COMMON_BLOCK_HEADER_OPTIONS,
   ...COMMON_HEIGHT_OPTIONS,
   resource: COMMON_RESOURCE,
   columns: objectOption("Column count. Pass a number or a full responsive object that includes xs/sm/md/lg/xl/xxl.", {
@@ -215,11 +239,11 @@ const GRID_CARD_OPTIONS = {
   layout: stringOption("Card layout", { example: "vertical" })
 };
 const MARKDOWN_OPTIONS = {
-  ...COMMON_BLOCK_TITLE_OPTIONS,
+  ...COMMON_BLOCK_HEADER_OPTIONS,
   content: stringOption("Markdown content", { example: "# Team handbook" })
 };
 const IFRAME_OPTIONS = {
-  ...COMMON_BLOCK_TITLE_OPTIONS,
+  ...COMMON_BLOCK_HEADER_OPTIONS,
   ...COMMON_HEIGHT_OPTIONS,
   mode: stringOption("iframe mode", { example: "url" }),
   url: stringOption("URL", { example: "https://example.com/embed" }),
@@ -229,7 +253,7 @@ const IFRAME_OPTIONS = {
   htmlId: stringOption("Embedded HTML node ID")
 };
 const CHART_OPTIONS = {
-  ...COMMON_BLOCK_TITLE_OPTIONS,
+  ...COMMON_BLOCK_HEADER_OPTIONS,
   ...COMMON_HEIGHT_OPTIONS,
   query: objectOption("Chart query DSL. Builder mode is recommended by default.", {
     example: {
@@ -287,10 +311,26 @@ const CHART_OPTIONS = {
   )
 };
 const ACTION_PANEL_OPTIONS = {
-  ...COMMON_BLOCK_TITLE_OPTIONS,
+  ...COMMON_BLOCK_HEADER_OPTIONS,
   layout: stringOption("Layout key", { example: "list" }),
   ellipsis: booleanOption("Whether to collapse overly long buttons", { example: false })
 };
+const MAP_OPTIONS = {
+  ...COMMON_BLOCK_HEADER_OPTIONS,
+  ...COMMON_HEIGHT_OPTIONS,
+  resource: COMMON_RESOURCE,
+  mapField: arrayOption("Map field path", { example: ["location"] }),
+  marker: stringOption("Marker field", { example: "name" }),
+  dataScope: FILTER_GROUP,
+  sorting: SORTING,
+  zoom: numberOption("Default zoom level", { example: 13 })
+};
+const COMMENTS_OPTIONS = {
+  ...COMMON_BLOCK_HEADER_OPTIONS,
+  resource: COMMON_RESOURCE,
+  pageSize: numberOption("Page size", { example: 20 }),
+  dataScope: FILTER_GROUP
+};
 const JS_BLOCK_OPTIONS = {
   title: stringOption("Title", { example: "Runtime Banner" }),
   description: stringOption("Description", { example: "Custom JS block" }),
@@ -423,6 +463,13 @@ const JS_ITEM_OPTIONS = {
   code: JS_CODE,
   version: JS_VERSION
 };
+const DIVIDER_ITEM_OPTIONS = {
+  label: stringOption("Divider label", { example: "Basic information" }),
+  orientation: stringOption("Label position", { example: "left" }),
+  dashed: booleanOption("Whether the divider is dashed", { example: false }),
+  color: stringOption("Label color"),
+  borderColor: stringOption("Divider line color")
+};
 const ACTION_COMMON_OPTIONS = {
   title: stringOption("Button title", { example: "Run" }),
   tooltip: stringOption("Tooltip"),
@@ -454,6 +501,12 @@ const ACTION_LINKAGE_OPTIONS = {
     { example: [] }
   )
 };
+const FILTER_ACTION_OPTIONS = {
+  filterableFieldNames: arrayOption("Allowed filter field name list", {
+    example: ["username", "email", "roles"]
+  }),
+  defaultFilter: FILTER_GROUP
+};
 const ACTION_JS_OPTIONS = {
   code: JS_CODE,
   version: JS_VERSION
@@ -493,10 +546,14 @@ const ACTION_EMAIL_OPTIONS = {
   emailFieldNames: arrayOption("Email field name list", { example: ["email"] }),
   defaultSelectAllRecords: booleanOption("Whether all records are selected by default", { example: false })
 };
+const CALENDAR_ACTION_POSITION_OPTIONS = {
+  position: stringOption("Position", { enum: ["left", "right"], example: "left" })
+};
 const GLOBAL_FLOW_CONTEXT_OPTION_KEYS = /* @__PURE__ */ new Set([
   "assignRules",
   "confirm",
   "dataScope",
+  "defaultFilter",
   "defaultValues",
   "initialValue",
   "linkageRules",
@@ -544,6 +601,12 @@ function getActionConfigureOptionsByUse(use) {
   const base = [ACTION_COMMON_OPTIONS];
   const merged = (...extra) => mergeOptions(...base, ...extra);
   switch (normalized) {
+    case "CalendarTodayActionModel":
+      return merged(CALENDAR_ACTION_POSITION_OPTIONS, ACTION_LINKAGE_OPTIONS);
+    case "CalendarNavActionModel":
+    case "CalendarTitleActionModel":
+    case "CalendarViewSelectActionModel":
+      return mergeOptions(CALENDAR_ACTION_POSITION_OPTIONS, ACTION_LINKAGE_OPTIONS);
     case "AddNewActionModel":
     case "ViewActionModel":
     case "EditActionModel":
@@ -586,11 +649,12 @@ function getActionConfigureOptionsByUse(use) {
     case "FormTriggerWorkflowActionModel":
     case "WorkbenchTriggerWorkflowActionModel":
     case "RefreshActionModel":
-    case "FilterActionModel":
     case "ExpandCollapseActionModel":
     case "FilterFormSubmitActionModel":
     case "FilterFormResetActionModel":
       return merged(ACTION_LINKAGE_OPTIONS);
+    case "FilterActionModel":
+      return merged(FILTER_ACTION_OPTIONS, ACTION_LINKAGE_OPTIONS);
     case "ApplyFormSubmitModel":
     case "ApplyFormSaveDraftModel":
       return merged(ACTION_CONFIRM_OPTIONS, APPROVAL_ASSIGN_ACTION_OPTIONS, ACTION_LINKAGE_OPTIONS);
@@ -647,6 +711,9 @@ function getConfigureOptionsForUse(use) {
     case "TableBlockModel":
       options = cloneOptions(TABLE_OPTIONS);
       break;
+    case "CalendarBlockModel":
+      options = cloneOptions(CALENDAR_OPTIONS);
+      break;
     case "FormBlockModel":
     case "CreateFormModel":
       options = cloneOptions(FORM_COMMON_OPTIONS);
@@ -678,6 +745,12 @@ function getConfigureOptionsForUse(use) {
     case "ActionPanelBlockModel":
       options = cloneOptions(ACTION_PANEL_OPTIONS);
       break;
+    case "MapBlockModel":
+      options = cloneOptions(MAP_OPTIONS);
+      break;
+    case "CommentsBlockModel":
+      options = cloneOptions(COMMENTS_OPTIONS);
+      break;
     case "JSBlockModel":
       options = cloneOptions(JS_BLOCK_OPTIONS);
       break;
@@ -710,6 +783,9 @@ function getConfigureOptionsForUse(use) {
     case "FormJSFieldItemModel":
       options = cloneOptions(JS_ITEM_OPTIONS);
       break;
+    case "DividerItemModel":
+      options = cloneOptions(DIVIDER_ITEM_OPTIONS);
+      break;
     default:
       if (isGenericFieldNodeUse(normalized) || isGenericFieldNodeUse(semanticUse)) {
         options = cloneOptions(FIELD_NODE_OPTIONS);

package/dist/server/flow-surfaces/contract-guard.js

@@ -40,15 +40,10 @@ __export(contract_guard_exports, {
 });
 module.exports = __toCommonJS(contract_guard_exports);
 var import_lodash = __toESM(require("lodash"));
-var import_utils = require("@nocobase/utils");
 var import_catalog = require("./catalog");
 var import_errors = require("./errors");
+var import_filter_group = require("./filter-group");
 const EMPTY_GRID_ITEM_UID = "__EMPTY__";
-const EMPTY_FILTER_GROUP = {
-  logic: "$and",
-  items: []
-};
-const FILTER_GROUP_EXAMPLE = JSON.stringify(EMPTY_FILTER_GROUP);
 class FlowSurfaceContractGuard {
   mergeDomainValue(domain, currentValue, nextValue, contract, use) {
     if (!import_lodash.default.isPlainObject(nextValue)) {
@@ -90,12 +85,12 @@ class FlowSurfaceContractGuard {
             `flowSurfaces updateSettings domain '${domain}.${groupKey}' on '${use}' requires an object payload`
           );
         }
-        const normalizedValue = normalizeGroupValue(value, groupContract, {
+        const normalizedValue2 = normalizeGroupValue(value, groupContract, {
           domain,
           groupKey,
           use
         });
-        const invalidPaths = collectLeafPaths(normalizedValue).filter(
+        const invalidPaths = collectLeafPaths(normalizedValue2).filter(
           (path) => !isAllowedGroupPath(groupContract, path)
         );
         if (invalidPaths.length) {
@@ -105,15 +100,15 @@ class FlowSurfaceContractGuard {
             )}`
           );
         }
-        const invalidValueTypes = collectTypedValueErrors(normalizedValue, groupContract.pathSchemas || {});
-        if (invalidValueTypes.length) {
+        const invalidValueTypes2 = collectTypedValueErrors(normalizedValue2, groupContract.pathSchemas || {});
+        if (invalidValueTypes2.length) {
           (0, import_errors.throwBadRequest)(
-            `flowSurfaces updateSettings domain '${domain}.${groupKey}' on '${use}' has invalid values: ${invalidValueTypes.join(
+            `flowSurfaces updateSettings domain '${domain}.${groupKey}' on '${use}' has invalid values: ${invalidValueTypes2.join(
               ", "
             )}`
           );
         }
-        next2[groupKey] = groupContract.mergeStrategy === "replace" ? import_lodash.default.cloneDeep(normalizedValue) : import_lodash.default.merge({}, (currentValue == null ? void 0 : currentValue[groupKey]) || {}, normalizedValue);
+        next2[groupKey] = groupContract.mergeStrategy === "replace" ? import_lodash.default.cloneDeep(normalizedValue2) : import_lodash.default.merge({}, (currentValue == null ? void 0 : currentValue[groupKey]) || {}, normalizedValue2);
       });
       return next2;
     }
@@ -123,11 +118,23 @@ class FlowSurfaceContractGuard {
         `flowSurfaces updateSettings domain '${domain}' on '${use}' does not allow keys: ${unknownKeys.join(", ")}`
       );
     }
-    if (!Object.keys(nextValue).length) {
+    const normalizedValue = normalizeDomainValue(nextValue, contract, {
+      domain,
+      use
+    });
+    if (!Object.keys(normalizedValue).length) {
       return {};
     }
+    const invalidValueTypes = collectTypedValueErrors(normalizedValue, contract.pathSchemas || {});
+    if (invalidValueTypes.length) {
+      (0, import_errors.throwBadRequest)(
+        `flowSurfaces updateSettings domain '${domain}' on '${use}' has invalid values: ${invalidValueTypes.join(
+          ", "
+        )}`
+      );
+    }
     const next = import_lodash.default.cloneDeep(currentValue || {});
-    Object.entries(nextValue).forEach(([key, value]) => {
+    Object.entries(normalizedValue).forEach(([key, value]) => {
       next[key] = contract.mergeStrategy === "replace" || !import_lodash.default.isPlainObject(value) || !Object.keys(value).length ? import_lodash.default.cloneDeep(value) : import_lodash.default.merge({}, (currentValue == null ? void 0 : currentValue[key]) || {}, value);
     });
     return next;
@@ -303,79 +310,63 @@ function collectTypedValueErrors(value, pathSchemas) {
       return [];
     }
     const candidate = import_lodash.default.get(value, path);
-    return matchesValueSchema(candidate, schema) ? [] : [`${path} expected ${schema.type}`];
-  });
-}
-function normalizeGroupValue(value, groupContract, context) {
-  const normalized = import_lodash.default.cloneDeep(value);
-  Object.entries(groupContract.pathSchemas || {}).forEach(([path, schema]) => {
-    if (!import_lodash.default.has(normalized, path) || !isFilterGroupSchema(schema)) {
-      return;
-    }
-    import_lodash.default.set(normalized, path, normalizeFilterGroupValue(import_lodash.default.get(normalized, path), context, path));
+    return collectSchemaValueErrors(candidate, schema, path);
   });
-  return normalized;
 }
-function matchesValueSchema(value, schema) {
+function collectSchemaValueErrors(value, schema, path) {
   if (value === null) {
-    return (schema == null ? void 0 : schema.nullable) === true;
+    return (schema == null ? void 0 : schema.nullable) === true ? [] : [`${path} expected ${(schema == null ? void 0 : schema.type) || "value"}`];
   }
   switch (schema == null ? void 0 : schema.type) {
     case "string":
-      return typeof value === "string";
+      return typeof value === "string" ? [] : [`${path} expected string`];
     case "boolean":
-      return typeof value === "boolean";
+      return typeof value === "boolean" ? [] : [`${path} expected boolean`];
     case "number":
-      return typeof value === "number" && Number.isFinite(value);
+      return typeof value === "number" && Number.isFinite(value) ? [] : [`${path} expected number`];
     case "object":
-      return import_lodash.default.isPlainObject(value);
+      return import_lodash.default.isPlainObject(value) ? [] : [`${path} expected object`];
     case "array":
-      return Array.isArray(value);
+      if (!Array.isArray(value)) {
+        return [`${path} expected array`];
+      }
+      if (!schema.items) {
+        return [];
+      }
+      return value.flatMap((item, index) => collectSchemaValueErrors(item, schema.items, `${path}[${index}]`));
     default:
-      return true;
-  }
-}
-function isFilterGroupSchema(schema) {
-  return (schema == null ? void 0 : schema["x-flowSurfaceFormat"]) === "filter-group";
-}
-function normalizeFilterGroupValue(value, context, path) {
-  if (value === null || import_lodash.default.isPlainObject(value) && !Object.keys(value).length) {
-    return import_lodash.default.cloneDeep(EMPTY_FILTER_GROUP);
-  }
-  try {
-    assertFilterGroupShape(value);
-    (0, import_utils.transformFilter)(value);
-    return import_lodash.default.cloneDeep(value);
-  } catch (error) {
-    const reason = error instanceof Error ? error.message : String(error);
-    (0, import_errors.throwBadRequest)(
-      `flowSurfaces updateSettings domain '${context.domain}.${context.groupKey}.${path}' on '${context.use}' expects FilterGroup like ${FILTER_GROUP_EXAMPLE}: ${reason}`
-    );
+      return [];
   }
 }
-function assertFilterGroupShape(filter) {
-  if (!import_lodash.default.isPlainObject(filter)) {
-    (0, import_errors.throwBadRequest)("Invalid filter: filter must be an object");
-  }
-  if (!("logic" in filter) || !("items" in filter)) {
-    (0, import_errors.throwBadRequest)("Invalid filter: filter must have logic and items properties");
-  }
-  if (filter.logic !== "$and" && filter.logic !== "$or") {
-    (0, import_errors.throwBadRequest)("Invalid filter: logic must be '$and' or '$or'");
-  }
-  if (!Array.isArray(filter.items)) {
-    (0, import_errors.throwBadRequest)("Invalid filter: items must be an array");
-  }
-  filter.items.forEach((item) => {
-    if (import_lodash.default.isPlainObject(item) && "logic" in item && "items" in item) {
-      assertFilterGroupShape(item);
+function normalizeDomainValue(value, contract, context) {
+  const normalized = import_lodash.default.cloneDeep(value);
+  Object.entries(contract.pathSchemas || {}).forEach(([path, schema]) => {
+    if (!import_lodash.default.has(normalized, path) || !isFilterGroupSchema(schema)) {
       return;
     }
-    if (import_lodash.default.isPlainObject(item) && typeof item.path === "string" && typeof item.operator === "string") {
+    import_lodash.default.set(normalized, path, normalizeFilterGroupValue(import_lodash.default.get(normalized, path), context, path));
+  });
+  return normalized;
+}
+function normalizeGroupValue(value, groupContract, context) {
+  const normalized = import_lodash.default.cloneDeep(value);
+  Object.entries(groupContract.pathSchemas || {}).forEach(([path, schema]) => {
+    if (!import_lodash.default.has(normalized, path) || !isFilterGroupSchema(schema)) {
       return;
     }
-    (0, import_errors.throwBadRequest)("Invalid filter item type");
+    import_lodash.default.set(normalized, path, normalizeFilterGroupValue(import_lodash.default.get(normalized, path), context, path));
   });
+  return normalized;
+}
+function isFilterGroupSchema(schema) {
+  return (schema == null ? void 0 : schema["x-flowSurfaceFormat"]) === "filter-group";
+}
+function normalizeFilterGroupValue(value, context, path) {
+  const domainPath = context.groupKey ? `${context.domain}.${context.groupKey}.${path}` : `${context.domain}.${path}`;
+  return (0, import_filter_group.normalizeFlowSurfaceFilterGroupValue)(
+    value,
+    `flowSurfaces updateSettings domain '${domainPath}' on '${context.use}' expects FilterGroup like ${import_filter_group.FLOW_SURFACE_FILTER_GROUP_EXAMPLE}`
+  );
 }
 function isContractDefinedFlowGroup(groupContract) {
   if (!groupContract) {

package/dist/server/flow-surfaces/default-action-popup.d.ts

@@ -34,10 +34,19 @@ export type FlowSurfaceDefaultActionPopupFieldCandidate = {
     field?: any;
     fieldPath?: string;
 };
+export type FlowSurfaceDefaultActionPopupFieldGroupCandidate = {
+    key?: string;
+    title: string;
+    fields: string[];
+};
 type FlowSurfaceDefaultActionPopupFieldFilterOptions = {
     excludeAuditTimestampFields?: boolean;
     excludeAssociationFields?: boolean;
 };
+type FlowSurfaceDefaultActionPopupFieldsInput = string[] | {
+    fieldPaths?: string[];
+    fieldGroups?: FlowSurfaceDefaultActionPopupFieldGroupCandidate[];
+};
 export declare const FLOW_SURFACE_DEFAULT_ACTION_POPUP_TYPES: Set<FlowSurfaceDefaultActionPopupType>;
 export declare const FLOW_SURFACE_DEFAULT_ACTION_POPUP_USES: Set<FlowSurfaceDefaultActionPopupUse>;
 export declare function isFlowSurfaceDefaultActionPopupType(type?: string): type is FlowSurfaceDefaultActionPopupType;
@@ -45,7 +54,8 @@ export declare function isFlowSurfaceDefaultActionPopupUse(use?: string): use is
 export declare function getFlowSurfaceDefaultActionPopupConfigByUse(use?: string): FlowSurfaceDefaultActionPopupConfig;
 export declare function resolveFlowSurfaceDefaultActionPopupTabTitle(use?: string, currentTitle?: string | null): string;
 export declare function pickFlowSurfaceDefaultActionPopupFieldPaths(candidates: FlowSurfaceDefaultActionPopupFieldCandidate[], options?: FlowSurfaceDefaultActionPopupFieldFilterOptions): string[];
-export declare function buildFlowSurfaceDefaultActionPopupBlocks(use: string | undefined, fieldPaths: string[]): _.Dictionary<string | string[] | Record<string, any> | FlowSurfaceDefaultActionPopupSubmitAction[] | {
+export declare function pickFlowSurfaceDefaultActionPopupFieldGroups(candidates: FlowSurfaceDefaultActionPopupFieldCandidate[], fieldGroups: FlowSurfaceDefaultActionPopupFieldGroupCandidate[] | undefined, options?: FlowSurfaceDefaultActionPopupFieldFilterOptions): FlowSurfaceDefaultActionPopupFieldGroupCandidate[];
+export declare function buildFlowSurfaceDefaultActionPopupBlocks(use: string | undefined, fieldsInput: FlowSurfaceDefaultActionPopupFieldsInput): _.Dictionary<string | string[] | Record<string, any> | FlowSurfaceDefaultActionPopupFieldGroupCandidate[] | FlowSurfaceDefaultActionPopupSubmitAction[] | {
     binding: "currentCollection" | "currentRecord";
 }>[];
 export declare function hasFlowSurfaceInlinePopupTemplate(popup?: Record<string, any>): boolean;

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

@@ -44,6 +44,7 @@ __export(default_action_popup_exports, {
   hasFlowSurfaceInlinePopupTemplate: () => hasFlowSurfaceInlinePopupTemplate,
   isFlowSurfaceDefaultActionPopupType: () => isFlowSurfaceDefaultActionPopupType,
   isFlowSurfaceDefaultActionPopupUse: () => isFlowSurfaceDefaultActionPopupUse,
+  pickFlowSurfaceDefaultActionPopupFieldGroups: () => pickFlowSurfaceDefaultActionPopupFieldGroups,
   pickFlowSurfaceDefaultActionPopupFieldPaths: () => pickFlowSurfaceDefaultActionPopupFieldPaths,
   resolveFlowSurfaceDefaultActionPopupTabTitle: () => resolveFlowSurfaceDefaultActionPopupTabTitle
 });
@@ -66,8 +67,8 @@ const FLOW_SURFACE_DEFAULT_ACTION_POPUP_CONFIGS = [
   {
     type: "addNew",
     use: "AddNewActionModel",
-    defaultButtonTitle: "Add new",
-    defaultPopupTabTitle: "Add new",
+    defaultButtonTitle: '{{t("Add new")}}',
+    defaultPopupTabTitle: '{{t("Add new")}}',
     blockKey: "defaultCreateForm",
     blockType: "createForm",
     blockUse: "CreateFormModel",
@@ -81,7 +82,7 @@ const FLOW_SURFACE_DEFAULT_ACTION_POPUP_CONFIGS = [
       key: "defaultSubmit",
       type: "submit",
       settings: {
-        title: "Submit",
+        title: '{{t("Submit")}}',
         type: "primary",
         confirm: false
       }
@@ -90,8 +91,8 @@ const FLOW_SURFACE_DEFAULT_ACTION_POPUP_CONFIGS = [
   {
     type: "view",
     use: "ViewActionModel",
-    defaultButtonTitle: "View",
-    defaultPopupTabTitle: "Details",
+    defaultButtonTitle: '{{t("View")}}',
+    defaultPopupTabTitle: '{{t("Details")}}',
     blockKey: "defaultDetails",
     blockType: "details",
     blockUse: "DetailsBlockModel",
@@ -109,8 +110,8 @@ const FLOW_SURFACE_DEFAULT_ACTION_POPUP_CONFIGS = [
   {
     type: "edit",
     use: "EditActionModel",
-    defaultButtonTitle: "Edit",
-    defaultPopupTabTitle: "Edit",
+    defaultButtonTitle: '{{t("Edit")}}',
+    defaultPopupTabTitle: '{{t("Edit")}}',
     blockKey: "defaultEditForm",
     blockType: "editForm",
     blockUse: "EditFormModel",
@@ -128,7 +129,7 @@ const FLOW_SURFACE_DEFAULT_ACTION_POPUP_CONFIGS = [
       key: "defaultSubmit",
       type: "submit",
       settings: {
-        title: "Submit",
+        title: '{{t("Submit")}}',
         type: "primary",
         confirm: false
       }
@@ -148,6 +149,11 @@ const FLOW_SURFACE_DEFAULT_ACTION_POPUP_CONFIG_BY_USE = FLOW_SURFACE_DEFAULT_ACT
   },
   {}
 );
+const FLOW_SURFACE_DEFAULT_ACTION_POPUP_LEGACY_BUTTON_TITLES = {
+  AddNewActionModel: "Add new",
+  ViewActionModel: "View",
+  EditActionModel: "Edit"
+};
 function isFlowSurfaceDefaultActionPopupType(type) {
   return FLOW_SURFACE_DEFAULT_ACTION_POPUP_TYPES.has(String(type || "").trim());
 }
@@ -167,7 +173,8 @@ function resolveFlowSurfaceDefaultActionPopupTabTitle(use, currentTitle) {
     return void 0;
   }
   const normalizedTitle = String(currentTitle || "").trim();
-  if (normalizedTitle && normalizedTitle !== actionConfig.defaultButtonTitle) {
+  const legacyDefaultButtonTitle = FLOW_SURFACE_DEFAULT_ACTION_POPUP_LEGACY_BUTTON_TITLES[actionConfig.use];
+  if (normalizedTitle && normalizedTitle !== actionConfig.defaultButtonTitle && normalizedTitle !== legacyDefaultButtonTitle) {
     return normalizedTitle;
   }
   return actionConfig.defaultPopupTabTitle;
@@ -210,6 +217,9 @@ function isFlowSurfaceDefaultActionPopupAssociationForeignKeyField(field, associ
   return !!fieldName && associationForeignKeys.has(fieldName);
 }
 function pickFlowSurfaceDefaultActionPopupFieldPaths(candidates, options = {}) {
+  return filterFlowSurfaceDefaultActionPopupFieldCandidates(candidates, options).map((candidate) => String((candidate == null ? void 0 : candidate.fieldPath) || "").trim()).filter(Boolean);
+}
+function filterFlowSurfaceDefaultActionPopupFieldCandidates(candidates, options = {}) {
   const associationForeignKeys = collectFlowSurfaceDefaultActionPopupAssociationForeignKeys(candidates);
   const preferredCandidates = candidates.filter(
     (candidate) => !isFlowSurfaceDefaultActionPopupSystemField(candidate.field) && (!options.excludeAuditTimestampFields || !isFlowSurfaceDefaultActionPopupAuditTimestampField(candidate.field)) && (!options.excludeAssociationFields || !isFlowSurfaceDefaultActionPopupAssociationField(candidate.field)) && !isFlowSurfaceDefaultActionPopupMultiValueAssociationField(candidate.field) && !isFlowSurfaceDefaultActionPopupAssociationForeignKeyField(candidate.field, associationForeignKeys)
@@ -218,13 +228,61 @@ function pickFlowSurfaceDefaultActionPopupFieldPaths(candidates, options = {}) {
     (candidate) => !isFlowSurfaceDefaultActionPopupTechnicalIdField(candidate.field) && (!options.excludeAuditTimestampFields || !isFlowSurfaceDefaultActionPopupAuditTimestampField(candidate.field)) && (!options.excludeAssociationFields || !isFlowSurfaceDefaultActionPopupAssociationField(candidate.field)) && !isFlowSurfaceDefaultActionPopupMultiValueAssociationField(candidate.field) && !isFlowSurfaceDefaultActionPopupAssociationForeignKeyField(candidate.field, associationForeignKeys)
   );
   const baseCandidates = preferredCandidates.length ? preferredCandidates : fallbackCandidates;
-  return baseCandidates.map((candidate) => String((candidate == null ? void 0 : candidate.fieldPath) || "").trim()).filter(Boolean);
+  return baseCandidates.filter((candidate) => String((candidate == null ? void 0 : candidate.fieldPath) || "").trim());
+}
+function pickFlowSurfaceDefaultActionPopupFieldGroups(candidates, fieldGroups, options = {}) {
+  const allowedFieldPaths = new Set(
+    filterFlowSurfaceDefaultActionPopupFieldCandidates(candidates, options).map(
+      (candidate) => String((candidate == null ? void 0 : candidate.fieldPath) || "").trim()
+    )
+  );
+  const usedFieldPaths = /* @__PURE__ */ new Set();
+  return import_lodash.default.castArray(fieldGroups || []).flatMap((group) => {
+    const title = String((group == null ? void 0 : group.title) || "").trim();
+    if (!title) {
+      return [];
+    }
+    const fields = import_lodash.default.castArray((group == null ? void 0 : group.fields) || []).map((field) => String(field || "").trim()).filter((field) => {
+      if (!field || !allowedFieldPaths.has(field) || usedFieldPaths.has(field)) {
+        return false;
+      }
+      usedFieldPaths.add(field);
+      return true;
+    });
+    if (!fields.length) {
+      return [];
+    }
+    return [
+      import_lodash.default.pickBy(
+        {
+          key: String((group == null ? void 0 : group.key) || "").trim() || void 0,
+          title,
+          fields
+        },
+        (value) => !import_lodash.default.isUndefined(value)
+      )
+    ];
+  });
+}
+function normalizeDefaultActionPopupFieldsInput(input) {
+  if (Array.isArray(input)) {
+    return {
+      fieldPaths: input,
+      fieldGroups: []
+    };
+  }
+  return {
+    fieldPaths: import_lodash.default.castArray((input == null ? void 0 : input.fieldPaths) || []).map((field) => String(field || "").trim()).filter(Boolean),
+    fieldGroups: import_lodash.default.castArray((input == null ? void 0 : input.fieldGroups) || []).filter((group) => import_lodash.default.isPlainObject(group))
+  };
 }
-function buildFlowSurfaceDefaultActionPopupBlocks(use, fieldPaths) {
+function buildFlowSurfaceDefaultActionPopupBlocks(use, fieldsInput) {
   const actionConfig = getFlowSurfaceDefaultActionPopupConfigByUse(use);
   if (!actionConfig) {
     return [];
   }
+  const { fieldPaths, fieldGroups } = normalizeDefaultActionPopupFieldsInput(fieldsInput);
+  const hasFieldGroups = !!fieldGroups.length;
   return [
     import_lodash.default.pickBy(
       {
@@ -234,7 +292,8 @@ function buildFlowSurfaceDefaultActionPopupBlocks(use, fieldPaths) {
           binding: actionConfig.resourceBinding
         },
         settings: import_lodash.default.cloneDeep(actionConfig.blockSettings),
-        fields: fieldPaths,
+        fields: hasFieldGroups ? void 0 : fieldPaths,
+        fieldGroups: hasFieldGroups ? fieldGroups : void 0,
         actions: actionConfig.submitAction ? [import_lodash.default.cloneDeep(actionConfig.submitAction)] : void 0
       },
       (value) => !import_lodash.default.isUndefined(value)
@@ -257,6 +316,7 @@ function hasFlowSurfaceInlinePopupBlocks(popup) {
   hasFlowSurfaceInlinePopupTemplate,
   isFlowSurfaceDefaultActionPopupType,
   isFlowSurfaceDefaultActionPopupUse,
+  pickFlowSurfaceDefaultActionPopupFieldGroups,
   pickFlowSurfaceDefaultActionPopupFieldPaths,
   resolveFlowSurfaceDefaultActionPopupTabTitle
 });

package/dist/server/flow-surfaces/default-block-actions.js

@@ -42,6 +42,7 @@ __export(default_block_actions_exports, {
 });
 module.exports = __toCommonJS(default_block_actions_exports);
 var import_lodash = __toESM(require("lodash"));
+var import_defaults = require("./blueprint/defaults");
 const FLOW_SURFACE_INTERNAL_AUTO_SAVE_DEFAULT_POPUP_TEMPLATE_KEY = "__flowSurfaceAutoSaveDefaultPopupTemplate";
 const FLOW_SURFACE_DEFAULT_BLOCK_ACTIONS = {
   table: [
@@ -80,6 +81,8 @@ const FLOW_SURFACE_DEFAULT_BLOCK_ACTIONS = {
     },
     { type: "refresh", scope: "actions" }
   ],
+  createForm: [{ type: "submit", scope: "actions" }],
+  editForm: [{ type: "submit", scope: "actions" }],
   details: [
     {
       type: "edit",
@@ -116,7 +119,11 @@ function shouldMergeDefaultPopup(popup) {
   if (!keys.length) {
     return true;
   }
-  return keys.every((key) => ["mode", "size", "title", "defaultType", "tryTemplate"].includes(key));
+  return keys.every(
+    (key) => ["mode", "size", "title", "defaultType", "tryTemplate", import_defaults.FLOW_SURFACE_APPLY_BLUEPRINT_POPUP_DEFAULTS_KEY].includes(
+      key
+    )
+  );
 }
 function mergeExplicitActionWithDescriptor(item, descriptor) {
   if (!descriptor.popup || !shouldMergeDefaultPopup(item == null ? void 0 : item.popup)) {