@nocobase/flow-engine 2.0.0-beta.2 → 2.0.0-beta.20

package/lib/models/flowModel.d.ts

@@ -361,6 +361,13 @@ export declare class FlowModel<Structure extends DefaultStructure = DefaultStruc
     }): Promise<void>;
     get translate(): any;
     serialize(): Record<string, any>;
+    /**
+     * 复制当前模型实例为一个新的实例。
+     * 新实例及其所有子模型都会有新的 uid，且不保留 root model 的 parent 关系。
+     * 内部所有引用旧 uid 的地方（如 parentId, parentUid 等）都会被替换为对应的新 uid。
+     * @returns {FlowModel} 复制后的新模型实例
+     */
+    clone<T extends FlowModel = this>(): T;
     /**
      * Opens the flow settings dialog for this flow model.
      * @param options - Configuration options for opening flow settings, excluding the model property

package/lib/models/flowModel.js

@@ -353,7 +353,18 @@ const _FlowModel = class _FlowModel {
       const meta = Cls.meta;
       const metaCreate = meta == null ? void 0 : meta.createModelOptions;
       if (metaCreate && typeof metaCreate === "object" && metaCreate.subModels) {
-        mergedSubModels = import_lodash.default.merge({}, import_lodash.default.cloneDeep(metaCreate.subModels || {}), import_lodash.default.cloneDeep(subModels || {}));
+        const replaceArrays = /* @__PURE__ */ __name((objValue, srcValue) => {
+          if (Array.isArray(objValue) && Array.isArray(srcValue)) {
+            return srcValue;
+          }
+          return void 0;
+        }, "replaceArrays");
+        mergedSubModels = import_lodash.default.mergeWith(
+          {},
+          import_lodash.default.cloneDeep(metaCreate.subModels || {}),
+          import_lodash.default.cloneDeep(subModels || {}),
+          replaceArrays
+        );
       }
     } catch (e) {
     }
@@ -1119,6 +1130,60 @@ const _FlowModel = class _FlowModel {
     }
     return data;
   }
+  /**
+   * 复制当前模型实例为一个新的实例。
+   * 新实例及其所有子模型都会有新的 uid，且不保留 root model 的 parent 关系。
+   * 内部所有引用旧 uid 的地方（如 parentId, parentUid 等）都会被替换为对应的新 uid。
+   * @returns {FlowModel} 复制后的新模型实例
+   */
+  clone() {
+    if (!this.flowEngine) {
+      throw new Error("FlowEngine is not set on this model. Please set flowEngine before cloning.");
+    }
+    const serialized = this.serialize();
+    const uidMap = /* @__PURE__ */ new Map();
+    const collectUids = /* @__PURE__ */ __name((data) => {
+      if (data.uid && typeof data.uid === "string") {
+        uidMap.set(data.uid, (0, import_secure.uid)());
+      }
+      if (data.subModels) {
+        for (const key in data.subModels) {
+          const subModel = data.subModels[key];
+          if (Array.isArray(subModel)) {
+            subModel.forEach((item) => collectUids(item));
+          } else if (subModel && typeof subModel === "object") {
+            collectUids(subModel);
+          }
+        }
+      }
+    }, "collectUids");
+    collectUids(serialized);
+    const replaceUidReferences = /* @__PURE__ */ __name((data, isRoot = false) => {
+      if (data === null || data === void 0) {
+        return data;
+      }
+      if (typeof data === "string") {
+        return uidMap.get(data) ?? data;
+      }
+      if (Array.isArray(data)) {
+        return data.map((item) => replaceUidReferences(item, false));
+      }
+      if (typeof data === "object") {
+        const result = {};
+        for (const key in data) {
+          if (!Object.prototype.hasOwnProperty.call(data, key)) continue;
+          if (isRoot && key === "parentId") {
+            continue;
+          }
+          result[key] = replaceUidReferences(data[key], false);
+        }
+        return result;
+      }
+      return data;
+    }, "replaceUidReferences");
+    const clonedData = replaceUidReferences(serialized, true);
+    return this.flowEngine.createModel(clonedData);
+  }
   /**
    * Opens the flow settings dialog for this flow model.
    * @param options - Configuration options for opening flow settings, excluding the model property

package/lib/provider.js

@@ -79,17 +79,17 @@ const FlowEngineGlobalsContextProvider = /* @__PURE__ */ __name(({ children }) =
       cache: false,
       get: /* @__PURE__ */ __name((ctx) => new import_FlowView.FlowViewer(ctx, { drawer, embed, popover, dialog }), "get")
     });
