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

package/lib/views/usePage.js

@@ -37,6 +37,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var usePage_exports = {};
 __export(usePage_exports, {
+  EMBED_REPLACING_DATA_KEY: () => EMBED_REPLACING_DATA_KEY,
+  GLOBAL_EMBED_CONTAINER_ID: () => GLOBAL_EMBED_CONTAINER_ID,
   usePage: () => usePage
 });
 module.exports = __toCommonJS(usePage_exports);
@@ -48,22 +50,27 @@ 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");
+var import_runViewBeforeClose = require("./runViewBeforeClose");
 let uuid = 0;
+const GLOBAL_EMBED_CONTAINER_ID = "nocobase-embed-container";
+const EMBED_REPLACING_DATA_KEY = "nocobaseEmbedReplacing";
 const PageElementsHolder = import_react.default.memo(
   import_react.default.forwardRef((props, ref) => {
     const [elements, patchElement] = (0, import_usePatchElement.default)();
     import_react.default.useImperativeHandle(ref, () => ({ patchElement }), [patchElement]);
-    console.log("[NocoBase] Rendering PageElementsHolder with elements count:", elements.length);
     return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, elements);
   })
 );
 function usePage() {
   const holderRef = import_react.default.useRef(null);
+  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;
@@ -93,9 +100,27 @@ function usePage() {
       }, [props]);
       return null;
     }, "HeaderComponent");
-    const { target, content, preventClose, inheritContext = true, inputArgs, ...restConfig } = config;
+    const {
+      target,
+      content,
+      preventClose,
+      inheritContext = true,
+      inputArgs: viewInputArgs = {},
+      ...restConfig
+    } = config;
+    const isGlobalEmbedContainer = target instanceof HTMLElement && target.id === GLOBAL_EMBED_CONTAINER_ID;
+    if (isGlobalEmbedContainer && globalEmbedActiveRef.current) {
+      try {
+        target.dataset[EMBED_REPLACING_DATA_KEY] = "1";
+        globalEmbedActiveRef.current.destroy();
+      } finally {
+        delete target.dataset[EMBED_REPLACING_DATA_KEY];
+        globalEmbedActiveRef.current = null;
+      }
+    }
     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) {
@@ -105,30 +130,45 @@ function usePage() {
     }
     const currentPage = {
       type: "embed",
-      inputArgs: config.inputArgs || {},
+      inputArgs: viewInputArgs,
       preventClose: !!config.preventClose,
+      beforeClose: void 0,
       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();
         closeFunc == null ? void 0 : closeFunc();
+        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) => {
         var _a2;
         return (_a2 = pageRef.current) == null ? void 0 : _a2.update(newConfig);
       }, "update"),
-      close: /* @__PURE__ */ __name((result, force) => {
+      close: /* @__PURE__ */ __name(async (result, force) => {
         var _a2, _b2;
         if (preventClose && !force) {
-          return;
+          return false;
+        }
+        const shouldClose = await (0, import_runViewBeforeClose.runViewBeforeClose)(currentPage, { result, force });
+        if (!shouldClose) {
+          return false;
         }
         if (config.triggerByRouter && ((_b2 = (_a2 = config.inputArgs) == null ? void 0 : _a2.navigation) == null ? void 0 : _b2.back)) {
           config.inputArgs.navigation.back();
-          return;
+          return true;
         }
         currentPage.destroy(result);
+        return true;
       }, "close"),
       Header: HeaderComponent,
       Footer: FooterComponent,
@@ -147,7 +187,6 @@ function usePage() {
     };
     ctx.defineProperty("view", {
       get: /* @__PURE__ */ __name(() => currentPage, "get"),
-      // meta: createViewMeta(ctx),
       // 仅当访问关联字段或前端无本地记录数据时，才交给服务端解析
       resolveOnServer: (0, import_variablesParams.createViewRecordResolveOnServer)(ctx, () => (0, import_variablesParams.getViewRecordFromParent)(flowContext, ctx))
     });
@@ -186,13 +225,16 @@ function usePage() {
         displayName: "PageWithContext"
       }
     );
-    const key = (inputArgs == null ? void 0 : inputArgs.viewUid) || `page-${uuid}`;
+    const key = (viewInputArgs == null ? void 0 : viewInputArgs.viewUid) || `page-${uuid}`;
     const page = /* @__PURE__ */ import_react.default.createElement(import_provider.FlowEngineProvider, { key, engine: scopedEngine }, /* @__PURE__ */ import_react.default.createElement(import_FlowContextProvider.FlowViewContextProvider, { context: ctx }, /* @__PURE__ */ import_react.default.createElement(PageWithContext, null)));
     if (target && target instanceof HTMLElement) {
       closeFunc = (_b = holderRef.current) == null ? void 0 : _b.patchElement(import_react_dom.default.createPortal(page, target, key));
     } else {
       closeFunc = (_c = holderRef.current) == null ? void 0 : _c.patchElement(page);
     }
+    if (isGlobalEmbedContainer) {
+      globalEmbedActiveRef.current = { destroy: currentPage.destroy };
+    }
     return Object.assign(promise, currentPage);
   }, "open");
   const api = import_react.default.useMemo(() => ({ open }), []);
