@nocobase/flow-engine 2.1.0-alpha.1 → 2.1.0-alpha.10

package/lib/flowSettings.js

@@ -62,7 +62,10 @@ var import_flowContext = require("./flowContext");
 var import__ = require(".");
 var import_useFlowSettingsContext = require("./hooks/useFlowSettingsContext");
 var import_utils = require("./utils");
+var import_exceptions = require("./utils/exceptions");
 var import_useFlowStep = require("./hooks/useFlowStep");
+var import_views = require("./views");
+var import_lazy_helper = require("./lazy-helper");
 var _forceEnabled, _emitter;
 const Panel = import_antd.Collapse.Panel;
 const _FlowSettings = class _FlowSettings {
@@ -71,10 +74,12 @@ const _FlowSettings = class _FlowSettings {
     __publicField(this, "scopes", {});
     __publicField(this, "antdComponentsLoaded", false);
     __publicField(this, "enabled");
+    __publicField(this, "engine");
     __privateAdd(this, _forceEnabled, false);
     // 强制启用状态，主要用于设计模式下的强制启用
     __publicField(this, "toolbarItems", []);
     __privateAdd(this, _emitter, new import_emitter.Emitter());
+    this.engine = engine;
     this.enabled = false;
     engine.context.defineProperty("flowSettingsEnabled", {
       get: /* @__PURE__ */ __name(() => this.enabled, "get"),
@@ -213,6 +218,29 @@ const _FlowSettings = class _FlowSettings {
       this.components[name] = components[name];
     });
   }
+  registerComponentLoaders(loaders) {
+    Object.entries(loaders).forEach(([name, loader]) => {
+      if (this.components[name]) {
+        console.warn(`FlowSettings: Component with name '${name}' is already registered and will be overwritten.`);
+      }
+      this.components[name] = (0, import_lazy_helper.lazy)(async () => {
+        const loaded = await loader();
+        if (typeof loaded === "function") {
+          return { default: loaded };
+        }
+        if ((loaded == null ? void 0 : loaded.default) && typeof loaded.default === "function") {
+          return { default: loaded.default };
+        }
+        const namedComponent = loaded == null ? void 0 : loaded[name];
+        if (typeof namedComponent === "function") {
+          return { default: namedComponent };
+        }
+        throw new Error(
+          `FlowSettings: component loader for '${name}' must resolve to a React component or a module exporting it.`
+        );
+      });
+    });
+  }
   /**
    * 添加作用域到 FlowSettings 的作用域注册表中。
    * 这些作用域可以在 flow step 的 uiSchema 中使用。
@@ -232,27 +260,29 @@ const _FlowSettings = class _FlowSettings {
   /**
    * 启用流程设置组件的显示
    * @example
-   * flowSettings.enable();
+   * await flowSettings.enable();
    */
-  enable() {
+  async enable() {
+    await this.engine.preloadModelLoaders();
     this.enabled = true;
   }
-  forceEnable() {
+  async forceEnable() {
+    await this.engine.preloadModelLoaders();
     __privateSet(this, _forceEnabled, true);
     this.enabled = true;
   }
   /**
    * 禁用流程设置组件的显示
    * @example
-   * flowSettings.disable();
+   * await flowSettings.disable();
    */
-  disable() {
+  async disable() {
     if (__privateGet(this, _forceEnabled)) {
       return;
     }
     this.enabled = false;
   }
-  forceDisable() {
+  async forceDisable() {
     __privateSet(this, _forceEnabled, false);
     this.enabled = false;
   }
@@ -536,12 +566,9 @@ const _FlowSettings = class _FlowSettings {
     };
     let modeProps = typeof resolvedUiMode === "object" && resolvedUiMode ? resolvedUiMode.props || {} : {};
     if (modeType === "embed") {
-      const target = document.querySelector("#nocobase-embed-container");
+      const target = document.querySelector(`#${import_views.GLOBAL_EMBED_CONTAINER_ID}`);
       const onOpen = modeProps.onOpen;
       const onClose = modeProps.onClose;
-      if (target) {
-        target.innerHTML = "";
-      }
       modeProps = {
         target,
         styles: {
@@ -551,15 +578,19 @@ const _FlowSettings = class _FlowSettings {
         },
         ...modeProps,
         onOpen() {
-          target.style.width = modeProps.width || "33.3%";
-          target.style.maxWidth = modeProps.maxWidth || "800px";
-          target.style.minWidth = modeProps.minWidth || "0px";
+          if (target) {
+            target.style.width = modeProps.width || "33.3%";
+            target.style.maxWidth = modeProps.maxWidth || "800px";
+            target.style.minWidth = modeProps.minWidth || "0px";
+          }
           onOpen == null ? void 0 : onOpen();
         },
         onClose() {
-          target.style.width = "auto";
-          target.style.maxWidth = "none";
-          target.style.minWidth = "auto";
+          if (target && target.dataset[import_views.EMBED_REPLACING_DATA_KEY] !== "1") {
+            target.style.width = "auto";
+            target.style.maxWidth = "none";
+            target.style.minWidth = "auto";
+          }
           onClose == null ? void 0 : onClose();
         }
       };
@@ -711,7 +742,10 @@ const _FlowSettings = class _FlowSettings {
               console.error("FlowSettings.open: onSaved callback error", cbErr);
             }
           } catch (err) {
-            if (err instanceof import_utils.FlowExitException) {
+            if (err instanceof import_utils.FlowCancelSaveException) {
+              return;
+            }
+            if (err instanceof import_utils.FlowExitException || err instanceof import_exceptions.FlowExitAllException) {
               currentView.close();
               return;
             }

package/lib/index.d.ts

@@ -9,6 +9,8 @@
 export * from './types';
 export * from './utils';
 export { compileRunJs } from './utils/jsxTransform';
+export { registerRunJSLib } from './runjsLibs';
+export type { RunJSLibCache, RunJSLibLoader } from './runjsLibs';
 export * from './resources';
 export * from './flowEngine';
 export * from './hooks';
@@ -25,8 +27,12 @@ export * from './JSRunner';
 export { getRunJSDocFor, createJSRunnerWithVersion, getRunJSScenesForModel, getRunJSScenesForContext, } from './runjs-context/helpers';
 export { RunJSContextRegistry, getModelClassName } from './runjs-context/registry';
 export { setupRunJSContexts } from './runjs-context/setup';
-export { getSnippetBody, listSnippetsForContext } from './runjs-context/snippets';
+export type { RunJSContextContribution, RunJSContextContributionApi } from './runjs-context/contributions';
+export { registerRunJSContextContribution } from './runjs-context/contributions';
+export type { RunJSSnippetLoader } from './runjs-context/snippets';
+export { getSnippetBody, listSnippetsForContext, registerRunJSSnippet } from './runjs-context/snippets';
 export * from './views';
+export { DATA_SOURCE_DIRTY_EVENT, ENGINE_SCOPE_KEY, getEmitterViewActivatedVersion, VIEW_ACTIVATED_EVENT, VIEW_ACTIVATED_VERSION, VIEW_ENGINE_SCOPE, } from './views/viewEvents';
 export * from './FlowDefinition';
 export { createViewScopedEngine } from './ViewScopedFlowEngine';
 export { createBlockScopedEngine } from './BlockScopedFlowEngine';

package/lib/index.js

@@ -27,23 +27,33 @@ var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "defau
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var src_exports = {};
 __export(src_exports, {
+  DATA_SOURCE_DIRTY_EVENT: () => import_viewEvents.DATA_SOURCE_DIRTY_EVENT,
+  ENGINE_SCOPE_KEY: () => import_viewEvents.ENGINE_SCOPE_KEY,
   RunJSContextRegistry: () => import_registry.RunJSContextRegistry,
+  VIEW_ACTIVATED_EVENT: () => import_viewEvents.VIEW_ACTIVATED_EVENT,
+  VIEW_ACTIVATED_VERSION: () => import_viewEvents.VIEW_ACTIVATED_VERSION,
+  VIEW_ENGINE_SCOPE: () => import_viewEvents.VIEW_ENGINE_SCOPE,
   compileRunJs: () => import_jsxTransform.compileRunJs,
   createBlockScopedEngine: () => import_BlockScopedFlowEngine.createBlockScopedEngine,
   createJSRunnerWithVersion: () => import_helpers.createJSRunnerWithVersion,
   createViewScopedEngine: () => import_ViewScopedFlowEngine.createViewScopedEngine,
+  getEmitterViewActivatedVersion: () => import_viewEvents.getEmitterViewActivatedVersion,
   getModelClassName: () => import_registry.getModelClassName,
   getRunJSDocFor: () => import_helpers.getRunJSDocFor,
   getRunJSScenesForContext: () => import_helpers.getRunJSScenesForContext,
   getRunJSScenesForModel: () => import_helpers.getRunJSScenesForModel,
   getSnippetBody: () => import_snippets.getSnippetBody,
   listSnippetsForContext: () => import_snippets.listSnippetsForContext,
+  registerRunJSContextContribution: () => import_contributions.registerRunJSContextContribution,
+  registerRunJSLib: () => import_runjsLibs.registerRunJSLib,
+  registerRunJSSnippet: () => import_snippets.registerRunJSSnippet,
   setupRunJSContexts: () => import_setup.setupRunJSContexts
 });
 module.exports = __toCommonJS(src_exports);
 __reExport(src_exports, require("./types"), module.exports);
 __reExport(src_exports, require("./utils"), module.exports);
 var import_jsxTransform = require("./utils/jsxTransform");
+var import_runjsLibs = require("./runjsLibs");
 __reExport(src_exports, require("./resources"), module.exports);
 __reExport(src_exports, require("./flowEngine"), module.exports);
 __reExport(src_exports, require("./hooks"), module.exports);
@@ -60,24 +70,35 @@ __reExport(src_exports, require("./JSRunner"), module.exports);
 var import_helpers = require("./runjs-context/helpers");
 var import_registry = require("./runjs-context/registry");
 var import_setup = require("./runjs-context/setup");
+var import_contributions = require("./runjs-context/contributions");
 var import_snippets = require("./runjs-context/snippets");
 __reExport(src_exports, require("./views"), module.exports);
+var import_viewEvents = require("./views/viewEvents");
 __reExport(src_exports, require("./FlowDefinition"), module.exports);
 var import_ViewScopedFlowEngine = require("./ViewScopedFlowEngine");
 var import_BlockScopedFlowEngine = require("./BlockScopedFlowEngine");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  DATA_SOURCE_DIRTY_EVENT,
+  ENGINE_SCOPE_KEY,
   RunJSContextRegistry,
+  VIEW_ACTIVATED_EVENT,
+  VIEW_ACTIVATED_VERSION,
+  VIEW_ENGINE_SCOPE,
   compileRunJs,
   createBlockScopedEngine,
   createJSRunnerWithVersion,
   createViewScopedEngine,
+  getEmitterViewActivatedVersion,
   getModelClassName,
   getRunJSDocFor,
   getRunJSScenesForContext,
   getRunJSScenesForModel,
   getSnippetBody,
   listSnippetsForContext,
+  registerRunJSContextContribution,
+  registerRunJSLib,
+  registerRunJSSnippet,
   setupRunJSContexts,
   ...require("./types"),
   ...require("./utils"),

package/lib/lazy-helper.d.ts

@@ -0,0 +1,14 @@
+/**
+ * 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 LazyComponentType<M extends Record<string, any>, K extends keyof M> = {
+    [P in K]: M[P];
+};
+export declare function lazy<M extends Record<'default', any>>(factory: () => Promise<M>): M['default'];
+export declare function lazy<M extends Record<string, any>, K extends keyof M = keyof M>(factory: () => Promise<M>, ...componentNames: K[]): LazyComponentType<M, K>;
+export {};

package/lib/lazy-helper.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 __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 __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 __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 lazy_helper_exports = {};
+__export(lazy_helper_exports, {
+  lazy: () => lazy
+});
+module.exports = __toCommonJS(lazy_helper_exports);
+var import_react = __toESM(require("react"));
+function lazy(factory, ...componentNames) {
+  if (componentNames.length === 0) {
+    const LazyComponent = (0, import_react.lazy)(
+      () => factory().then((module2) => ({
+        default: module2.default
+      }))
+    );
+    const Component = /* @__PURE__ */ __name((props) => /* @__PURE__ */ import_react.default.createElement(import_react.default.Suspense, { fallback: null }, /* @__PURE__ */ import_react.default.createElement(LazyComponent, { ...props })), "Component");
+    return Component;
+  }
+  return componentNames.reduce(
+    (acc, name) => {
+      const LazyComponent = (0, import_react.lazy)(
+        () => factory().then((module2) => ({
+          default: module2[name]
+        }))
+      );
+      acc[name] = (props) => /* @__PURE__ */ import_react.default.createElement(import_react.default.Suspense, { fallback: null }, /* @__PURE__ */ import_react.default.createElement(LazyComponent, { ...props }));
+      return acc;
+    },
+    {}
+  );
+}
+__name(lazy, "lazy");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  lazy
+});

package/lib/locale/en-US.json

@@ -62,6 +62,7 @@
   "This is likely a NocoBase internals bug. Please open an issue at": "This is likely a NocoBase internals bug. Please open an issue at",
   "This step has no configurable parameters": "This step has no configurable parameters",
   "This variable is not available": "This variable is not available",
+  "Use return to output value": "Use return to output value",
   "Try again": "Try again",
   "Template created": "Template created",
   "Template description": "Template description",
@@ -69,5 +70,11 @@
   "Template name is required": "Template name is required",
   "UID copied to clipboard": "UID copied to clipboard",
   "createModelOptions must specify use property": "createModelOptions must specify \"use\" property",
-  "here": "here"
-}
+  "here": "here",
+  "RunJS deprecated warning": "[RunJS][Deprecated] {{api}} is deprecated{{location}}",
+  "RunJS deprecated warning with message": "[RunJS][Deprecated] {{api}} {{message}}{{location}}",
+  "RunJS deprecated separator": "; ",
+  "RunJS deprecated replacedBy": "Use {{replacedBy}} instead",
+  "RunJS deprecated since": "since {{since}}",
+  "RunJS deprecated removedIn": "will be removed in {{removedIn}}"
+}

package/lib/locale/index.d.ts

@@ -71,6 +71,7 @@ export declare const locales: {
         "This is likely a NocoBase internals bug. Please open an issue at": string;
         "This step has no configurable parameters": string;
         "This variable is not available": string;
+        "Use return to output value": string;
         "Try again": string;
         "Template created": string;
         "Template description": string;
@@ -79,6 +80,12 @@ export declare const locales: {
         "UID copied to clipboard": string;
         "createModelOptions must specify use property": string;
         here: string;
+        "RunJS deprecated warning": string;
+        "RunJS deprecated warning with message": string;
+        "RunJS deprecated separator": string;
+        "RunJS deprecated replacedBy": string;
+        "RunJS deprecated since": string;
+        "RunJS deprecated removedIn": string;
     };
     'zh-CN': {
         Add: string;
@@ -148,10 +155,17 @@ export declare const locales: {
         "This is likely a NocoBase internals bug. Please open an issue at": string;
         "This step has no configurable parameters": string;
         "This variable is not available": string;
+        "Use return to output value": string;
         "Try again": string;
         "UID copied to clipboard": string;
         "createModelOptions must specify use property": string;
         here: string;
+        "RunJS deprecated warning": string;
+        "RunJS deprecated warning with message": string;
+        "RunJS deprecated separator": string;
+        "RunJS deprecated replacedBy": string;
+        "RunJS deprecated since": string;
+        "RunJS deprecated removedIn": string;
     };
 };
 /**

package/lib/locale/zh-CN.json

@@ -66,8 +66,15 @@
   "This is likely a NocoBase internals bug. Please open an issue at": "这可能是 NocoBase 内部错误。请在以下地址提交问题",
   "This step has no configurable parameters": "此步骤没有可配置的参数",
   "This variable is not available": "此变量不可用",
+  "Use return to output value": "使用 return 返回最终值",
   "Try again": "重试",
   "UID copied to clipboard": "UID 已复制到剪贴板",
   "createModelOptions must specify use property": "createModelOptions 必须指定 \"use\" 属性",
-  "here": "这里"
+  "here": "这里",
+  "RunJS deprecated warning": "[RunJS][已废弃] {{api}}{{location}}",
+  "RunJS deprecated warning with message": "[RunJS][已废弃] {{api}} {{message}}{{location}}",
+  "RunJS deprecated separator": "；",
+  "RunJS deprecated replacedBy": "建议使用：{{replacedBy}}",
+  "RunJS deprecated since": "自 {{since}} 起",
+  "RunJS deprecated removedIn": "将在 {{removedIn}} 移除"
 }

package/lib/models/CollectionFieldModel.d.ts

@@ -45,6 +45,7 @@ export declare class CollectionFieldModel<T extends DefaultStructure = DefaultSt
     }): BindingOptions | null;
     static bindModelToInterface(modelName: string, interfaceName: string | string[], options?: {
         isDefault?: boolean;
+        order?: number;
         defaultProps?: object | ((ctx: FlowEngineContext, fieldInstance: CollectionField) => object);
         when?: (ctx: FlowEngineContext, fieldInstance: CollectionField) => boolean;
     }): void;

package/lib/models/CollectionFieldModel.js

@@ -182,7 +182,7 @@ const _CollectionFieldModel = class _CollectionFieldModel extends import_flowMod
     if (!this.bindings.has(interfaceName)) {
       return [];
     }
-    const bindings = this.bindings.get(interfaceName);
+    const bindings = this.bindings.get(interfaceName).sort((a, b) => a.order - b.order);
     return bindings.filter(
       (binding) => ctx.engine.getModelClass(binding.modelName) && binding.when(ctx, collectionField)
     );
@@ -245,7 +245,8 @@ const _CollectionFieldModel = class _CollectionFieldModel extends import_flowMod
       modelName,
       isDefault: options.isDefault || false,
       defaultProps: options.defaultProps || null,
-      when: options.when || defaultWhen
+      when: options.when || defaultWhen,
+      order: options.order
     });
     this.currentBindings.set(interfaceName, bindings);
   }

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

@@ -56,13 +56,11 @@ var import_reactive = require("@formily/reactive");
 var import_lodash = __toESM(require("lodash"));
 var import_react = __toESM(require("react"));
 var import_secure = require("uid/secure");
-var import_StepRequiredSettingsDialog = require("../components/settings/wrappers/contextual/StepRequiredSettingsDialog");
-var import_StepSettingsDialog = require("../components/settings/wrappers/contextual/StepSettingsDialog");
 var import_emitter = require("../emitter");
 var import_InstanceFlowRegistry = require("../flow-registry/InstanceFlowRegistry");
 var import_flowContext = require("../flowContext");
 var import_utils = require("../utils");
-var import_lib = require("antd/lib");
+var import_antd = require("antd");
 var import_ModelActionRegistry = require("../action-registry/ModelActionRegistry");
 var import_utils2 = require("../components/subModel/utils");
 var import_ModelEventRegistry = require("../event-registry/ModelEventRegistry");
@@ -75,6 +73,16 @@ const classEventRegistries = /* @__PURE__ */ new WeakMap();
 const modelMetas = /* @__PURE__ */ new WeakMap();
 const modelGlobalRegistries = /* @__PURE__ */ new WeakMap();
 const classMenuExtensions = /* @__PURE__ */ new WeakMap();
+async function loadOpenStepSettingsDialog() {
+  const mod = await import("../components/settings/wrappers/contextual/StepSettingsDialog");
+  return mod.openStepSettingsDialog;
+}
+__name(loadOpenStepSettingsDialog, "loadOpenStepSettingsDialog");
+async function loadOpenRequiredParamsStepFormDialog() {
+  const mod = await import("../components/settings/wrappers/contextual/StepRequiredSettingsDialog");
+  return mod.openRequiredParamsStepFormDialog;
+}
+__name(loadOpenRequiredParamsStepFormDialog, "loadOpenRequiredParamsStepFormDialog");
 var ModelRenderMode = /* @__PURE__ */ ((ModelRenderMode2) => {
   ModelRenderMode2["ReactElement"] = "reactElement";
   ModelRenderMode2["RenderFunction"] = "renderFunction";
@@ -353,7 +361,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) {
     }
@@ -1047,7 +1066,7 @@ const _FlowModel = class _FlowModel {
    * @param {string} stepKey 步骤的唯一标识符
    * @returns {void}
    */
-  openStepSettingsDialog(flowKey, stepKey) {
+  async openStepSettingsDialog(flowKey, stepKey) {
     var _a;
     const flow = this.getFlow(flowKey);
     const step = (_a = flow == null ? void 0 : flow.steps) == null ? void 0 : _a[stepKey];
@@ -1058,7 +1077,8 @@ const _FlowModel = class _FlowModel {
     const ctx = new import_flowContext.FlowRuntimeContext(this, flowKey, "settings");
     (0, import_utils.setupRuntimeContextSteps)(ctx, flow.steps, this, flowKey);
     ctx.defineProperty("currentStep", { value: step });
-    return (0, import_StepSettingsDialog.openStepSettingsDialog)({
+    const openStepSettingsDialog = await loadOpenStepSettingsDialog();
+    return openStepSettingsDialog({
       model: this,
       flowKey,
       stepKey,
@@ -1073,7 +1093,8 @@ const _FlowModel = class _FlowModel {
    * @returns {Promise<any>} 返回表单提交的值
    */
   async configureRequiredSteps(dialogWidth, dialogTitle) {
-    return (0, import_StepRequiredSettingsDialog.openRequiredParamsStepFormDialog)({
+    const openRequiredParamsStepFormDialog = await loadOpenRequiredParamsStepFormDialog();
+    return openRequiredParamsStepFormDialog({
       model: this,
       dialogWidth,
       dialogTitle
@@ -1119,6 +1140,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
@@ -1238,7 +1313,7 @@ const _ErrorFlowModel = class _ErrorFlowModel extends FlowModel {
     this.errorMessage = msg;
   }
   render() {
-    return /* @__PURE__ */ import_react.default.createElement(import_lib.Typography.Text, { type: "danger" }, this.errorMessage);
+    return /* @__PURE__ */ import_react.default.createElement(import_antd.Typography.Text, { type: "danger" }, this.errorMessage);
   }
 };
 __name(_ErrorFlowModel, "ErrorFlowModel");

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;