-    engine.context.defineProperty("themeToken", {
-      get: /* @__PURE__ */ __name(() => token, "get"),
-      observable: true,
-      cache: true
-    });
     for (const item of Object.entries(context)) {
       const [key, value] = item;
       if (value) {
         engine.context.defineProperty(key, { value });
       }
     }
+    engine.context.defineProperty("themeToken", {
+      get: /* @__PURE__ */ __name(() => token, "get"),
+      observable: true,
+      cache: true
+    });
     engine.reactView.refresh();
   }, [engine, drawer, modal, message, notification, config, popover, token, dialog, embed]);
   return /* @__PURE__ */ import_react.default.createElement(import_antd.ConfigProvider, { ...config, locale: (_a = engine.context.locales) == null ? void 0 : _a.antd, popupMatchSelectWidth: false }, children, contextHolder, popoverContextHolder, pageContextHolder, dialogContextHolder);
@@ -97,9 +97,10 @@ const FlowEngineGlobalsContextProvider = /* @__PURE__ */ __name(({ children }) =
 const useFlowEngine = /* @__PURE__ */ __name(({ throwError = true } = {}) => {
   const context = (0, import_react.useContext)(FlowEngineReactContext);
   if (!context && throwError) {
-    throw new Error(
+    console.warn(
       "useFlowEngine must be used within a FlowEngineProvider, and FlowEngineProvider must be supplied with an engine."
     );
+    return;
   }
   return context;
 }, "useFlowEngine");

package/lib/resources/baseRecordResource.d.ts

@@ -30,6 +30,11 @@ export declare abstract class BaseRecordResource<TData = any> extends APIResourc
     runAction<TData = any, TMeta = any>(action: string, options: any): Promise<any>;
     setResourceName(resourceName: string): this;
     getResourceName(): string;
+    /**
+     * Mark current resource as dirty on the root FlowEngine.
+     * Used to coordinate "refresh on active" across view stacks.
+     */
+    protected markDataSourceDirty(resourceName?: string): void;
     setSourceId(sourceId: string | number): this;
     getSourceId(): string | number;
     setDataSourceKey(dataSourceKey: string): this;

package/lib/resources/baseRecordResource.js

@@ -44,6 +44,7 @@ var import_lodash = __toESM(require("lodash"));
 var import_apiResource = require("./apiResource");
 var import_filterItem = require("./filterItem");
 var import_flowResource = require("./flowResource");
+var import_viewEvents = require("../views/viewEvents");
 const _BaseRecordResource = class _BaseRecordResource extends import_apiResource.APIResource {
   resourceName;
   sourceId = null;
@@ -145,6 +146,29 @@ const _BaseRecordResource = class _BaseRecordResource extends import_apiResource
   getResourceName() {
     return this.resourceName;
   }
+  /**
+   * Mark current resource as dirty on the root FlowEngine.
+   * Used to coordinate "refresh on active" across view stacks.
+   */
+  markDataSourceDirty(resourceName) {
+    var _a, _b;
+    const engine = this.context.engine;
+    if (!engine) return;
+    const dataSourceKey = this.getDataSourceKey() || "main";
+    const resName = resourceName || this.getResourceName();
+    if (!resName) return;
+    const affectedResourceNames = /* @__PURE__ */ new Set([String(resName)]);
+    if (typeof resName === "string" && resName.includes(".")) {
+      affectedResourceNames.add(resName.split(".")[0]);
+    }
+    for (const name of affectedResourceNames) {
+      engine.markDataSourceDirty(dataSourceKey, name);
+    }
+    (_b = (_a = engine.emitter) == null ? void 0 : _a.emit) == null ? void 0 : _b.call(_a, import_viewEvents.DATA_SOURCE_DIRTY_EVENT, {
+      dataSourceKey,
+      resourceNames: Array.from(affectedResourceNames)
+    });
+  }
   setSourceId(sourceId) {
     this.sourceId = sourceId;
     return this;

package/lib/resources/multiRecordResource.d.ts

@@ -16,6 +16,7 @@ export declare class MultiRecordResource<TDataItem = any> extends BaseRecordReso
         value: Record<string, any>;
     };
     private refreshTimer;
+    private refreshWaiters;
     protected createActionOptions: {};
     protected updateActionOptions: {};
     protected _refreshActionName: string;

package/lib/resources/multiRecordResource.js

@@ -47,6 +47,7 @@ const _MultiRecordResource = class _MultiRecordResource extends import_baseRecor
   _data = import_reactive.observable.ref([]);
   _meta = import_reactive.observable.ref({});
   refreshTimer = null;
+  refreshWaiters = [];
   createActionOptions = {};
   updateActionOptions = {};
   _refreshActionName = "list";
@@ -130,6 +131,7 @@ const _MultiRecordResource = class _MultiRecordResource extends import_baseRecor
   async create(data, options) {
     const config = this.mergeRequestConfig({ data }, this.createActionOptions, options);
     const res = await this.runAction("create", config);
+    this.markDataSourceDirty();
     this.emit("saved", data);
     if ((options == null ? void 0 : options.refresh) !== false) {
       await this.refresh();
@@ -160,6 +162,7 @@ const _MultiRecordResource = class _MultiRecordResource extends import_baseRecor
       options
     );
     await this.runAction("update", config);
+    this.markDataSourceDirty();
     this.emit("saved", data);
     await this.refresh();
   }
@@ -180,6 +183,7 @@ const _MultiRecordResource = class _MultiRecordResource extends import_baseRecor
       options
     );
     await this.runAction("destroy", config);
+    this.markDataSourceDirty();
     const currentPage = this.getPage();
     const lastPage = Math.ceil((this.getCount() - import_lodash.default.castArray(filterByTk).length) / this.getPageSize());
     if (currentPage > lastPage) {
@@ -202,7 +206,11 @@ const _MultiRecordResource = class _MultiRecordResource extends import_baseRecor
       clearTimeout(this.refreshTimer);
     }
     return new Promise((resolve, reject) => {
+      this.refreshWaiters.push({ resolve, reject });
       this.refreshTimer = setTimeout(async () => {
+        const waiters = this.refreshWaiters;
+        this.refreshWaiters = [];
+        this.refreshTimer = null;
         try {
           this.clearError();
           this.loading = true;
@@ -218,13 +226,12 @@ const _MultiRecordResource = class _MultiRecordResource extends import_baseRecor
             this.setPageSize(meta.pageSize);
           }
           this.emit("refresh");
-          this.loading = false;
-          resolve();
+          waiters.forEach((w) => w.resolve());
         } catch (error) {
           this.setError(error);
-          reject(error instanceof Error ? error : new Error(String(error)));
+          const err = error instanceof Error ? error : new Error(String(error));
+          waiters.forEach((w) => w.reject(err));
         } finally {
-          this.refreshTimer = null;
           this.loading = false;
         }
       });

package/lib/resources/singleRecordResource.js

@@ -70,6 +70,7 @@ const _SingleRecordResource = class _SingleRecordResource extends import_baseRec
       ...config,
       data: result
     });
+    this.markDataSourceDirty();
     this.emit("saved", data);
     if ((options == null ? void 0 : options.refresh) !== false) {
       await this.refresh();
@@ -86,6 +87,7 @@ const _SingleRecordResource = class _SingleRecordResource extends import_baseRec
       options
     );
     await this.runAction("destroy", config);
+    this.markDataSourceDirty();
     this.setData(null);
   }
   async refresh() {

package/lib/resources/sqlResource.d.ts

@@ -35,6 +35,7 @@ export declare class SQLResource<TData = any> extends BaseRecordResource<TData>
         value: Record<string, any>;
     };
     private refreshTimer;
