@nocobase/flow-engine 2.0.0-beta.9 → 2.0.1

package/lib/components/settings/wrappers/contextual/FlowsContextMenu.js

@@ -61,6 +61,20 @@ const FlowsContextMenu = /* @__PURE__ */ __name((props) => {
 const FlowsContextMenuWithModel = (0, import_reactive.observer)(
   ({ model, children, enabled = true, position = "right", showDeleteButton = true }) => {
     const t = (0, import_utils.getT)(model);
+    const { token } = import_antd.theme.useToken();
+    const disabledIconColor = (token == null ? void 0 : token.colorTextTertiary) || (token == null ? void 0 : token.colorTextDescription) || (token == null ? void 0 : token.colorTextSecondary);
+    const [configurableFlowsAndSteps, setConfigurableFlowsAndSteps] = (0, import_react.useState)([]);
+    const isStepMenuItemDisabled = (0, import_react.useCallback)(
+      (key) => {
+        const [flowKey, stepKey] = key.split(":");
+        if (!flowKey || !stepKey) return false;
+        return configurableFlowsAndSteps.some(({ flow, steps }) => {
+          if (flow.key !== flowKey) return false;
+          return steps.some((stepInfo) => stepInfo.stepKey === stepKey && !!stepInfo.disabled);
+        });
+      },
+      [configurableFlowsAndSteps]
+    );
     const handleMenuClick = (0, import_react.useCallback)(
       ({ key }) => {
         var _a;
@@ -86,6 +100,9 @@ const FlowsContextMenuWithModel = (0, import_reactive.observer)(
             }
           });
         } else {
+          if (isStepMenuItemDisabled(key)) {
+            return;
+          }
           const [flowKey, stepKey] = key.split(":");
           try {
             const flow = model.getFlow(flowKey);
@@ -108,7 +125,7 @@ const FlowsContextMenuWithModel = (0, import_reactive.observer)(
           }
         }
       },
-      [model]
+      [isStepMenuItemDisabled, model]
     );
     if (!model) {
       return /* @__PURE__ */ import_react.default.createElement(import_antd.Alert, { message: "\u63D0\u4F9B\u7684\u6A21\u578B\u65E0\u6548", type: "error" });
@@ -129,6 +146,7 @@ const FlowsContextMenuWithModel = (0, import_reactive.observer)(
                 if (await (0, import_utils.shouldHideStepInSettings)(model, flow, actionStep)) {
                   return null;
                 }
+                const disabledState = await (0, import_utils.resolveStepDisabledInSettings)(model, flow, actionStep);
                 const stepUiSchema = actionStep.uiSchema || {};
                 let actionUiSchema = {};
                 if (actionStep.use) {
@@ -152,7 +170,9 @@ const FlowsContextMenuWithModel = (0, import_reactive.observer)(
                   stepKey,
                   step: actionStep,
                   uiSchema: mergedUiSchema,
-                  title: actionStep.title || stepKey
+                  title: actionStep.title || stepKey,
+                  disabled: disabledState.disabled,
+                  disabledReason: disabledState.reason
                 };
               })
             ).then((steps) => steps.filter(Boolean));
@@ -165,7 +185,6 @@ const FlowsContextMenuWithModel = (0, import_reactive.observer)(
         return [];
       }
     }, [model]);
