@nocobase/flow-engine 2.0.0-beta.15 → 2.0.0-beta.16

package/lib/BlockScopedFlowEngine.js

@@ -37,7 +37,6 @@ function createBlockScopedEngine(parent) {
     local.setModelRepository(parent.modelRepository);
   }
   local.context.addDelegate(parent.context);
-  const originalUnlink = local.unlinkFromStack.bind(local);
   local.unlinkFromStack = function() {
     const prev = local._previousEngine;
     const next = local._nextEngine;

package/lib/ViewScopedFlowEngine.js

@@ -31,8 +31,10 @@ __export(ViewScopedFlowEngine_exports, {
 });
 module.exports = __toCommonJS(ViewScopedFlowEngine_exports);
 var import_flowEngine = require("./flowEngine");
+var import_viewEvents = require("./views/viewEvents");
 function createViewScopedEngine(parent) {
   const local = new import_flowEngine.FlowEngine();
+  Object.defineProperty(local, import_viewEvents.ENGINE_SCOPE_KEY, { value: import_viewEvents.VIEW_ENGINE_SCOPE, configurable: true });
   if (parent.modelRepository) {
     local.setModelRepository(parent.modelRepository);
   }
@@ -48,6 +50,7 @@ function createViewScopedEngine(parent) {
     "_applyFlowCache",
     "executor",
     "context",
+    import_viewEvents.ENGINE_SCOPE_KEY,
     "previousEngine",
     "nextEngine",
     // 调度器与事件总线局部化

package/lib/data-source/index.js

@@ -400,6 +400,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() {

package/lib/flowEngine.d.ts

@@ -84,6 +84,17 @@ export declare class FlowEngine {
     private _previousEngine?;
     private _nextEngine?;
     private _resources;
+    /**
+     * Data change registry used to coordinate "refresh on active" across view-scoped engines.
+     *
+     * Keyed by: dataSourceKey -> resourceName -> version.
+     * - mark: increments version
+     * - get: returns current version (default 0)
+     *
+     * NOTE: ViewScopedFlowEngine proxies delegate non-local fields/methods to parents, so this
+     * registry naturally lives on the root engine instance and is shared across the whole view stack.
+     */
+    private _dataSourceDirtyVersions;
     /**
      * 引擎事件总线（目前用于模型生命周期等事件）。
      * ViewScopedFlowEngine 持有自己的实例，实现作用域隔离。
@@ -116,6 +127,16 @@ export declare class FlowEngine {
     getScheduler(): ModelOperationScheduler;
     /** 释放并清理当前引擎本地调度器（若存在） */
     disposeScheduler(): void;
+    /**
+     * Mark a data source resource as "dirty" (changed).
+     * This is used by data blocks to decide whether to refresh when a view becomes active.
+     */
+    markDataSourceDirty(dataSourceKey: string, resourceName: string): number;
+    /**
+     * Get current dirty version for a data source resource.
+     * Returns 0 when no writes have been recorded.
+     */
+    getDataSourceDirtyVersion(dataSourceKey: string, resourceName: string): number;
     /** 在目标模型生命周期达成时执行操作（仅在 View 引擎本地存储计划） */
     scheduleModelOperation(fromModelOrUid: FlowModel | string, toUid: string, fn: (model: FlowModel) => Promise<void> | void, options?: ScheduleOptions): ScheduledCancel;
     /** 上一个引擎（根引擎为 undefined） */

package/lib/flowEngine.js

@@ -120,6 +120,17 @@ const _FlowEngine = class _FlowEngine {
     __publicField(this, "_previousEngine");
     __publicField(this, "_nextEngine");
     __publicField(this, "_resources", /* @__PURE__ */ new Map());
+    /**
+     * Data change registry used to coordinate "refresh on active" across view-scoped engines.
+     *
+     * Keyed by: dataSourceKey -> resourceName -> version.
+     * - mark: increments version
+     * - get: returns current version (default 0)
+     *
+     * NOTE: ViewScopedFlowEngine proxies delegate non-local fields/methods to parents, so this
+     * registry naturally lives on the root engine instance and is shared across the whole view stack.
+     */
+    __publicField(this, "_dataSourceDirtyVersions", /* @__PURE__ */ new Map());
     /**
      * 引擎事件总线（目前用于模型生命周期等事件）。
      * ViewScopedFlowEngine 持有自己的实例，实现作用域隔离。
@@ -187,6 +198,33 @@ const _FlowEngine = class _FlowEngine {
       }
     }
   }
+  /**
+   * Mark a data source resource as "dirty" (changed).
+   * This is used by data blocks to decide whether to refresh when a view becomes active.
+   */
+  markDataSourceDirty(dataSourceKey, resourceName) {
+    const dsKey = String(dataSourceKey || "main");
+    const resName = String(resourceName || "");
+    if (!resName) return this.getDataSourceDirtyVersion(dsKey, resName);
+    const ds = this._dataSourceDirtyVersions.get(dsKey) || /* @__PURE__ */ new Map();
+    if (!this._dataSourceDirtyVersions.has(dsKey)) {
+      this._dataSourceDirtyVersions.set(dsKey, ds);
+    }
+    const next = (ds.get(resName) || 0) + 1;
+    ds.set(resName, next);
+    return next;
+  }
+  /**
+   * Get current dirty version for a data source resource.
+   * Returns 0 when no writes have been recorded.
+   */
+  getDataSourceDirtyVersion(dataSourceKey, resourceName) {
+    var _a;
+    const dsKey = String(dataSourceKey || "main");
+    const resName = String(resourceName || "");
+    if (!resName) return 0;
+    return ((_a = this._dataSourceDirtyVersions.get(dsKey)) == null ? void 0 : _a.get(resName)) || 0;
+  }
   /** 在目标模型生命周期达成时执行操作（仅在 View 引擎本地存储计划） */
   scheduleModelOperation(fromModelOrUid, toUid, fn, options) {
     return this.getScheduler().schedule(fromModelOrUid, toUid, fn, options);

package/lib/index.d.ts

@@ -29,6 +29,7 @@ export { RunJSContextRegistry, getModelClassName } from './runjs-context/registr
 export { setupRunJSContexts } from './runjs-context/setup';
 export { getSnippetBody, listSnippetsForContext } 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,11 +27,17 @@ 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,
@@ -64,16 +70,23 @@ var import_registry = require("./runjs-context/registry");
 var import_setup = require("./runjs-context/setup");
 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,

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/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/views/useDialog.js

@@ -48,6 +48,7 @@ var import_FlowContextProvider = require("../FlowContextProvider");
 var import_createViewMeta = require("./createViewMeta");
 var import_DialogComponent = __toESM(require("./DialogComponent"));
 var import_usePatchElement = __toESM(require("./usePatchElement"));
+var import_viewEvents = require("./viewEvents");
 var import_provider = require("../provider");
 var import_ViewScopedFlowEngine = require("../ViewScopedFlowEngine");
 var import_variablesParams = require("../utils/variablesParams");
@@ -56,6 +57,7 @@ function useDialog() {
   const holderRef = React.useRef(null);
   const open = /* @__PURE__ */ __name((config, flowContext) => {
     var _a, _b, _c;
+    const parentEngine = flowContext == null ? void 0 : flowContext.engine;
     uuid += 1;
     const dialogRef = React.createRef();
     let closeFunc;
@@ -93,6 +95,7 @@ function useDialog() {
     }, "HeaderComponent");
     const ctx = new import_flowContext.FlowContext();
     const scopedEngine = (0, import_ViewScopedFlowEngine.createViewScopedEngine)(flowContext.engine);
+    const openerEngine = (0, import_viewEvents.resolveOpenerEngine)(parentEngine, scopedEngine);
     ctx.defineProperty("engine", { value: scopedEngine });
     ctx.addDelegate(scopedEngine.context);
     if (config.inheritContext !== false) {
@@ -105,11 +108,14 @@ function useDialog() {
       inputArgs: config.inputArgs || {},
       preventClose: !!config.preventClose,
       destroy: /* @__PURE__ */ __name((result) => {
-        var _a2, _b2;
+        var _a2, _b2, _c2, _d;
         (_a2 = config.onClose) == null ? void 0 : _a2.call(config);
         (_b2 = dialogRef.current) == null ? void 0 : _b2.destroy();
         closeFunc == null ? void 0 : closeFunc();
         resolvePromise == null ? void 0 : resolvePromise(result);
+        const openerEmitter = openerEngine == null ? void 0 : openerEngine.emitter;
+        (0, import_viewEvents.bumpViewActivatedVersion)(openerEmitter);
+        (_d = openerEmitter == null ? void 0 : openerEmitter.emit) == null ? void 0 : _d.call(openerEmitter, import_viewEvents.VIEW_ACTIVATED_EVENT, { type: "dialog", viewUid: (_c2 = currentDialog == null ? void 0 : currentDialog.inputArgs) == null ? void 0 : _c2.viewUid });
         scopedEngine.unlinkFromStack();
       }, "destroy"),
       update: /* @__PURE__ */ __name((newConfig) => {

package/lib/views/useDrawer.js

@@ -48,6 +48,7 @@ var import_FlowContextProvider = require("../FlowContextProvider");
 var import_createViewMeta = require("./createViewMeta");
 var import_DrawerComponent = __toESM(require("./DrawerComponent"));
 var import_usePatchElement = __toESM(require("./usePatchElement"));
+var import_viewEvents = require("./viewEvents");
 var import_provider = require("../provider");
 var import_ViewScopedFlowEngine = require("../ViewScopedFlowEngine");
 var import_variablesParams = require("../utils/variablesParams");
@@ -76,6 +77,7 @@ function useDrawer() {
   RenderNestedDrawer.displayName = "RenderNestedDrawer";
   const open = /* @__PURE__ */ __name((config, flowContext) => {
     var _a, _b;
+    const parentEngine = flowContext.engine;
     const drawerRef = React.createRef();
     let closeFunc;
     let resolvePromise;
@@ -112,6 +114,7 @@ function useDrawer() {
     }, "HeaderComponent");
     const ctx = new import_flowContext.FlowContext();
     const scopedEngine = (0, import_ViewScopedFlowEngine.createViewScopedEngine)(flowContext.engine);
+    const openerEngine = (0, import_viewEvents.resolveOpenerEngine)(parentEngine, scopedEngine);
     ctx.defineProperty("engine", { value: scopedEngine });
     ctx.addDelegate(scopedEngine.context);
     if (config.inheritContext !== false) {
@@ -124,11 +127,14 @@ function useDrawer() {
       inputArgs: config.inputArgs || {},
       preventClose: !!config.preventClose,
       destroy: /* @__PURE__ */ __name((result) => {
-        var _a2, _b2;
+        var _a2, _b2, _c, _d;
         (_a2 = config.onClose) == null ? void 0 : _a2.call(config);
         (_b2 = drawerRef.current) == null ? void 0 : _b2.destroy();
         closeFunc == null ? void 0 : closeFunc();
         resolvePromise == null ? void 0 : resolvePromise(result);
+        const openerEmitter = openerEngine == null ? void 0 : openerEngine.emitter;
+        (0, import_viewEvents.bumpViewActivatedVersion)(openerEmitter);
+        (_d = openerEmitter == null ? void 0 : openerEmitter.emit) == null ? void 0 : _d.call(openerEmitter, import_viewEvents.VIEW_ACTIVATED_EVENT, { type: "drawer", viewUid: (_c = currentDrawer == null ? void 0 : currentDrawer.inputArgs) == null ? void 0 : _c.viewUid });
         scopedEngine.unlinkFromStack();
       }, "destroy"),
       update: /* @__PURE__ */ __name((newConfig) => {

package/lib/views/usePage.js

@@ -50,6 +50,7 @@ var import_FlowContextProvider = require("../FlowContextProvider");
 var import_createViewMeta = require("./createViewMeta");
 var import_PageComponent = require("./PageComponent");
 var import_usePatchElement = __toESM(require("./usePatchElement"));
+var import_viewEvents = require("./viewEvents");
 var import_provider = require("../provider");
 var import_ViewScopedFlowEngine = require("../ViewScopedFlowEngine");
 var import_variablesParams = require("../utils/variablesParams");
@@ -68,6 +69,7 @@ function usePage() {
   const globalEmbedActiveRef = import_react.default.useRef(null);
   const open = /* @__PURE__ */ __name((config, flowContext) => {
     var _a, _b, _c;
+    const parentEngine = flowContext == null ? void 0 : flowContext.engine;
     uuid += 1;
     const pageRef = import_react.default.createRef();
     let closeFunc;
@@ -117,6 +119,7 @@ function usePage() {
     }
     const ctx = new import_flowContext.FlowContext();
     const scopedEngine = (0, import_ViewScopedFlowEngine.createViewScopedEngine)(flowContext.engine);
+    const openerEngine = (0, import_viewEvents.resolveOpenerEngine)(parentEngine, scopedEngine);
     ctx.defineProperty("engine", { value: scopedEngine });
     ctx.addDelegate(scopedEngine.context);
     if (inheritContext) {
@@ -129,7 +132,7 @@ function usePage() {
       inputArgs: viewInputArgs,
       preventClose: !!config.preventClose,
       destroy: /* @__PURE__ */ __name((result) => {
-        var _a2, _b2;
+        var _a2, _b2, _c2, _d, _e;
         (_a2 = config.onClose) == null ? void 0 : _a2.call(config);
         resolvePromise == null ? void 0 : resolvePromise(result);
         (_b2 = pageRef.current) == null ? void 0 : _b2.destroy();
@@ -137,6 +140,12 @@ function usePage() {
         if (isGlobalEmbedContainer) {
           globalEmbedActiveRef.current = null;
         }
+        const isReplacing = isGlobalEmbedContainer && target instanceof HTMLElement && ((_c2 = target.dataset) == null ? void 0 : _c2[EMBED_REPLACING_DATA_KEY]) === "1";
+        if (!isReplacing) {
+          const openerEmitter = openerEngine == null ? void 0 : openerEngine.emitter;
+          (0, import_viewEvents.bumpViewActivatedVersion)(openerEmitter);
+          (_e = openerEmitter == null ? void 0 : openerEmitter.emit) == null ? void 0 : _e.call(openerEmitter, import_viewEvents.VIEW_ACTIVATED_EVENT, { type: "embed", viewUid: (_d = currentPage == null ? void 0 : currentPage.inputArgs) == null ? void 0 : _d.viewUid });
+        }
         scopedEngine.unlinkFromStack();
       }, "destroy"),
       update: /* @__PURE__ */ __name((newConfig) => {

package/lib/views/viewEvents.d.ts

@@ -0,0 +1,17 @@
+/**
+ * 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 { FlowEngine } from '../flowEngine';
+export declare const VIEW_ACTIVATED_VERSION: unique symbol;
+export declare const VIEW_ACTIVATED_EVENT: "view:activated";
+export declare const DATA_SOURCE_DIRTY_EVENT: "dataSource:dirty";
+export declare const ENGINE_SCOPE_KEY: "__NOCOBASE_ENGINE_SCOPE__";
+export declare const VIEW_ENGINE_SCOPE: "view";
+export declare function getEmitterViewActivatedVersion(emitter: any): number;
+export declare function bumpViewActivatedVersion(emitter: any): number;
+export declare function resolveOpenerEngine(parentEngine: FlowEngine, scopedEngine: FlowEngine): FlowEngine | undefined;

package/lib/views/viewEvents.js

@@ -0,0 +1,88 @@
+/**
+ * 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 viewEvents_exports = {};
+__export(viewEvents_exports, {
+  DATA_SOURCE_DIRTY_EVENT: () => DATA_SOURCE_DIRTY_EVENT,
+  ENGINE_SCOPE_KEY: () => ENGINE_SCOPE_KEY,
+  VIEW_ACTIVATED_EVENT: () => VIEW_ACTIVATED_EVENT,
+  VIEW_ACTIVATED_VERSION: () => VIEW_ACTIVATED_VERSION,
+  VIEW_ENGINE_SCOPE: () => VIEW_ENGINE_SCOPE,
+  bumpViewActivatedVersion: () => bumpViewActivatedVersion,
+  getEmitterViewActivatedVersion: () => getEmitterViewActivatedVersion,
+  resolveOpenerEngine: () => resolveOpenerEngine
+});
+module.exports = __toCommonJS(viewEvents_exports);
+const VIEW_ACTIVATED_VERSION = Symbol.for("__NOCOBASE_VIEW_ACTIVATED_VERSION__");
+const VIEW_ACTIVATED_EVENT = "view:activated";
+const DATA_SOURCE_DIRTY_EVENT = "dataSource:dirty";
+const ENGINE_SCOPE_KEY = "__NOCOBASE_ENGINE_SCOPE__";
+const VIEW_ENGINE_SCOPE = "view";
+function getEmitterViewActivatedVersion(emitter) {
+  const raw = Reflect.get(emitter, VIEW_ACTIVATED_VERSION);
+  const num = typeof raw === "number" ? raw : Number(raw);
+  return Number.isFinite(num) && num > 0 ? num : 0;
+}
+__name(getEmitterViewActivatedVersion, "getEmitterViewActivatedVersion");
+function bumpViewActivatedVersion(emitter) {
+  const current = getEmitterViewActivatedVersion(emitter);
+  if (!Object.isExtensible(emitter)) return current;
+  const next = current + 1;
+  Reflect.set(emitter, VIEW_ACTIVATED_VERSION, next);
+  return next;
+}
+__name(bumpViewActivatedVersion, "bumpViewActivatedVersion");
+function isViewEngine(engine) {
+  return Reflect.get(engine, ENGINE_SCOPE_KEY) === VIEW_ENGINE_SCOPE;
+}
+__name(isViewEngine, "isViewEngine");
+function findNearestViewEngine(engine) {
+  let cur = engine;
+  let guard = 0;
+  while (cur && guard++ < 50) {
+    if (isViewEngine(cur)) return cur;
+    cur = cur.previousEngine;
+  }
+}
+__name(findNearestViewEngine, "findNearestViewEngine");
+function resolveOpenerEngine(parentEngine, scopedEngine) {
+  if (!parentEngine) return void 0;
+  const previousEngine = scopedEngine == null ? void 0 : scopedEngine.previousEngine;
+  return findNearestViewEngine(previousEngine) || parentEngine;
+}
+__name(resolveOpenerEngine, "resolveOpenerEngine");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  DATA_SOURCE_DIRTY_EVENT,
+  ENGINE_SCOPE_KEY,
+  VIEW_ACTIVATED_EVENT,
+  VIEW_ACTIVATED_VERSION,
+  VIEW_ENGINE_SCOPE,
+  bumpViewActivatedVersion,
+  getEmitterViewActivatedVersion,
+  resolveOpenerEngine
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/flow-engine",
-  "version": "2.0.0-beta.15",
+  "version": "2.0.0-beta.16",
   "private": false,
   "description": "A standalone flow engine for NocoBase, managing workflows, models, and actions.",
   "main": "lib/index.js",
@@ -8,8 +8,8 @@
   "dependencies": {
     "@formily/antd-v5": "1.x",
     "@formily/reactive": "2.x",
-    "@nocobase/sdk": "2.0.0-beta.15",
-    "@nocobase/shared": "2.0.0-beta.15",
+    "@nocobase/sdk": "2.0.0-beta.16",
+    "@nocobase/shared": "2.0.0-beta.16",
     "ahooks": "^3.7.2",
     "dayjs": "^1.11.9",
     "dompurify": "^3.0.2",
@@ -36,5 +36,5 @@
   ],
   "author": "NocoBase Team",
   "license": "AGPL-3.0",
-  "gitHead": "3eaf3d9b571dcf4d56e28aa6ea6c24dd3896740d"
+  "gitHead": "d76e49352101a74331ffa3005cc5f024d7fca663"
 }