@nocobase/flow-engine 2.0.0-alpha.3 → 2.0.0-alpha.30

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

@@ -103,12 +103,24 @@ const DefaultSettingsIcon = /* @__PURE__ */ __name(({
   const dropdownMaxHeight = (0, import_hooks.useNiceDropdownMaxHeight)([visible]);
   const copyUidToClipboard = (0, import_react.useCallback)(
     async (uid) => {
+      var _a;
       try {
         await navigator.clipboard.writeText(uid);
         message.success(t("UID copied to clipboard"));
       } catch (error) {
         console.error(t("Copy failed"), ":", error);
-        message.error(t("Copy failed, please copy [{{uid}}] manually.", { uid }));
+        const isHttps = typeof window !== "undefined" && ((_a = window.location) == null ? void 0 : _a.protocol) === "https:";
+        if (!isHttps) {
+          message.error(
+            t(
+              "Copy failed under HTTP. Clipboard API is unavailable on non-HTTPS pages. Please copy [{{uid}}] manually.",
+              { uid }
+            )
+          );
+          return;
+        } else {
+          message.error(t("Copy failed, please copy [{{uid}}] manually.", { uid }));
+        }
       }
     },
     [message, t]
@@ -216,13 +228,13 @@ const DefaultSettingsIcon = /* @__PURE__ */ __name(({
   const getModelConfigurableFlowsAndSteps = (0, import_react.useCallback)(
     async (targetModel, modelKey) => {
       try {
-        const flows = targetModel.getFlows();
+        const flows = targetModel.constructor.globalFlowRegistry.getFlows();
         const flowsArray = Array.from(flows.values());
         const flowsWithSteps = await Promise.all(
           flowsArray.map(async (flow) => {
             const configurableSteps = await Promise.all(
               Object.entries(flow.steps).map(async ([stepKey, stepDefinition]) => {
-                var _a, _b;
+                var _a;
                 const actionStep = stepDefinition;
                 if (actionStep.hideInSettings) {
                   return null;
@@ -232,9 +244,9 @@ const DefaultSettingsIcon = /* @__PURE__ */ __name(({
                 let stepTitle = actionStep.title;
                 if (actionStep.use) {
                   try {
-                    const action = (_b = (_a = targetModel.flowEngine) == null ? void 0 : _a.getAction) == null ? void 0 : _b.call(_a, actionStep.use);
+                    const action = (_a = targetModel.getAction) == null ? void 0 : _a.call(targetModel, actionStep.use);
                     hasActionUiSchema = action && action.uiSchema != null;
-                    stepTitle = stepTitle || action.title;
+                    stepTitle = stepTitle || (action == null ? void 0 : action.title);
                   } catch (error) {
                     console.warn(t("Failed to get action {{action}}", { action: actionStep.use }), ":", error);
                   }

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

@@ -122,7 +122,7 @@ const FlowsContextMenuWithModel = (0, import_react.observer)(
         const flowsArray = Array.from(flows.values());
         return flowsArray.map((flow) => {
           const configurableSteps = Object.entries(flow.steps).map(([stepKey, stepDefinition]) => {
-            var _a, _b;
+            var _a;
             const actionStep = stepDefinition;
             if (actionStep.hideInSettings) {
               return null;
@@ -130,7 +130,7 @@ const FlowsContextMenuWithModel = (0, import_react.observer)(
             const stepUiSchema = actionStep.uiSchema || {};
             let actionUiSchema = {};
             if (actionStep.use) {
-              const action = (_b = (_a = model.flowEngine) == null ? void 0 : _a.getAction) == null ? void 0 : _b.call(_a, actionStep.use);
+              const action = (_a = model.getAction) == null ? void 0 : _a.call(model, actionStep.use);
               if (action && action.uiSchema) {
                 actionUiSchema = action.uiSchema;
               }

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

@@ -59,7 +59,7 @@ const openStepSettingsDialog = /* @__PURE__ */ __name(async ({
   uiModeProps,
   cleanup
 }) => {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e, _f;
   const t = (0, import_utils.getT)(model);
   const message = model.context.message;
   if (!model) {
@@ -132,6 +132,12 @@ const openStepSettingsDialog = /* @__PURE__ */ __name(async ({
     width: dialogWidth,
     destroyOnClose: true,
     ...(0, import_reactive.toJS)(uiModeProps),
+    // 透传 navigation，便于变量元信息根据真实视图栈推断父级弹窗
+    inputArgs: (0, import_utils.buildSettingsViewInputArgs)(
+      model,
+      { ...((_e = (0, import_reactive.toJS)(uiModeProps)) == null ? void 0 : _e.inputArgs) || {}, __isSettingsPopup: true },
+      { navigationOverride: (_f = ctx == null ? void 0 : ctx.view) == null ? void 0 : _f.navigation }
+    ),
     onClose: /* @__PURE__ */ __name(() => {
       if (cleanup) {
         cleanup();

package/lib/components/variables/VariableInput.js

@@ -94,6 +94,7 @@ const VariableInputComponent = /* @__PURE__ */ __name(({
   showValueComponent = true,
   onlyLeafSelectable = false,
   clearValue,
+  ignoreFieldNames,
   ...restProps
 }) => {
   const [currentMetaTreeNode, setCurrentMetaTreeNode] = (0, import_react.useState)(null);
@@ -241,11 +242,23 @@ const VariableInputComponent = /* @__PURE__ */ __name(({
     if (disabled) {
       return;
     }
-    setCurrentMetaTreeNode(null);
     const cleared = clearValue !== void 0 ? clearValue : null;
     setInnerValue(cleared);
+    try {
+      const path = resolvePathFromValue == null ? void 0 : resolvePathFromValue(cleared);
+      if (Array.isArray(resolvedMetaTree) && path && path.length > 0) {
+        const node = findMetaTreeNodeByPath(resolvedMetaTree, path);
+        if (node) {
+          setCurrentMetaTreeNode(node);
+          emitChange(cleared, node);
+          return;
+        }
+      }
+    } catch (_) {
+    }
+    setCurrentMetaTreeNode(null);
     emitChange(cleared);
-  }, [emitChange, disabled, clearValue]);
+  }, [emitChange, disabled, clearValue, resolvedMetaTree, resolvePathFromValue]);
   const stableProps = (0, import_react.useMemo)(() => {
     const { style, onFocus, onBlur, disabled: disabled2, ...otherProps } = restProps;
     return { style, onFocus, onBlur, otherProps };
@@ -311,6 +324,7 @@ const VariableInputComponent = /* @__PURE__ */ __name(({
       parseValueToPath: resolvePathFromValue,
       formatPathToValue: resolveValueFromPath,
       onlyLeafSelectable,
+      ignoreFieldNames,
       ...!showValueComponent && { children: null, placeholder: restProps == null ? void 0 : restProps.placeholder }
     }
   ));

package/lib/components/variables/VariableTag.js

@@ -63,8 +63,49 @@ const VariableTagComponent = /* @__PURE__ */ __name(({
         return metaTreeNode.parentTitles ? [...metaTreeNode.parentTitles, metaTreeNode.title].map(ctx.t).join("/") : ctx.t(metaTreeNode.title) || "";
       }
       if (!value) return String(value);
-      const path = (0, import_utils.parseValueToPath)(value);
-      return path ? path.join("/") : 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 {
+              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 < path.length) {
+          const tail = path.slice(matchedCount).join("/");
+          label = tail ? `${label}/${tail}` : label;
+        }
+        return label;
+      }
+      return path.join("/");
     },
     { refreshDeps: [resolvedMetaTree, value, metaTreeNode] }
   );

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

@@ -18,6 +18,7 @@ export interface FlowContextSelectorProps extends Omit<CascaderProps<ContextSele
     formatPathToValue?: (item: MetaTreeNode) => string;
     open?: boolean;
     onlyLeafSelectable?: boolean;
+    ignoreFieldNames?: string[];
 }
 export interface ContextSelectorItem {
     label: React.ReactNode;
@@ -62,6 +63,7 @@ export interface VariableInputProps {
      * 默认行为为 null；可设置为 '' 等，以便清空后默认切换为“常量-空字符串”。
      */
     clearValue?: any;
+    ignoreFieldNames?: string[];
     [key: string]: any;
 }
 export interface VariableTagProps {

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

@@ -49,7 +49,9 @@ export declare class DataSource {
     addCollection(collection: Collection | CollectionOptions): void;
     updateCollection(newOptions: CollectionOptions): void;
     upsertCollection(options: CollectionOptions): Collection;
-    upsertCollections(collections: CollectionOptions[]): void;
+    upsertCollections(collections: CollectionOptions[], options?: {
+        clearFields?: boolean;
+    }): void;
     removeCollection(name: string): void;
     clearCollections(): void;
     setOptions(newOptions?: any): void;
@@ -68,9 +70,13 @@ export declare class CollectionManager {
     get flowEngine(): FlowEngine;
     addCollection(collection: Collection | CollectionOptions): void;
     removeCollection(name: string): void;
-    updateCollection(newOptions: CollectionOptions): void;
+    updateCollection(newOptions: CollectionOptions, options?: {
+        clearFields?: boolean;
+    }): void;
     upsertCollection(options: CollectionOptions): Collection;
-    upsertCollections(collections: CollectionOptions[]): void;
+    upsertCollections(collections: CollectionOptions[], options?: {
+        clearFields?: boolean;
+    }): void;
     sortCollectionsByInherits(collections: CollectionOptions[]): CollectionOptions[];
     getCollection(name: string): Collection | undefined;
     getCollections(): Collection[];
@@ -97,7 +103,9 @@ export declare class Collection {
     get titleCollectionField(): CollectionField;
     initInherits(): void;
     setDataSource(dataSource: DataSource): void;
-    setOptions(newOptions?: any): void;
+    setOptions(newOptions?: any, options?: {
+        clearFields?: boolean;
+    }): void;
     getFields(): CollectionField[];
     getToOneAssociationFields(): CollectionField[];
     getAssociationFields(types?: any[]): CollectionField[];

package/lib/data-source/index.js

@@ -49,6 +49,7 @@ module.exports = __toCommonJS(data_source_exports);
 var import_reactive = require("@formily/reactive");
 var import_lodash = __toESM(require("lodash"));
 var import_jioToJoiSchema = require("./jioToJoiSchema");
+var import_sortCollectionsByInherits = require("./sortCollectionsByInherits");
 const _DataSourceManager = class _DataSourceManager {
   dataSources;
   flowEngine;
@@ -152,8 +153,8 @@ const _DataSource = class _DataSource {
   upsertCollection(options) {
     return this.collectionManager.upsertCollection(options);
   }
-  upsertCollections(collections) {
-    return this.collectionManager.upsertCollections(collections);
+  upsertCollections(collections, options = {}) {
+    return this.collectionManager.upsertCollections(collections, options);
   }
   removeCollection(name) {
     return this.collectionManager.removeCollection(name);
@@ -204,12 +205,12 @@ const _CollectionManager = class _CollectionManager {
   removeCollection(name) {
     this.collections.delete(name);
   }
-  updateCollection(newOptions) {
+  updateCollection(newOptions, options = {}) {
     const collection = this.getCollection(newOptions.name);
     if (!collection) {
       throw new Error(`Collection ${newOptions.name} not found`);
     }
-    collection.setOptions(newOptions);
+    collection.setOptions(newOptions, options);
   }
   upsertCollection(options) {
     if (this.collections.has(options.name)) {
@@ -219,10 +220,10 @@ const _CollectionManager = class _CollectionManager {
     }
     return this.getCollection(options.name);
   }
-  upsertCollections(collections) {
-    for (const collection of this.sortCollectionsByInherits(collections)) {
+  upsertCollections(collections, options = {}) {
+    for (const collection of (0, import_sortCollectionsByInherits.sortCollectionsByInherits)(collections)) {
       if (this.collections.has(collection.name)) {
-        this.updateCollection(collection);
+        this.updateCollection(collection, options);
       } else {
         this.addCollection(collection);
       }
@@ -368,7 +369,8 @@ const _Collection = class _Collection {
     for (const inherit of this.options.inherits || []) {
       const collection = this.collectionManager.getCollection(inherit);
       if (!collection) {
-        throw new Error(`Collection ${inherit} not found`);
+        console.warn(`Warning: Collection ${inherit} not found for collection ${this.name}`);
+        continue;
       }
       this.inherits.set(inherit, collection);
     }
@@ -376,10 +378,13 @@ const _Collection = class _Collection {
   setDataSource(dataSource) {
     this.dataSource = dataSource;
   }
-  setOptions(newOptions = {}) {
+  setOptions(newOptions = {}, options = {}) {
     Object.keys(this.options).forEach((key) => delete this.options[key]);
     Object.assign(this.options, newOptions);
     this.initInherits();
+    if (options.clearFields) {
+      this.clearFields();
+    }
     this.upsertFields(this.options.fields || []);
   }
   getFields() {
@@ -438,7 +443,7 @@ const _Collection = class _Collection {
     if (otherKeys.length === 0) {
       return field;
     }
-    if (!field.targetCollection) {
+    if (!(field == null ? void 0 : field.targetCollection)) {
       return null;
     }
     return field.targetCollection.getFieldByPath(otherKeys.join("."));
@@ -584,7 +589,7 @@ const _CollectionField = class _CollectionField {
   }
   get title() {
     var _a, _b, _c;
-    const titleValue = ((_a = this.options) == null ? void 0 : _a.title) || ((_c = (_b = this.options) == null ? void 0 : _b.uiSchema) == null ? void 0 : _c.title) || this.options.name;
+    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);
   }
   set title(value) {
@@ -618,7 +623,7 @@ const _CollectionField = class _CollectionField {
     return this.options.validation;
   }
   getComponentProps() {
-    var _a;
+    var _a, _b;
     const { type, target } = this.options;
     const componentProps = import_lodash.default.omitBy(
       {
@@ -627,7 +632,8 @@ const _CollectionField = class _CollectionField {
         mode: this.type === "array" ? "multiple" : void 0,
         multiple: target ? ["belongsToMany", "hasMany", "belongsToArray"].includes(type) : void 0,
         maxCount: target && !["belongsToMany", "hasMany", "belongsToArray"].includes(type) ? 1 : void 0,
-        target
+        target,
+        template: (_b = this.targetCollection) == null ? void 0 : _b.template
       },
       import_lodash.default.isUndefined
     );

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

@@ -0,0 +1,10 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+import { CollectionOptions } from '.';
+export declare function sortCollectionsByInherits(collections: CollectionOptions[]): CollectionOptions[];

package/lib/data-source/sortCollectionsByInherits.js

@@ -0,0 +1,71 @@
+/**
+ * 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 __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var sortCollectionsByInherits_exports = {};
+__export(sortCollectionsByInherits_exports, {
+  sortCollectionsByInherits: () => sortCollectionsByInherits
+});
+module.exports = __toCommonJS(sortCollectionsByInherits_exports);
+function sortCollectionsByInherits(collections) {
+  const sorted = [];
+  const visited = /* @__PURE__ */ new Set();
+  const visiting = /* @__PURE__ */ new Set();
+  const map = /* @__PURE__ */ new Map();
+  collections.forEach((col) => {
+    map.set(col.name, col);
+  });
+  const addToSorted = /* @__PURE__ */ __name((col) => {
+    if (visiting.has(col.name)) {
+      throw new Error(`Circular dependency detected: ${col.name} inherits from itself through a chain`);
+    }
+    if (visited.has(col.name)) {
+      return;
+    }
+    visiting.add(col.name);
+    const inherits = col.inherits || [];
+    for (const inheritName of inherits) {
+      const inheritCol = map.get(inheritName);
+      if (!inheritCol) {
+        console.warn(`Warning: Collection ${inheritName}, inherited by ${col.name}, not found.`);
+        continue;
+      }
+      addToSorted(inheritCol);
+    }
+    visiting.delete(col.name);
+    visited.add(col.name);
+    sorted.push(col);
+  }, "addToSorted");
+  for (const col of collections) {
+    addToSorted(col);
+  }
+  return sorted;
+}
+__name(sortCollectionsByInherits, "sortCollectionsByInherits");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  sortCollectionsByInherits
+});

package/lib/executor/FlowExecutor.d.ts

@@ -8,19 +8,18 @@
  */
 import { FlowEngine } from '../flowEngine';
 import type { FlowModel } from '../models';
+import type { DispatchEventOptions } from '../types';
 export declare class FlowExecutor {
     private readonly engine;
     constructor(engine: FlowEngine);
+    /** 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>;
-    /**
-     * Execute all auto-apply flows for model.
-     */
-    runAutoFlows(model: FlowModel, inputArgs?: Record<string, any>, useCache?: boolean): Promise<any[]>;
     /**
      * Dispatch an event to flows bound via flow.on and execute them.
      */
-    dispatchEvent(model: FlowModel, eventName: string, inputArgs?: Record<string, any>): Promise<void>;
+    dispatchEvent(model: FlowModel, eventName: string, inputArgs?: Record<string, any>, options?: DispatchEventOptions): Promise<any>;
 }