@nocobase/plugin-flow-engine 2.1.0-alpha.25 → 2.1.0-alpha.27

package/dist/server/flow-surfaces/blueprint/normalize-document.js

@@ -123,27 +123,18 @@ function normalizeNavigation(input) {
       if (!import_lodash.default.isUndefined(routeId) && !import_lodash.default.isString(routeId) && !import_lodash.default.isNumber(routeId)) {
         (0, import_errors.throwBadRequest)(`flowSurfaces applyBlueprint navigation.group.routeId must be a string or integer`);
       }
-      if (!import_lodash.default.isUndefined(routeId) && (0, import_private_utils.readString)(input.group.title)) {
-        (0, import_errors.throwBadRequest)(`flowSurfaces applyBlueprint navigation.group cannot mix routeId with title`);
-      }
-      const routeMetadataKeys = import_private_utils.APPLY_BLUEPRINT_CREATE_MENU_GROUP_METADATA_KEYS.filter(
-        (key) => !import_lodash.default.isUndefined(input.group[key])
-      );
-      if (!import_lodash.default.isUndefined(routeId) && routeMetadataKeys.length) {
-        (0, import_errors.throwBadRequest)(
-          `flowSurfaces applyBlueprint navigation.group.routeId cannot mix with ${routeMetadataKeys.map((key) => `navigation.group.${key}`).join(
-            ", "
-          )}; applyBlueprint create mode does not update existing menu-group metadata. Use flowSurfaces:updateMenu separately if needed`
-        );
+      if (!import_lodash.default.isUndefined(routeId)) {
+        return {
+          routeId
+        };
       }
       const normalized2 = (0, import_service_utils.buildDefinedPayload)({
-        routeId: import_lodash.default.isUndefined(routeId) ? void 0 : routeId,
         title: (0, import_private_utils.readOptionalString)(input.group.title),
         icon: (0, import_private_utils.readOptionalString)(input.group.icon),
         tooltip: (0, import_private_utils.readOptionalString)(input.group.tooltip),
         hideInMenu: (0, import_private_utils.readBoolean)(input.group.hideInMenu, "flowSurfaces applyBlueprint navigation.group.hideInMenu")
       });
-      if (import_lodash.default.isUndefined(normalized2.routeId) && !normalized2.title) {
+      if (!normalized2.title) {
         (0, import_errors.throwBadRequest)(`flowSurfaces applyBlueprint navigation.group requires routeId or title`);
       }
       return normalized2;

package/dist/server/flow-surfaces/blueprint/private-utils.d.ts

@@ -7,7 +7,6 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import type { FlowSurfaceApplyBlueprintAssetMap } from './public-types';
-export declare const APPLY_BLUEPRINT_CREATE_MENU_GROUP_METADATA_KEYS: readonly ["icon", "tooltip", "hideInMenu"];
 export declare function assertPlainObject(value: any, context: string): void;
 export declare function assertOnlyAllowedKeys(input: Record<string, any>, context: string, allowedKeys: string[]): void;
 export declare function normalizeApplyBlueprintToken(value: any, fallback?: string): string;

package/dist/server/flow-surfaces/blueprint/private-utils.js

@@ -36,7 +36,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var private_utils_exports = {};
 __export(private_utils_exports, {
-  APPLY_BLUEPRINT_CREATE_MENU_GROUP_METADATA_KEYS: () => APPLY_BLUEPRINT_CREATE_MENU_GROUP_METADATA_KEYS,
   assertNonEmptyString: () => assertNonEmptyString,
   assertOnlyAllowedKeys: () => assertOnlyAllowedKeys,
   assertPlainObject: () => assertPlainObject,
@@ -56,7 +55,6 @@ module.exports = __toCommonJS(private_utils_exports);
 var import_lodash = __toESM(require("lodash"));
 var import_errors = require("../errors");
 var import_service_utils = require("../service-utils");
-const APPLY_BLUEPRINT_CREATE_MENU_GROUP_METADATA_KEYS = ["icon", "tooltip", "hideInMenu"];
 function assertPlainObject(value, context) {
   if (!import_lodash.default.isPlainObject(value)) {
     (0, import_errors.throwBadRequest)(`${context} must be an object`);
@@ -164,7 +162,6 @@ function normalizeAssetRegistry(input, context) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  APPLY_BLUEPRINT_CREATE_MENU_GROUP_METADATA_KEYS,
   assertNonEmptyString,
   assertOnlyAllowedKeys,
   assertPlainObject,

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

@@ -87,7 +87,6 @@ export type FlowSurfaceApplyBlueprintFieldObjectSpec = {
     type?: string;
     fieldType?: string;
     fields?: string[];
-    selectorFields?: string[];
     titleField?: string;
     openMode?: string;
     popupSize?: string;

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

@@ -1030,6 +1030,24 @@ function buildBlockDefaults(use) {
         defaultView: "month",
         enableQuickCreateEvent: true,
         weekStart: 1
+      },
+      stepParams: {
+        cardSettings: {
+          blockHeight: {
+            heightMode: "fullHeight"
+          }
+        }
+      }
+    };
+  }
+  if (use === "KanbanBlockModel") {
+    return {
+      stepParams: {
+        cardSettings: {
+          blockHeight: {
+            heightMode: "fullHeight"
+          }
+        }
       }
     };
   }

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

@@ -72,6 +72,10 @@ const OPEN_VIEW_SCENE_SCHEMA = {
 const OBJECT_SCHEMA = { type: "object" };
 const NUMBER_SCHEMA = { type: "number" };
 const ARRAY_SCHEMA = { type: "array" };
+const BLOCK_HEIGHT_MODE_SCHEMA = {
+  type: "string",
+  enum: ["defaultHeight", "specifyValue", "fullHeight"]
+};
 const NULLABLE_NUMBER_OR_STRING_SCHEMA = {
   oneOf: [NUMBER_SCHEMA, NULLABLE_STRING_SCHEMA]
 };
@@ -295,13 +299,21 @@ const FILTER_FORM_BLOCK_SETTINGS_GROUP = {
   }
 };
 const BLOCK_CARD_SETTINGS_GROUP = {
-  allowedPaths: ["titleDescription.title", "titleDescription.description", "linkageRules"],
+  allowedPaths: [
+    "titleDescription.title",
+    "titleDescription.description",
+    "blockHeight.heightMode",
+    "blockHeight.height",
+    "linkageRules"
+  ],
   clearable: true,
   mergeStrategy: "deep",
-  eventBindingSteps: ["titleDescription", "linkageRules"],
+  eventBindingSteps: ["titleDescription", "blockHeight", "linkageRules"],
   pathSchemas: {
     "titleDescription.title": STRING_SCHEMA,
     "titleDescription.description": STRING_SCHEMA,
+    "blockHeight.heightMode": BLOCK_HEIGHT_MODE_SCHEMA,
+    "blockHeight.height": NUMBER_SCHEMA,
     linkageRules: ARRAY_SCHEMA
   }
 };
@@ -833,8 +845,6 @@ TAB_NODE_CONTRACT.domains.stepParams = groupedDomain({
 });
 const TABLE_BLOCK_CONTRACT = createContract({
   editableDomains: ["props", "decoratorProps", "stepParams", "flowRegistry"],
-  props: ["height", "heightMode"],
-  decoratorProps: ["height", "heightMode"],
   stepParams: ["resourceSettings", "tableSettings", "cardSettings"],
   flowRegistry: true,
   eventCapabilities: {
@@ -942,7 +952,6 @@ const CALENDAR_BLOCK_CONTRACT = createContract({
     "quickCreatePopupSettings",
     "eventPopupSettings"
   ],
-  decoratorProps: ["height", "heightMode"],
   stepParams: ["resourceSettings", "calendarSettings", "cardSettings"],
   flowRegistry: true,
   eventCapabilities: {
@@ -958,7 +967,6 @@ CALENDAR_BLOCK_CONTRACT.domains.stepParams = groupedDomain({
 const TREE_BLOCK_CONTRACT = createContract({
   editableDomains: ["props", "decoratorProps", "stepParams", "flowRegistry"],
   props: ["searchable", "defaultExpandAll", "includeDescendants", "fieldNames", "pageSize"],
-  decoratorProps: ["height", "heightMode"],
   stepParams: ["resourceSettings", "treeSettings", "cardSettings"],
   flowRegistry: true,
   eventCapabilities: {
@@ -997,7 +1005,6 @@ const KANBAN_BLOCK_CONTRACT = createContract({
     "pageSize",
     "columnWidth"
   ],
-  decoratorProps: ["height", "heightMode"],
   stepParams: ["resourceSettings", "kanbanSettings", "cardSettings"],
   flowRegistry: true,
   eventCapabilities: {
@@ -1013,7 +1020,6 @@ KANBAN_BLOCK_CONTRACT.domains.stepParams = groupedDomain({
 const LIST_BLOCK_CONTRACT = createContract({
   editableDomains: ["props", "decoratorProps", "stepParams", "flowRegistry"],
   props: [],
-  decoratorProps: ["height", "heightMode"],
   stepParams: ["resourceSettings", "listSettings", "cardSettings"],
   flowRegistry: true,
   eventCapabilities: {
@@ -1053,7 +1059,6 @@ LIST_BLOCK_CONTRACT.domains.stepParams = groupedDomain({
 const GRID_CARD_BLOCK_CONTRACT = createContract({
   editableDomains: ["props", "decoratorProps", "stepParams", "flowRegistry"],
   props: [],
-  decoratorProps: ["height", "heightMode"],
   stepParams: ["resourceSettings", "GridCardSettings", "cardSettings"],
   flowRegistry: true,
   eventCapabilities: {
@@ -1217,22 +1222,12 @@ IFRAME_BLOCK_CONTRACT.domains.stepParams = groupedDomain({
   }
 });
 const CHART_CARD_SETTINGS_GROUP = {
-  allowedPaths: [
-    "titleDescription.title",
-    "titleDescription.description",
-    "blockHeight.heightMode",
-    "blockHeight.height",
-    "linkageRules"
-  ],
+  allowedPaths: BLOCK_CARD_SETTINGS_GROUP.allowedPaths,
   clearable: true,
   mergeStrategy: "deep",
-  eventBindingSteps: ["titleDescription", "blockHeight", "linkageRules"],
+  eventBindingSteps: BLOCK_CARD_SETTINGS_GROUP.eventBindingSteps,
   pathSchemas: {
-    "titleDescription.title": STRING_SCHEMA,
-    "titleDescription.description": STRING_SCHEMA,
-    "blockHeight.heightMode": STRING_SCHEMA,
-    "blockHeight.height": NUMBER_SCHEMA,
-    linkageRules: ARRAY_SCHEMA
+    ...BLOCK_CARD_SETTINGS_GROUP.pathSchemas
   }
 };
 const CHART_BLOCK_CONTRACT = createContract({
@@ -1294,8 +1289,7 @@ JS_BLOCK_CONTRACT.domains.stepParams = groupedDomain({
 });
 const MAP_BLOCK_CONTRACT = createContract({
   editableDomains: ["props", "decoratorProps", "stepParams", "flowRegistry"],
-  props: ["height", "heightMode", "mapField", "marker", "lineSort", "zoom"],
-  decoratorProps: ["height", "heightMode"],
+  props: ["mapField", "marker", "lineSort", "zoom"],
   stepParams: ["resourceSettings", "createMapBlock", "cardSettings"],
   flowRegistry: true,
   eventCapabilities: {
@@ -2440,6 +2434,7 @@ const NODE_CONTRACT_ENTRIES = [
   ["TriggerBlockGridModel", GRID_NODE_CONTRACT],
   ["ApprovalBlockGridModel", GRID_NODE_CONTRACT],
   ["TableBlockModel", TABLE_BLOCK_CONTRACT],
+  ["TableSelectModel", TABLE_BLOCK_CONTRACT],
   ["CalendarBlockModel", CALENDAR_BLOCK_CONTRACT],
   ["TreeBlockModel", TREE_BLOCK_CONTRACT],
   ["KanbanBlockModel", KANBAN_BLOCK_CONTRACT],

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

@@ -25,7 +25,6 @@ export type FlowSurfaceComposeNormalizedFieldSpec = {
     type?: string;
     fieldType?: string;
     fields?: string[];
-    selectorFields?: string[];
     titleField?: string;
     openMode?: string;
     popupSize?: string;
@@ -113,4 +112,4 @@ export declare function compileComposeExecutionPlan(input: {
     layout?: FlowSurfaceComposeObject;
 }): FlowSurfaceCompiledComposePlan;
 export declare function resolveComposeFieldContainerSource(blockSpec: Pick<FlowSurfaceComposeNormalizedBlockSpec, 'type'>): 'block' | 'item';
-export declare function resolveComposeTargetKey(targetKey: string, keyMap: Record<string, FlowSurfaceComposeTargetKey | undefined>, kind: 'field' | 'layout'): string;
+export declare function resolveComposeTargetKey(targetKey: string, keyMap: Record<string, FlowSurfaceComposeTargetKey | undefined>, kind: 'field' | 'layout' | 'tree connectFields'): string;

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

@@ -125,7 +125,6 @@ function buildComposeFieldCreatePayload(fieldSpec) {
     ...fieldSpec.type ? { type: fieldSpec.type } : {},
     ...fieldSpec.fieldType ? { fieldType: fieldSpec.fieldType } : {},
     ...typeof fieldSpec.fields !== "undefined" ? { fields: fieldSpec.fields } : {},
-    ...typeof fieldSpec.selectorFields !== "undefined" ? { selectorFields: fieldSpec.selectorFields } : {},
     ...fieldSpec.titleField ? { titleField: fieldSpec.titleField } : {},
     ...fieldSpec.openMode ? { openMode: fieldSpec.openMode } : {},
     ...fieldSpec.popupSize ? { popupSize: fieldSpec.popupSize } : {},

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

@@ -66,6 +66,7 @@ export type FlowSurfaceComposeRuntimeDeps = {
     removeExistingItem?: (uid: string) => Promise<void>;
     createBlock: (payload: Record<string, unknown>, spec: FlowSurfaceComposeNormalizedBlockSpec) => Promise<FlowSurfaceComposeBlockResult>;
     applyNodeSettings?: (actionName: string, targetUid: string | undefined, settings?: FlowSurfaceComposeObject) => Promise<void>;
+    resolveBlockSettings?: (settings: FlowSurfaceComposeObject, state: FlowSurfaceComposeRuntimeState, block: FlowSurfaceComposeRuntimeBlockState) => FlowSurfaceComposeObject | Promise<FlowSurfaceComposeObject>;
     createField: (payload: Record<string, unknown>, spec: FlowSurfaceComposeNormalizedFieldSpec, blockResult: FlowSurfaceComposeBlockResult) => Promise<FlowSurfaceComposeFieldResult | null>;
     applyFieldSettings?: (actionName: string, result: FlowSurfaceComposeFieldResult, settings?: FlowSurfaceComposeObject) => Promise<void>;
     onFieldError?: (input: {

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

@@ -142,7 +142,8 @@ async function applyBlockSettings(deps, state) {
     if (!hasInlineSettings(block.spec.settings)) {
       continue;
     }
-    await applyNodeSettings("compose block", block.result.uid, block.spec.settings);
+    const settings = deps.resolveBlockSettings ? await deps.resolveBlockSettings(block.spec.settings || {}, state, block) : block.spec.settings;
+    await applyNodeSettings("compose block", block.result.uid, settings);
   }
 }
 async function createFields(plan, deps, state) {

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

@@ -80,6 +80,16 @@ const SORTING = arrayOption("Sorting rule array", {
     }
   ]
 });
+const CONNECT_FIELDS = objectOption("Tree connect data block targets", {
+  example: {
+    targets: [
+      {
+        targetId: "target-block-uid",
+        filterPaths: ["id"]
+      }
+    ]
+  }
+});
 const OPEN_VIEW = objectOption("Popup or drawer open configuration", {
   example: {
     dataSourceKey: "main",
@@ -98,13 +108,9 @@ const FIELD_TYPE = stringOption("Public relation field presentation type", {
 const RELATION_FIELDS = arrayOption("Relation target fields", {
   example: ["title", "name"]
 });
-const SELECTOR_FIELDS = arrayOption("Record picker selector fields", {
-  example: ["title", "code"]
-});
 const RELATION_FIELD_TYPE_OPTIONS = {
   fieldType: FIELD_TYPE,
   fields: RELATION_FIELDS,
-  selectorFields: SELECTOR_FIELDS,
   openMode: stringOption("Popup open mode", { example: "drawer" }),
   popupSize: stringOption("Popup size", { example: "medium" }),
   pageSize: numberOption("Page size", { example: 10 }),
@@ -247,7 +253,8 @@ const TREE_OPTIONS = {
   fieldNames: objectOption("Tree field names", { example: { title: "title", key: "id", children: "children" } }),
   pageSize: numberOption("Root records per page", { example: 200 }),
   dataScope: FILTER_GROUP,
-  sorting: SORTING
+  sorting: SORTING,
+  connectFields: CONNECT_FIELDS
 };
 const KANBAN_OPTIONS = {
   ...COMMON_BLOCK_HEADER_OPTIONS,

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

@@ -53,7 +53,7 @@ class FlowSurfaceContractGuard {
       if (!Object.keys(nextValue).length) {
         return {};
       }
-      return contract.mergeStrategy === "replace" ? import_lodash.default.cloneDeep(nextValue) : import_lodash.default.merge({}, currentValue || {}, nextValue);
+      return contract.mergeStrategy === "replace" ? import_lodash.default.cloneDeep(nextValue) : mergeFlowSurfaceSettingsValue(currentValue || {}, nextValue);
     }
     if (contract.groups) {
       const unknownGroups = Object.keys(nextValue).filter((key) => !contract.allowedKeys.includes(key));
@@ -108,7 +108,7 @@ class FlowSurfaceContractGuard {
             )}`
           );
         }
-        next2[groupKey] = groupContract.mergeStrategy === "replace" ? import_lodash.default.cloneDeep(normalizedValue2) : import_lodash.default.merge({}, (currentValue == null ? void 0 : currentValue[groupKey]) || {}, normalizedValue2);
+        next2[groupKey] = groupContract.mergeStrategy === "replace" ? import_lodash.default.cloneDeep(normalizedValue2) : mergeFlowSurfaceSettingsValue((currentValue == null ? void 0 : currentValue[groupKey]) || {}, normalizedValue2);
       });
       return next2;
     }
@@ -135,7 +135,7 @@ class FlowSurfaceContractGuard {
     }
     const next = import_lodash.default.cloneDeep(currentValue || {});
     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);
+      next[key] = contract.mergeStrategy === "replace" || !import_lodash.default.isPlainObject(value) || !Object.keys(value).length ? import_lodash.default.cloneDeep(value) : mergeFlowSurfaceSettingsValue((currentValue == null ? void 0 : currentValue[key]) || {}, value);
     });
     return next;
   }
@@ -275,6 +275,14 @@ class FlowSurfaceContractGuard {
     });
   }
 }
+function mergeFlowSurfaceSettingsValue(currentValue, nextValue) {
+  return import_lodash.default.mergeWith({}, currentValue || {}, nextValue, (_current, next) => {
+    if (Array.isArray(next)) {
+      return import_lodash.default.cloneDeep(next);
+    }
+    return void 0;
+  });
+}
 function matchesContractPath(pattern, path) {
   if (pattern === "*") {
     return true;

package/dist/server/flow-surfaces/field-binding-registry.js

@@ -103,7 +103,7 @@ const FIELD_BINDING_RULE_DEFINITIONS = [
   {
     scope: "display",
     modelClassName: "DisplayPreviewFieldModel",
-    interfaces: ["url", "attachment", "attachmentURL", "m2m", "m2o", "o2o", "o2m", "oho", "obo", "mbm"],
+    interfaces: ["attachment", "attachmentURL", "m2m", "m2o", "o2o", "o2m", "oho", "obo", "mbm"],
     ownerPlugin: FILE_MANAGER_PLUGIN,
     isDefault: true,
     when: ({ field, targetCollection }) => isAttachmentInterface(field) || !targetCollection || getCollectionTemplate(targetCollection) === "file"

package/dist/server/flow-surfaces/field-type-resolver.d.ts

@@ -22,7 +22,6 @@ export declare function resolveRelationFieldType(input: {
     dataSourceKey: string;
     getCollection: (dataSourceKey: string, collectionName: string) => any;
     fields?: any;
-    selectorFields?: any;
     titleField?: any;
     openMode?: any;
     popupSize?: any;

package/dist/server/flow-surfaces/field-type-resolver.js

@@ -93,6 +93,7 @@ const FIELD_USE_TO_PUBLIC_FIELD_TYPE = {
   PopupSubTableFieldModel: "popupSubTable"
 };
 const FIELD_TYPES_WITH_FIELDS = /* @__PURE__ */ new Set([
+  "picker",
   "subForm",
   "subFormList",
   "subDetails",
@@ -100,7 +101,6 @@ const FIELD_TYPES_WITH_FIELDS = /* @__PURE__ */ new Set([
   "subTable",
   "popupSubTable"
 ]);
-const FIELD_TYPES_WITH_SELECTOR_FIELDS = /* @__PURE__ */ new Set(["picker"]);
 const FIELD_TYPES_WITH_TABLE_PROPS = /* @__PURE__ */ new Set(["subTable", "popupSubTable"]);
 function assertNoInternalFieldKeys(input, context) {
   if (!import_lodash.default.isPlainObject(input)) {
@@ -250,16 +250,9 @@ function resolveRelationFieldType(input) {
       break;
   }
   const explicitFields = normalizePublicFieldNameList(input.fields, `${input.context}.fields`);
-  const explicitSelectorFields = normalizePublicFieldNameList(input.selectorFields, `${input.context}.selectorFields`);
-  if (explicitFields && explicitSelectorFields) {
-    (0, import_errors.throwBadRequest)(`flowSurfaces ${input.context} cannot mix fields and selectorFields on the same field`);
-  }
   if (explicitFields && !FIELD_TYPES_WITH_FIELDS.has(fieldType)) {
     (0, import_errors.throwBadRequest)(`flowSurfaces ${input.context} fieldType '${fieldType}' does not support fields`);
   }
-  if (explicitSelectorFields && !FIELD_TYPES_WITH_SELECTOR_FIELDS.has(fieldType)) {
-    (0, import_errors.throwBadRequest)(`flowSurfaces ${input.context} fieldType '${fieldType}' does not support selectorFields`);
-  }
   if ((!import_lodash.default.isUndefined(input.openMode) || !import_lodash.default.isUndefined(input.popupSize)) && fieldType !== "picker") {
     (0, import_errors.throwBadRequest)(`flowSurfaces ${input.context} fieldType '${fieldType}' does not support openMode or popupSize`);
   }
@@ -268,15 +261,12 @@ function resolveRelationFieldType(input) {
   }
   const shouldApplyDefaults = input.applyDefaults !== false;
   const defaultTargetField = shouldApplyDefaults ? pickCollectionFallbackFieldName(targetCollection) : void 0;
-  const fields = explicitFields ?? (shouldApplyDefaults && usesNestedRelationFields(fieldUse) ? [defaultTargetField] : void 0);
-  const selectorFields = explicitSelectorFields ?? (shouldApplyDefaults && fieldType === "picker" && import_lodash.default.isUndefined(input.selectorFields) ? [defaultTargetField] : void 0);
+  const fields = explicitFields ?? (shouldApplyDefaults && (usesNestedRelationFields(fieldUse) || fieldType === "picker") ? [defaultTargetField] : void 0);
+  const selectorFields = ["picker", "popupSubTable"].includes(fieldType) ? fields : void 0;
   const titleField = import_lodash.default.isUndefined(input.titleField) ? defaultTargetField : String(input.titleField || "").trim() || void 0;
   if (fields == null ? void 0 : fields.length) {
     assertTargetFieldNamesExist(targetCollection, fields, `${input.context}.fields`);
   }
-  if (selectorFields == null ? void 0 : selectorFields.length) {
-    assertTargetFieldNamesExist(targetCollection, selectorFields, `${input.context}.selectorFields`);
-  }
   if (titleField && !(0, import_service_helpers.resolveFieldFromCollection)(targetCollection, titleField)) {
     (0, import_errors.throwBadRequest)(
       `flowSurfaces ${input.context}.titleField '${titleField}' does not exist on relation target collection`

package/dist/server/flow-surfaces/public-compatibility.d.ts

@@ -0,0 +1,16 @@
+/**
+ * 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.
+ */
+type NormalizeSortingAliasInput = {
+    context: string;
+    type?: string;
+    use?: string;
+    settings?: any;
+};
+export declare function normalizeFlowSurfacePublicSortingAlias(input: NormalizeSortingAliasInput): any;
+export {};

package/dist/server/flow-surfaces/public-compatibility.js

@@ -0,0 +1,139 @@
+/**
+ * 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.
+ */
+
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var public_compatibility_exports = {};
+__export(public_compatibility_exports, {
+  normalizeFlowSurfacePublicSortingAlias: () => normalizeFlowSurfacePublicSortingAlias
+});
+module.exports = __toCommonJS(public_compatibility_exports);
+var import_lodash = __toESM(require("lodash"));
+var import_configure_options = require("./configure-options");
+var import_errors = require("./errors");
+var import_support_matrix = require("./support-matrix");
+function resolveBlockUse(input) {
+  var _a;
+  const explicitUse = String(input.use || "").trim();
+  if (explicitUse) {
+    return explicitUse;
+  }
+  const typeOrUse = String(input.type || "").trim();
+  if (!typeOrUse) {
+    return void 0;
+  }
+  if (import_support_matrix.FLOW_SURFACE_BLOCK_SUPPORT_BY_USE.has(typeOrUse)) {
+    return typeOrUse;
+  }
+  return ((_a = import_support_matrix.FLOW_SURFACE_BLOCK_SUPPORT_BY_KEY.get(typeOrUse)) == null ? void 0 : _a.modelUse) || typeOrUse;
+}
+function blockSupportsSorting(use) {
+  return !!use && (0, import_configure_options.getConfigureOptionKeysForUse)(use).includes("sorting");
+}
+function normalizeSortingDirection(input, context) {
+  const normalized = String(input || "").trim().toLowerCase();
+  if (!normalized || normalized === "asc" || normalized === "ascend" || normalized === "ascending") {
+    return "asc";
+  }
+  if (normalized === "desc" || normalized === "descend" || normalized === "descending") {
+    return "desc";
+  }
+  (0, import_errors.throwBadRequest)(`${context} must be 'asc' or 'desc'`);
+}
+function normalizeSortingField(input, context) {
+  const field = String(input || "").trim();
+  if (!field) {
+    (0, import_errors.throwBadRequest)(`${context} must be a non-empty field name`);
+  }
+  return field;
+}
+function normalizeSortingEntry(input, context) {
+  if (import_lodash.default.isString(input)) {
+    const value = input.trim();
+    if (!value) {
+      (0, import_errors.throwBadRequest)(`${context} must be a non-empty sort field`);
+    }
+    const descending = value.startsWith("-");
+    const field = descending ? value.slice(1).trim() : value;
+    return {
+      field: normalizeSortingField(field, context),
+      direction: descending ? "desc" : "asc"
+    };
+  }
+  if (!import_lodash.default.isPlainObject(input)) {
+    (0, import_errors.throwBadRequest)(`${context} must be a string or an object with field and direction`);
+  }
+  return {
+    field: normalizeSortingField(input.field, `${context}.field`),
+    direction: normalizeSortingDirection(input.direction, `${context}.direction`)
+  };
+}
+function normalizeSortingArray(input, context) {
+  if (!Array.isArray(input)) {
+    (0, import_errors.throwBadRequest)(`${context} must be an array`);
+  }
+  return input.map((item, index) => normalizeSortingEntry(item, `${context}[${index}]`));
+}
+function normalizeFlowSurfacePublicSortingAlias(input) {
+  if (import_lodash.default.isUndefined(input.settings)) {
+    return input.settings;
+  }
+  if (!import_lodash.default.isPlainObject(input.settings)) {
+    (0, import_errors.throwBadRequest)(`${input.context} must be an object`);
+  }
+  if (!Object.prototype.hasOwnProperty.call(input.settings, "sort")) {
+    return input.settings;
+  }
+  const use = resolveBlockUse(input);
+  if (!blockSupportsSorting(use)) {
+    return input.settings;
+  }
+  const nextSettings = import_lodash.default.cloneDeep(input.settings);
+  const sortingFromSort = normalizeSortingArray(nextSettings.sort, `${input.context}.sort`);
+  if (Object.prototype.hasOwnProperty.call(nextSettings, "sorting")) {
+    const canonicalSorting = normalizeSortingArray(nextSettings.sorting, `${input.context}.sorting`);
+    if (!import_lodash.default.isEqual(sortingFromSort, canonicalSorting)) {
+      (0, import_errors.throwBadRequest)(`${input.context}.sort conflicts with ${input.context}.sorting; use canonical sorting`);
+    }
+    nextSettings.sorting = canonicalSorting;
+  } else {
+    nextSettings.sorting = sortingFromSort;
+  }
+  delete nextSettings.sort;
+  return nextSettings;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  normalizeFlowSurfacePublicSortingAlias
+});

package/dist/server/flow-surfaces/service-helpers.js

@@ -155,8 +155,8 @@ function getFieldName(field) {
   return (field == null ? void 0 : field.name) || ((_a = field == null ? void 0 : field.options) == null ? void 0 : _a.name);
 }
 function getFieldTitle(field) {
-  var _a;
-  return (field == null ? void 0 : field.title) || ((_a = field == null ? void 0 : field.options) == null ? void 0 : _a.title) || getFieldName(field);
+  var _a, _b, _c, _d;
+  return ((_a = field == null ? void 0 : field.uiSchema) == null ? void 0 : _a.title) || ((_c = (_b = field == null ? void 0 : field.options) == null ? void 0 : _b.uiSchema) == null ? void 0 : _c.title) || (field == null ? void 0 : field.title) || ((_d = field == null ? void 0 : field.options) == null ? void 0 : _d.title) || getFieldName(field);
 }
 function resolveAssociationNameFromField(field, fallbackCollection) {
   const resourceName = typeof (field == null ? void 0 : field.resourceName) === "string" ? field.resourceName.trim() : "";

package/dist/server/flow-surfaces/service-utils.d.ts

@@ -21,6 +21,7 @@ export declare function normalizeBlockTitleDescription(titleDescription: any): a
 export declare function buildBlockTitleDescriptionFromSemanticChanges(changes: Record<string, any>): {
     titleDescription: _.Dictionary<any>;
 };
+export declare function buildBlockCardSettingsFromSemanticChanges(changes: Record<string, any>): {};
 export declare function buildChartCardSettingsFromSemanticChanges(currentCardSettings: any, changes: Record<string, any>): any;
 export declare function buildPopupTabTree(options: {
     tabUid?: string;
@@ -68,7 +69,6 @@ export type NormalizedComposeFieldSpec = {
     type?: string;
     fieldType?: FlowSurfacePublicRelationFieldType;
     fields?: string[];
-    selectorFields?: string[];
     titleField?: string;
     openMode?: string;
     popupSize?: string;