@@ -201,5 +243,7 @@ function usePage() {
 __name(usePage, "usePage");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  EMBED_REPLACING_DATA_KEY,
+  GLOBAL_EMBED_CONTAINER_ID,
   usePage
 });

package/lib/views/usePopover.js

@@ -68,8 +68,11 @@ const PopoverComponent = React.forwardRef(({ afterClose, content, placement, rec
       destroyTooltipOnHide: true,
       content: config.content,
       placement: config.placement,
-      getPopupContainer: () => document.body,
+      getPopupContainer: () => document.querySelector("#nocobase-app-container") || document.body,
       onOpenChange: (nextOpen) => {
+        if (!nextOpen && config.preventClose) {
+          return;
+        }
         setVisible(nextOpen);
         if (!nextOpen) {
           afterClose == null ? void 0 : afterClose();

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,90 @@
+/**
+ * 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 parentViewEngine = findNearestViewEngine(parentEngine);
+  if (parentViewEngine) return parentViewEngine;
+  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.1.0-alpha.1",
+  "version": "2.1.0-alpha.11",
   "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.1.0-alpha.1",
-    "@nocobase/shared": "2.1.0-alpha.1",
+    "@nocobase/sdk": "2.1.0-alpha.11",
+    "@nocobase/shared": "2.1.0-alpha.11",
     "ahooks": "^3.7.2",
     "dayjs": "^1.11.9",
     "dompurify": "^3.0.2",
@@ -35,6 +35,6 @@
     "workflow"
   ],
   "author": "NocoBase Team",
-  "license": "AGPL-3.0",
-  "gitHead": "d27baf21569643d6fa83f882233f4e90eb5b89f1"
+  "license": "Apache-2.0",
+  "gitHead": "bb96d633a6371afb586072ff516bd0613c757db0"
 }

package/server.d.ts

@@ -0,0 +1 @@
+export * from './src/server';

package/server.js

@@ -0,0 +1 @@
+module.exports = process.env.IS_DEV_CMD || process.env.VITEST ? require('./src/server.ts') : require('./lib/server');

package/src/BlockScopedFlowEngine.ts

@@ -31,16 +31,13 @@ export function createBlockScopedEngine(parent: FlowEngine): FlowEngine {
   local.context.addDelegate(parent.context);
 
   // 覆盖 unlinkFromStack：BlockScoped 引擎被移除时，修复前后指针，避免“截断”后续视图/作用域
-  const originalUnlink = local.unlinkFromStack.bind(local);
   local.unlinkFromStack = function () {
-    // 修复指针：prev -> next，next -> prev，然后清理自身指针
-    // 若不这么做，移除位于中间的 block 引擎会导致后续整段链丢失
     const prev = (local as any)._previousEngine as FlowEngine | undefined;
     const next = (local as any)._nextEngine as FlowEngine | undefined;
     if (prev) (prev as any)._nextEngine = next;
     if (next) (next as any)._previousEngine = prev;
-    (local as any)._previousEngine = undefined as any;
-    (local as any)._nextEngine = undefined as any;
+    (local as any)._previousEngine = undefined;
+    (local as any)._nextEngine = undefined;
   };
 
   // 默认全部代理到父引擎，只有少数字段（实例/缓存/执行器/上下文/链表指针）使用本地值