-    const [configurableFlowsAndSteps, setConfigurableFlowsAndSteps] = (0, import_react.useState)([]);
     (0, import_react.useEffect)(() => {
       let mounted = true;
       (async () => {
@@ -193,7 +212,8 @@ const FlowsContextMenuWithModel = (0, import_reactive.observer)(
           menuItems.push({
             key: `${flow.key}:${stepInfo.stepKey}`,
             icon: /* @__PURE__ */ import_react.default.createElement(import_icons.SettingOutlined, null),
-            label: stepInfo.title
+            label: stepInfo.disabled ? /* @__PURE__ */ import_react.default.createElement("span", { style: { display: "inline-flex", alignItems: "center", gap: 6 } }, stepInfo.title, /* @__PURE__ */ import_react.default.createElement(import_antd.Tooltip, { title: stepInfo.disabledReason, placement: "right", destroyTooltipOnHide: true }, /* @__PURE__ */ import_react.default.createElement(import_icons.QuestionCircleOutlined, { style: { color: disabledIconColor } }))) : stepInfo.title,
+            disabled: !!stepInfo.disabled
           });
         });
       });

package/lib/components/settings/wrappers/contextual/StepSettingsDialog.js

@@ -47,6 +47,7 @@ var import_antd = require("antd");
 var import_react2 = __toESM(require("react"));
 var import_useFlowSettingsContext = require("../../../../hooks/useFlowSettingsContext");
 var import_utils = require("../../../../utils");
+var import_exceptions = require("../../../../utils/exceptions");
 var import_reactive2 = require("../../../../reactive");
 const SchemaField = (0, import_react.createSchemaField)();
 const openStepSettingsDialog = /* @__PURE__ */ __name(async ({
@@ -195,7 +196,10 @@ const openStepSettingsDialog = /* @__PURE__ */ __name(async ({
                   await afterParamsSave(flowRuntimeContext, currentValues, previousParams);
                 }
               } catch (error) {
-                if (error instanceof import_utils.FlowExitException) {
+                if (error instanceof import_utils.FlowCancelSaveException) {
+                  return;
+                }
+                if (error instanceof import_utils.FlowExitException || error instanceof import_exceptions.FlowExitAllException) {
                   currentDialog.close();
                   return;
                 }

package/lib/components/variables/VariableInput.js

@@ -198,8 +198,7 @@ const VariableInputComponent = /* @__PURE__ */ __name(({
   (0, import_react.useEffect)(() => {
     if (!resolvedMetaTreeNode) return;
     if (!Array.isArray(resolvedMetaTree) || innerValue == null) return;
-    const finalValue = (resolveValueFromPath == null ? void 0 : resolveValueFromPath(resolvedMetaTreeNode)) || innerValue;
-    emitChange(finalValue, resolvedMetaTreeNode);
+    emitChange(innerValue, resolvedMetaTreeNode);
     setCurrentMetaTreeNode(resolvedMetaTreeNode);
   }, [resolvedMetaTreeNode]);
   const composingRef = (0, import_react.useRef)(false);
@@ -230,12 +229,18 @@ const VariableInputComponent = /* @__PURE__ */ __name(({
   );
   const handleVariableSelect = (0, import_react.useCallback)(
     (variableValue, metaTreeNode) => {
+      if (!metaTreeNode && variableValue === "") {
+        const cleared = clearValue !== void 0 ? clearValue : null;
+        setInnerValue(cleared);
+        emitChange(cleared);
+        return;
+      }
       setCurrentMetaTreeNode(metaTreeNode);
       const finalValue = (resolveValueFromPath == null ? void 0 : resolveValueFromPath(metaTreeNode)) || variableValue;
       setInnerValue(finalValue);
       emitChange(finalValue, metaTreeNode);
     },
-    [emitChange, resolveValueFromPath]
+    [emitChange, resolveValueFromPath, clearValue]
   );
   const { disabled } = restProps;
   const handleClear = (0, import_react.useCallback)(() => {
@@ -265,7 +270,7 @@ const VariableInputComponent = /* @__PURE__ */ __name(({
   }, [restProps]);
   const inputProps = (0, import_react.useMemo)(() => {
     const baseProps = {
-      value: innerValue ?? "",
+      value: ValueComponent === import_antd.Input ? innerValue ?? "" : innerValue,
       onChange: handleInputChange,
       disabled
     };

package/lib/components/variables/VariableTag.js

@@ -59,53 +59,60 @@ const VariableTagComponent = /* @__PURE__ */ __name(({
   const ctx = (0, import_FlowContextProvider.useFlowContext)();
   const { data: displayedValue } = (0, import_ahooks.useRequest)(
     async () => {
-      if (metaTreeNode) {
-        return metaTreeNode.parentTitles ? [...metaTreeNode.parentTitles, metaTreeNode.title].map(ctx.t).join("/") : ctx.t(metaTreeNode.title) || "";
-      }
-      if (!value) return String(value);
-      const rawPath = (0, import_utils.parseValueToPath)(value);
-      if (!rawPath || !Array.isArray(resolvedMetaTree)) {
-        return Array.isArray(rawPath) ? rawPath.join("/") : String(value);
-      }
-      const topNames = new Set((resolvedMetaTree || []).map((n) => String(n == null ? void 0 : n.name)));
-      const path = !topNames.has(String(rawPath[0])) ? rawPath.slice(1) : rawPath;
-      if (!path.length) return "";
-      let nodes = resolvedMetaTree;
-      let deepest = null;
-      let matchedCount = 0;
-      for (let i = 0; i < path.length; i++) {
-        if (!nodes) break;
-        const seg = String(path[i]);
-        const node = nodes.find((n) => String(n == null ? void 0 : n.name) === seg);
-        if (!node) break;
-        deepest = node;
-        matchedCount = i + 1;
-        if (i < path.length - 1) {
-          if (Array.isArray(node.children)) {
-            nodes = node.children;
-          } else if (typeof node.children === "function") {
-            try {
-              const childNodes = await node.children();
-              node.children = childNodes;
-              nodes = childNodes;
-            } catch {
+      const resolveLabelFromPath = /* @__PURE__ */ __name(async (rawPath2) => {
+        if (!rawPath2) return null;
+        if (!Array.isArray(rawPath2)) return null;
+        if (!Array.isArray(resolvedMetaTree)) return null;
+        const topNames = new Set((resolvedMetaTree || []).map((n) => String(n == null ? void 0 : n.name)));
+        const path = !topNames.has(String(rawPath2[0])) ? rawPath2.slice(1) : rawPath2;
+        if (!path.length) return "";
+        let nodes = resolvedMetaTree;
+        const titleChain = [];
+        let matchedCount = 0;
+        for (let i = 0; i < path.length; i++) {
+          if (!nodes) break;
+          const seg = String(path[i]);
+          const node = nodes.find((n) => String(n == null ? void 0 : n.name) === seg);
+          if (!node) break;
+          titleChain.push(String(node.title ?? node.name ?? seg));
+          matchedCount = i + 1;
+          if (i < path.length - 1) {
+            if (Array.isArray(node.children)) {
+              nodes = node.children;
+            } else if (typeof node.children === "function") {
+              try {
+                const childNodes = await node.children();
+                node.children = childNodes;
+                nodes = childNodes;
+              } catch {
+                nodes = void 0;
+              }
+            } else {
               nodes = void 0;
             }
-          } else {
-            nodes = void 0;
           }
         }
-      }
-      if (deepest) {
-        const titles = deepest.parentTitles ? [...deepest.parentTitles, deepest.title] : [deepest.title];
-        let label = titles.map(ctx.t).join("/");
+        if (matchedCount === 0) return null;
+        let label2 = titleChain.map(ctx.t).join("/");
         if (matchedCount < path.length) {
           const tail = path.slice(matchedCount).join("/");
-          label = tail ? `${label}/${tail}` : label;
+          label2 = tail ? `${label2}/${tail}` : label2;
         }
-        return label;
+        return label2;
+      }, "resolveLabelFromPath");
+      if (metaTreeNode == null ? void 0 : metaTreeNode.parentTitles) {
+        return [...metaTreeNode.parentTitles, metaTreeNode.title].map(ctx.t).join("/");
+      }
+      if (metaTreeNode) {
+        const rawPath2 = (0, import_utils.parseValueToPath)(value) || metaTreeNode.paths;
+        const label2 = await resolveLabelFromPath(rawPath2);
+        return label2 ?? ctx.t(metaTreeNode.title) ?? "";
       }
-      return path.join("/");
+      if (!value) return String(value);
+      const rawPath = (0, import_utils.parseValueToPath)(value);
+      const label = await resolveLabelFromPath(rawPath);
+      if (label != null) return label;
+      return Array.isArray(rawPath) ? rawPath.join("/") : String(value);
     },
     { refreshDeps: [resolvedMetaTree, value, metaTreeNode] }
   );

package/lib/components/variables/utils.d.ts

@@ -12,6 +12,13 @@ export declare const parseValueToPath: (value: string) => string[] | undefined;
 export declare const formatPathToValue: (item: MetaTreeNode) => string;
 export declare const loadMetaTreeChildren: (metaNode: MetaTreeNode) => Promise<MetaTreeNode[]>;
 export declare const searchInLoadedNodes: (options: ContextSelectorItem[], searchText: string, parentPaths?: string[]) => ContextSelectorItem[];
+/**
+ * 仅在“已加载节点”范围内按关键字过滤 options（保留树结构）。
+ * - 匹配父节点：保留原节点引用（含原 children），避免不必要的实体重建。
+ * - 匹配子节点：返回裁剪后的父节点副本，children 仅包含命中分支。
+ * - 未加载 children（即 children 不为数组）不会递归搜索。
+ */
+export declare const filterLoadedContextSelectorItems: (options: ContextSelectorItem[] | undefined, keyword: string) => ContextSelectorItem[];
 export declare const buildContextSelectorItems: (metaTree: MetaTreeNode[]) => ContextSelectorItem[];
 /**
  * 预加载：根据路径逐级加载 ContextSelectorItem 的 children，保证打开时已展开对应层级。

package/lib/components/variables/utils.js

@@ -30,6 +30,7 @@ __export(utils_exports, {
   buildContextSelectorItems: () => buildContextSelectorItems,
   createDefaultConverters: () => createDefaultConverters,
   createFinalConverters: () => createFinalConverters,
+  filterLoadedContextSelectorItems: () => filterLoadedContextSelectorItems,
   formatPathToValue: () => formatPathToValue,
   isVariableValue: () => isVariableValue,
   loadMetaTreeChildren: () => loadMetaTreeChildren,
@@ -39,6 +40,16 @@ __export(utils_exports, {
 });
 module.exports = __toCommonJS(utils_exports);
 var import_utils = require("../../utils");
+const getContextSelectorLabelText = /* @__PURE__ */ __name((node) => {
+  var _a;
+  if (typeof node.label === "string") {
+    return node.label;
+  }
+  if (typeof ((_a = node.meta) == null ? void 0 : _a.title) === "string") {
+    return node.meta.title;
+  }
+  return node.value;
+}, "getContextSelectorLabelText");
 const parseValueToPath = /* @__PURE__ */ __name((value) => {
   if (typeof value !== "string") return void 0;
   const trimmed = value.trim();
@@ -71,10 +82,9 @@ const searchInLoadedNodes = /* @__PURE__ */ __name((options, searchText, parentP
   const lowerSearchText = searchText.toLowerCase().trim();
   const results = [];
   const searchRecursive = /* @__PURE__ */ __name((nodes, currentPath = []) => {
-    var _a;
     for (const node of nodes) {
       const nodePath = [...currentPath, node.value];
-      const labelText = typeof node.label === "string" ? node.label : typeof ((_a = node.meta) == null ? void 0 : _a.title) === "string" ? node.meta.title : String(node.value);
+      const labelText = getContextSelectorLabelText(node);
       if (labelText.toLowerCase().includes(lowerSearchText)) {
         results.push(node);
       }
@@ -86,6 +96,35 @@ const searchInLoadedNodes = /* @__PURE__ */ __name((options, searchText, parentP
   searchRecursive(options, []);
   return results;
 }, "searchInLoadedNodes");
+const filterLoadedContextSelectorItems = /* @__PURE__ */ __name((options, keyword) => {
+  if (!Array.isArray(options) || options.length === 0) return [];
+  const normalizedKeyword = keyword.trim().toLowerCase();
+  if (!normalizedKeyword) {
+    return options;
+  }
+  const filterNode = /* @__PURE__ */ __name((node) => {
+    const labelText = getContextSelectorLabelText(node).toLowerCase();
+    const selfMatched = labelText.includes(normalizedKeyword);
+    if (selfMatched) {
+      return node;
+    }
+    if (!Array.isArray(node.children) || node.children.length === 0) {
+      return null;
+    }
+    const filteredChildren = node.children.map((child) => filterNode(child)).filter((item) => item !== null);
+    if (filteredChildren.length === 0) {
+      return null;
+    }
+    if (filteredChildren.length === node.children.length && filteredChildren.every((child, idx) => child === node.children[idx])) {
+      return node;
+    }
+    return {
+      ...node,
+      children: filteredChildren
+    };
+  }, "filterNode");
+  return options.map((node) => filterNode(node)).filter((item) => item !== null);
+}, "filterLoadedContextSelectorItems");
 const buildContextSelectorItems = /* @__PURE__ */ __name((metaTree) => {
   if (!metaTree || !Array.isArray(metaTree)) {
     console.warn("buildContextSelectorItems received invalid metaTree:", metaTree);
@@ -170,6 +209,7 @@ const createFinalConverters = /* @__PURE__ */ __name((propConverters) => {
   buildContextSelectorItems,
   createDefaultConverters,
   createFinalConverters,
+  filterLoadedContextSelectorItems,
   formatPathToValue,
   isVariableValue,
   loadMetaTreeChildren,

package/lib/data-source/index.d.ts

@@ -66,6 +66,11 @@ export interface CollectionOptions {
 export declare class CollectionManager {
     dataSource: DataSource;
     collections: Map<string, Collection>;
+    allCollectionsInheritChain: string[];
+    protected childrenCollectionsName: {
+        supportView?: string[];
+        notSupportView?: string[];
+    };
     constructor(dataSource: DataSource);
     get flowEngine(): FlowEngine;
     addCollection(collection: Collection | CollectionOptions): void;
@@ -83,33 +88,8 @@ export declare class CollectionManager {
     clearCollections(): void;
     getAssociation(associationName: string): CollectionField | undefined;
     getChildrenCollections(name: any): any[];
-    getCollectionFieldsOptions(collectionName: string, type?: string | string[], interfaces?: string | string[], opts?: {
-        dataSource?: string;
-        cached?: Record<string, any>;
-        collectionNames?: string[];
-        /**
-         * 为 true 时允许查询所有关联字段
-         * 为 Array<string> 时仅允许查询指定的关联字段
-         */
-        association?: boolean | string[];
-        /**
-         * Max depth of recursion
-         */
-        maxDepth?: number;
-        allowAllTypes?: boolean;
-        /**
-         * 排除这些接口的字段
-         */
-        exceptInterfaces?: string[];
-        /**
-         * field value 的前缀，用 . 连接，比如 a.b.c
-         */
-        prefixFieldValue?: string;
-        /**
-         * 是否使用 prefixFieldValue 作为 field value
-         */
-        usePrefix?: boolean;
-    }): any;
+    getChildrenCollectionsName(name: any, isSupportView?: boolean): string[];
+    getAllCollectionsInheritChain(name: any): string[];
 }
 export declare class Collection {
     fields: Map<string, CollectionField>;

package/lib/data-source/index.js

@@ -118,7 +118,7 @@ const _DataSource = class _DataSource {
     return this.dataSourceManager.flowEngine;
   }
   get displayName() {
-    return this.options.displayName ? this.flowEngine.translate(this.options.displayName) : this.key;
+    return this.flowEngine.translate(this.options.displayName, { ns: "lm-collections" }) || this.key;
   }
   get key() {
     return this.options.key;
@@ -188,6 +188,8 @@ const _CollectionManager = class _CollectionManager {
     this.collections = import_reactive.observable.shallow(/* @__PURE__ */ new Map());
   }
   collections;
+  allCollectionsInheritChain;
+  childrenCollectionsName = {};
   get flowEngine() {
     return this.dataSource.flowEngine;
   }
@@ -317,56 +319,75 @@ const _CollectionManager = class _CollectionManager {
     }, "getChildrens");
     return getChildrens(name);
   }
-  getCollectionFieldsOptions(collectionName, type, interfaces, opts) {
-    var _a;
-    const {
-      association = false,
-      cached = {},
-      collectionNames = [collectionName],
-      maxDepth = 1,
-      allowAllTypes = false,
-      exceptInterfaces = [],
-      prefixFieldValue = "",
-      usePrefix = false,
-      dataSource: customDataSourceNameValue
-    } = opts || {};
-    if (collectionNames.length - 1 > maxDepth) {
-      return;
-    }
-    if (cached[collectionName]) {
-      return import_lodash.default.cloneDeep(cached[collectionName]);
+  getChildrenCollectionsName(name, isSupportView = false) {
+    const cacheKey = isSupportView ? "supportView" : "notSupportView";
+    if (this.childrenCollectionsName[cacheKey]) {
+      return this.childrenCollectionsName[cacheKey].slice();
     }
-    const collection = this.getCollection(collectionName);
-    if (!collection) {
-      throw new Error(`Collection ${collectionName} not found`);
-    }
-    const fields = collection.getFields();
-    const options = (_a = fields == null ? void 0 : fields.filter(
-      (field) => field.interface && !exceptInterfaces.includes(field.interface) && (allowAllTypes || type && type.includes(field.type) || interfaces && interfaces.includes(field.interface) || (association && field.target && field.target !== collectionName && Array.isArray(association) ? association.includes(field.interface) : false))
-    )) == null ? void 0 : _a.map((field) => {
-      var _a2, _b;
-      const result = {
-        value: usePrefix && prefixFieldValue ? `${prefixFieldValue}.${field.name}` : field.name,
-        label: ((_a2 = field == null ? void 0 : field.uiSchema) == null ? void 0 : _a2.title) || field.name,
-        ...field
-      };
-      if (association && field.target) {
-        result.children = collectionNames.includes(field.target) ? [] : this.getCollectionFieldsOptions(field.target, type, interfaces, {
-          ...opts,
-          cached,
-          dataSource: customDataSourceNameValue,
-          collectionNames: [...collectionNames, field.target],
-          prefixFieldValue: usePrefix ? prefixFieldValue ? `${prefixFieldValue}.${field.name}` : field.name : "",
-          usePrefix
+    const children = [];
+    const collections = [...this.getCollections()];
+    const getChildrenCollectionsInner = /* @__PURE__ */ __name((collectionName) => {
+      const inheritCollections = collections.filter((v) => {
+        var _a;
+        return (_a = [...v.inherits]) == null ? void 0 : _a.includes(collectionName);
+      });
+      inheritCollections.forEach((v) => {
+        const collectionKey = v.name;
+        children.push(collectionKey);
+        return getChildrenCollectionsInner(collectionKey);
+      });
+      if (isSupportView) {
+        const sourceCollections = collections.filter((v) => {
+          var _a;
+          return ((_a = [...v.sources]) == null ? void 0 : _a.length) === 1 && (v == null ? void 0 : v.sources[0]) === collectionName;
+        });
+        sourceCollections.forEach((v) => {
+          const collectionKey = v.name;
+          children.push(v.name);
+          return getChildrenCollectionsInner(collectionKey);
         });
-        if (!((_b = result.children) == null ? void 0 : _b.length)) {
-          return null;
+      }
+      return import_lodash.default.uniq(children);
+    }, "getChildrenCollectionsInner");
+    this.childrenCollectionsName[cacheKey] = getChildrenCollectionsInner(name);
+    return this.childrenCollectionsName[cacheKey];
+  }
+  getAllCollectionsInheritChain(name) {
+    if (this.allCollectionsInheritChain) {
+      return this.allCollectionsInheritChain.slice();
+    }
+    const collectionsInheritChain = [name];
+    const getInheritChain = /* @__PURE__ */ __name((name2) => {
+      const collection = this.getCollection(name2);
+      if (collection) {
+        const { inherits } = collection;
+        const children = this.getChildrenCollectionsName(name2);
+        if (inherits) {
+          for (let index = 0; index < inherits.length; index++) {
+            const collectionKey = inherits[index];
+            if (collectionsInheritChain.includes(collectionKey)) {
+              continue;
+            }
+            collectionsInheritChain.push(collectionKey);
+            getInheritChain(collectionKey);
+          }
+        }
+        if (children) {
+          for (let index = 0; index < children.length; index++) {
+            const collection2 = this.getCollection(children[index]);
+            const collectionKey = collection2.name;
+            if (collectionsInheritChain.includes(collectionKey)) {
+              continue;
+            }
+            collectionsInheritChain.push(collectionKey);
+            getInheritChain(collectionKey);
+          }
         }
       }
-      return result;
-    }).filter(Boolean);
-    cached[collectionName] = options;
-    return options;
+      return collectionsInheritChain;
+    }, "getInheritChain");
+    this.allCollectionsInheritChain = getInheritChain(name);
+    return this.allCollectionsInheritChain || [];
   }
 };
 __name(_CollectionManager, "CollectionManager");
@@ -400,6 +421,9 @@ const _Collection = class _Collection {
     if (typeof this.filterTargetKey === "string") {
       return record[this.filterTargetKey];
     }
+    if (Array.isArray(this.filterTargetKey) && this.filterTargetKey.length === 1) {
+      return record[this.filterTargetKey[0]];
+    }
     return import_lodash.default.pick(record, this.filterTargetKey);
   }
   get titleableFields() {
@@ -433,7 +457,7 @@ const _Collection = class _Collection {
     return this.options.storage || "local";
   }
   get title() {
-    return this.options.title ? this.flowEngine.translate(this.options.title) : this.name;
+    return this.flowEngine.translate(this.options.title, { ns: "lm-collections" }) || this.name;
   }
   get titleCollectionField() {
     const titleFieldName = this.options.titleField || this.filterTargetKey;
@@ -668,8 +692,8 @@ const _CollectionField = class _CollectionField {
   }
   get title() {
     var _a, _b, _c;
-    const titleValue = ((_b = (_a = this.options) == null ? void 0 : _a.uiSchema) == null ? void 0 : _b.title) || ((_c = this.options) == null ? void 0 : _c.title) || this.options.name;
-    return this.flowEngine.translate(titleValue);
+    const titleValue = ((_b = (_a = this.options) == null ? void 0 : _a.uiSchema) == null ? void 0 : _b.title) || ((_c = this.options) == null ? void 0 : _c.title);
+    return this.flowEngine.translate(titleValue, { ns: "lm-collections" }) || this.options.name;
   }
   set title(value) {
     this.options.title = value;
@@ -687,11 +711,17 @@ const _CollectionField = class _CollectionField {
         }
         return {
           ...v,
+          label: v.label ? this.flowEngine.translate(v.label, { ns: "lm-collections" }) : v.label,
           value: Number(v.value)
         };
       });
     }
-    return options;
+    return options.map((v) => {
+      return {
+        ...v,
+        label: this.flowEngine.translate(v.label, { ns: "lm-collections" })
+      };
+    });
   }
   get defaultValue() {
     return this.options.defaultValue == null ? void 0 : this.options.defaultValue;

package/lib/executor/FlowExecutor.d.ts

@@ -12,12 +12,13 @@ import type { DispatchEventOptions } from '../types';
 export declare class FlowExecutor {
     private readonly engine;
     constructor(engine: FlowEngine);
+    private emitModelEventIf;
     /** Cache wrapper for applyFlow cache lifecycle */
     private withApplyFlowCache;
     /**
      * Execute a single flow on model.
      */
-    runFlow(model: FlowModel, flowKey: string, inputArgs?: Record<string, any>, runId?: string): Promise<any>;
+    runFlow(model: FlowModel, flowKey: string, inputArgs?: Record<string, any>, runId?: string, eventName?: string): Promise<any>;
     /**
      * Dispatch an event to flows bound via flow.on and execute them.
      */