+    private refreshWaiters;
     private _debugEnabled;
     private _sql;
     protected request: {

package/lib/resources/sqlResource.js

@@ -126,6 +126,7 @@ const _SQLResource = class _SQLResource extends import_baseRecordResource.BaseRe
   _data = import_reactive.observable.ref(null);
   _meta = import_reactive.observable.ref({});
   refreshTimer = null;
+  refreshWaiters = [];
   _debugEnabled = false;
   _sql;
   // 请求配置 - 与 APIClient 接口保持一致
@@ -261,7 +262,11 @@ const _SQLResource = class _SQLResource extends import_baseRecordResource.BaseRe
       clearTimeout(this.refreshTimer);
     }
     return new Promise((resolve, reject) => {
+      this.refreshWaiters.push({ resolve, reject });
       this.refreshTimer = setTimeout(async () => {
+        const waiters = this.refreshWaiters;
+        this.refreshWaiters = [];
+        this.refreshTimer = null;
         try {
           this.clearError();
           this.loading = true;
@@ -270,12 +275,12 @@ const _SQLResource = class _SQLResource extends import_baseRecordResource.BaseRe
           this.setData(data).setMeta(meta);
           this.loading = false;
           this.emit("refresh");
-          resolve();
+          waiters.forEach((w) => w.resolve());
         } catch (error) {
           this.setError(error);
-          reject(error instanceof Error ? error : new Error(String(error)));
+          const err = error instanceof Error ? error : new Error(String(error));
+          waiters.forEach((w) => w.reject(err));
         } finally {
-          this.refreshTimer = null;
           this.loading = false;
         }
       });

package/lib/runjs-context/contexts/base.js

@@ -67,14 +67,17 @@ function defineBaseContextMeta() {
       ReactDOM: "ReactDOM client API including createRoot for rendering React components. Also available via `ctx.libs.ReactDOM`.",
       antd: "Ant Design component library. Recommended access path: `ctx.libs.antd`.",
       libs: {
-        description: "Namespace for third-party and shared libraries. Includes React, ReactDOM, Ant Design, and dayjs.",
+        description: "Namespace for third-party and shared libraries. Includes React, ReactDOM, Ant Design, dayjs, lodash, math.js, and formula.js.",
         detail: "Libraries namespace",
         properties: {
           React: "React namespace (same as ctx.React).",
           ReactDOM: "ReactDOM client API (same as ctx.ReactDOM).",
           antd: "Ant Design component library (same as ctx.antd).",
           dayjs: "dayjs date-time utility library.",
-          antdIcons: "Ant Design icons library. Example: `ctx.libs.antdIcons.PlusOutlined`."
+          antdIcons: "Ant Design icons library. Example: `ctx.libs.antdIcons.PlusOutlined`.",
+          lodash: 'Lodash utility library. Example: `ctx.libs.lodash.get(obj, "a.b.c")`.',
+          math: 'Math.js library for mathematical operations. Example: `ctx.libs.math.evaluate("2 + 3 * 4")`.',
+          formula: "Formula.js library for spreadsheet-like formulas. Example: `ctx.libs.formula.SUM([1, 2, 3])`."
         }
       }
     },
@@ -156,14 +159,17 @@ function defineBaseContextMeta() {
         ReactDOM: "ReactDOM \u5BA2\u6237\u7AEF API\uFF0C\u542B createRoot \u7B49\u6E32\u67D3\u65B9\u6CD5\u3002\u63A8\u8350\u901A\u8FC7 `ctx.libs.ReactDOM` \u8BBF\u95EE\u3002",
         antd: "Ant Design \u7EC4\u4EF6\u5E93\uFF08RunJS \u73AF\u5883\u4E2D\u53EF\u7528\uFF09\u3002\u63A8\u8350\u4F7F\u7528 `ctx.libs.antd` \u8BBF\u95EE\u3002",
         libs: {
-          description: "\u7B2C\u4E09\u65B9/\u901A\u7528\u5E93\u7684\u7EDF\u4E00\u547D\u540D\u7A7A\u95F4\uFF0C\u5305\u542B React\u3001ReactDOM\u3001Ant Design\u3001dayjs \u7B49\u3002\u540E\u7EED\u65B0\u589E\u5E93\u4F1A\u4F18\u5148\u6302\u5728\u6B64\u5904\u3002",
+          description: "\u7B2C\u4E09\u65B9/\u901A\u7528\u5E93\u7684\u7EDF\u4E00\u547D\u540D\u7A7A\u95F4\uFF0C\u5305\u542B React\u3001ReactDOM\u3001Ant Design\u3001dayjs\u3001lodash\u3001math.js\u3001formula.js \u7B49\u3002\u540E\u7EED\u65B0\u589E\u5E93\u4F1A\u4F18\u5148\u6302\u5728\u6B64\u5904\u3002",
           detail: "\u901A\u7528\u5E93\u547D\u540D\u7A7A\u95F4",
           properties: {
             React: "React \u547D\u540D\u7A7A\u95F4\uFF08\u7B49\u4EF7\u4E8E ctx.React\uFF09\u3002",
             ReactDOM: "ReactDOM \u5BA2\u6237\u7AEF API\uFF08\u7B49\u4EF7\u4E8E ctx.ReactDOM\uFF09\u3002",
             antd: "Ant Design \u7EC4\u4EF6\u5E93\uFF08\u7B49\u4EF7\u4E8E ctx.antd\uFF09\u3002",
             dayjs: "dayjs \u65E5\u671F\u65F6\u95F4\u5DE5\u5177\u5E93\u3002",
-            antdIcons: "Ant Design \u56FE\u6807\u5E93\u3002 \u4F8B\u5982\uFF1A`ctx.libs.antdIcons.PlusOutlined`\u3002"
+            antdIcons: "Ant Design \u56FE\u6807\u5E93\u3002 \u4F8B\u5982\uFF1A`ctx.libs.antdIcons.PlusOutlined`\u3002",
+            lodash: 'Lodash \u5DE5\u5177\u5E93\u3002\u4F8B\u5982\uFF1A`ctx.libs.lodash.get(obj, "a.b.c")`\u3002',
+            math: 'Math.js \u6570\u5B66\u8FD0\u7B97\u5E93\u3002\u4F8B\u5982\uFF1A`ctx.libs.math.evaluate("2 + 3 * 4")`\u3002',
+            formula: "Formula.js \u7535\u5B50\u8868\u683C\u516C\u5F0F\u5E93\u3002\u4F8B\u5982\uFF1A`ctx.libs.formula.SUM([1, 2, 3])`\u3002"
           }
         }
       },

package/lib/runjsLibs.d.ts

@@ -0,0 +1,28 @@
+/**
+ * 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 type { FlowContext } from './flowContext';
+export type RunJSLibCache = 'global' | 'context';
+export type RunJSLibLoader<T = any> = (ctx: FlowContext) => T | Promise<T>;
+export declare function registerRunJSLib(name: string, loader: RunJSLibLoader, options?: {
+    cache?: RunJSLibCache;
+}): void;
+export declare function setupRunJSLibs(ctx: FlowContext): void;
+export declare function setRunJSLibOverride(ctx: FlowContext, name: string, value: unknown, options?: {
+    topLevelKey?: string | false;
+}): void;
+export declare function externalReactRender(options: {
+    ctx: any;
+    entry: any;
+    vnode: any;
+    containerEl: any;
+    rootMap: WeakMap<any, any>;
+    unmountContainerRoot: () => void;
+    internalReact: any;
+    internalAntd: any;
+}): any;