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

package/lib/utils/safeGlobals.d.ts

@@ -6,13 +6,9 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-/**
- * 统一的安全全局对象代理：window/document/navigator
- * - window：仅允许常用的定时器、console、Math、Date、FormData、addEventListener、open（安全包装）、location（安全代理）
- * - document：仅允许 createElement/querySelector/querySelectorAll
- * - navigator：仅提供极少量低风险能力（clipboard.writeText、onLine、language、languages）
- * - 不允许随意访问未声明的属性，最小权限原则
- */
-export declare function createSafeWindow(extra?: Record<string, any>): {};
-export declare function createSafeDocument(extra?: Record<string, any>): {};
+export declare function registerRunJSSafeWindowGlobals(keys: Iterable<string> | null | undefined): void;
+export declare function registerRunJSSafeDocumentGlobals(keys: Iterable<string> | null | undefined): void;
+export declare function __resetRunJSSafeGlobalsRegistryForTests(): void;
+export declare function createSafeWindow(extra?: Record<string, any>): Record<string, any>;
+export declare function createSafeDocument(extra?: Record<string, any>): Record<string, any>;
 export declare function createSafeNavigator(extra?: Record<string, any>): {};

package/lib/utils/safeGlobals.js

@@ -27,14 +27,73 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var safeGlobals_exports = {};
 __export(safeGlobals_exports, {
+  __resetRunJSSafeGlobalsRegistryForTests: () => __resetRunJSSafeGlobalsRegistryForTests,
   createSafeDocument: () => createSafeDocument,
   createSafeNavigator: () => createSafeNavigator,
-  createSafeWindow: () => createSafeWindow
+  createSafeWindow: () => createSafeWindow,
+  registerRunJSSafeDocumentGlobals: () => registerRunJSSafeDocumentGlobals,
+  registerRunJSSafeWindowGlobals: () => registerRunJSSafeWindowGlobals
 });
 module.exports = __toCommonJS(safeGlobals_exports);
+function getRunJSSafeGlobalsRegistry() {
+  var _a, _b;
+  const g = globalThis;
+  if (((_a = g.__nocobaseRunJSSafeGlobalsRegistry) == null ? void 0 : _a.windowAllow) && ((_b = g.__nocobaseRunJSSafeGlobalsRegistry) == null ? void 0 : _b.documentAllow)) {
+    return g.__nocobaseRunJSSafeGlobalsRegistry;
+  }
+  const reg = {
+    windowAllow: /* @__PURE__ */ new Set(),
+    documentAllow: /* @__PURE__ */ new Set()
+  };
+  g.__nocobaseRunJSSafeGlobalsRegistry = reg;
+  return reg;
+}
+__name(getRunJSSafeGlobalsRegistry, "getRunJSSafeGlobalsRegistry");
+function registerRunJSSafeWindowGlobals(keys) {
+  if (!keys) return;
+  const reg = getRunJSSafeGlobalsRegistry();
+  for (const k of keys) {
+    if (typeof k !== "string") continue;
+    const key = k.trim();
+    if (!key) continue;
+    reg.windowAllow.add(key);
+  }
+}
+__name(registerRunJSSafeWindowGlobals, "registerRunJSSafeWindowGlobals");
+function registerRunJSSafeDocumentGlobals(keys) {
+  if (!keys) return;
+  const reg = getRunJSSafeGlobalsRegistry();
+  for (const k of keys) {
+    if (typeof k !== "string") continue;
+    const key = k.trim();
+    if (!key) continue;
+    reg.documentAllow.add(key);
+  }
+}
+__name(registerRunJSSafeDocumentGlobals, "registerRunJSSafeDocumentGlobals");
+function __resetRunJSSafeGlobalsRegistryForTests() {
+  var _a, _b, _c, _d;
+  const g = globalThis;
+  if (g.__nocobaseRunJSSafeGlobalsRegistry) {
+    try {
+      (_b = (_a = g.__nocobaseRunJSSafeGlobalsRegistry.windowAllow) == null ? void 0 : _a.clear) == null ? void 0 : _b.call(_a);
+      (_d = (_c = g.__nocobaseRunJSSafeGlobalsRegistry.documentAllow) == null ? void 0 : _c.clear) == null ? void 0 : _d.call(_c);
+    } catch {
+    }
+  }
+}
+__name(__resetRunJSSafeGlobalsRegistryForTests, "__resetRunJSSafeGlobalsRegistryForTests");
+function isAllowedDynamicWindowKey(key) {
+  return getRunJSSafeGlobalsRegistry().windowAllow.has(key);
+}
+__name(isAllowedDynamicWindowKey, "isAllowedDynamicWindowKey");
+function isAllowedDynamicDocumentKey(key) {
+  return getRunJSSafeGlobalsRegistry().documentAllow.has(key);
+}
+__name(isAllowedDynamicDocumentKey, "isAllowedDynamicDocumentKey");
 function createSafeWindow(extra) {
   const getSafeBaseHref = /* @__PURE__ */ __name(() => `${window.location.origin}${window.location.pathname}`, "getSafeBaseHref");
-  const safeOpen = /* @__PURE__ */ __name((url, target, features) => {
+  const safeOpen = /* @__PURE__ */ __name((url, target2, features) => {
     const isSafeUrl = /* @__PURE__ */ __name((u) => {
       try {
         const parsed = new URL(u, getSafeBaseHref());
@@ -145,15 +204,40 @@ function createSafeWindow(extra) {
     location: safeLocation,
     ...extra || {}
   };
-  return new Proxy(
-    {},
-    {
-      get(_target, prop) {
-        if (prop in allowedGlobals) return allowedGlobals[prop];
-        throw new Error(`Access to global property "${prop}" is not allowed.`);
+  const target = /* @__PURE__ */ Object.create(null);
+  return new Proxy(target, {
+    get(t, prop) {
+      if (typeof prop !== "string") {
+        return Reflect.get(t, prop);
       }
+      if (prop in allowedGlobals) return allowedGlobals[prop];
+      if (Object.prototype.hasOwnProperty.call(t, prop)) return t[prop];
+      if (isAllowedDynamicWindowKey(prop)) {
+        const v = window[prop];
+        if (typeof v === "function") return v.bind(window);
+        return v;
+      }
+      throw new Error(`Access to global property "${prop}" is not allowed.`);
+    },
+    set(t, prop, value) {
+      if (typeof prop !== "string") {
+        Reflect.set(t, prop, value);
+        return true;
+      }
+      if (prop in allowedGlobals) {
+        throw new Error(`Mutation of global property "${prop}" is not allowed.`);
+      }
+      t[prop] = value;
+      return true;
+    },
+    has(t, prop) {
+      if (typeof prop !== "string") return Reflect.has(t, prop);
+      if (prop in allowedGlobals) return true;
+      if (Object.prototype.hasOwnProperty.call(t, prop)) return true;
+      if (isAllowedDynamicWindowKey(prop)) return true;
+      return false;
     }
-  );
+  });
 }
 __name(createSafeWindow, "createSafeWindow");
 function createSafeDocument(extra) {
@@ -163,15 +247,40 @@ function createSafeDocument(extra) {
     querySelectorAll: document.querySelectorAll.bind(document),
     ...extra || {}
   };
-  return new Proxy(
-    {},
-    {
-      get(_target, prop) {
-        if (prop in allowed) return allowed[prop];
-        throw new Error(`Access to document property "${prop}" is not allowed.`);
+  const target = /* @__PURE__ */ Object.create(null);
+  return new Proxy(target, {
+    get(t, prop) {
+      if (typeof prop !== "string") {
+        return Reflect.get(t, prop);
+      }
+      if (prop in allowed) return allowed[prop];
+      if (Object.prototype.hasOwnProperty.call(t, prop)) return t[prop];
+      if (isAllowedDynamicDocumentKey(prop)) {
+        const v = document[prop];
+        if (typeof v === "function") return v.bind(document);
+        return v;
+      }
+      throw new Error(`Access to document property "${prop}" is not allowed.`);
+    },
+    set(t, prop, value) {
+      if (typeof prop !== "string") {
+        Reflect.set(t, prop, value);
+        return true;
       }
+      if (prop in allowed) {
+        throw new Error(`Mutation of document property "${prop}" is not allowed.`);
+      }
+      t[prop] = value;
+      return true;
+    },
+    has(t, prop) {
+      if (typeof prop !== "string") return Reflect.has(t, prop);
+      if (prop in allowed) return true;
+      if (Object.prototype.hasOwnProperty.call(t, prop)) return true;
+      if (isAllowedDynamicDocumentKey(prop)) return true;
+      return false;
     }
-  );
+  });
 }
 __name(createSafeDocument, "createSafeDocument");
 function createSafeNavigator(extra) {
@@ -214,7 +323,10 @@ function createSafeNavigator(extra) {
 __name(createSafeNavigator, "createSafeNavigator");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  __resetRunJSSafeGlobalsRegistryForTests,
   createSafeDocument,
   createSafeNavigator,
-  createSafeWindow
+  createSafeWindow,
+  registerRunJSSafeDocumentGlobals,
+  registerRunJSSafeWindowGlobals
 });

package/lib/views/createViewMeta.d.ts

@@ -8,13 +8,6 @@
  */
 import type { FlowContext, PropertyMetaFactory } from '../flowContext';
 import type { FlowView } from './FlowView';
-/**
- * Create a meta factory for ctx.view that includes:
- * - buildVariablesParams: { record } via inferRecordRef
- * - properties.record: full collection meta via buildRecordMeta
- * - type/preventClose/inputArgs/navigation fields for better variable selection UX
- */
-export declare function createViewMeta(ctx: FlowContext): PropertyMetaFactory;
 /**
  * 为 ctx.popup 构建元信息：
  * - popup.record：当前弹窗记录（服务端解析）

package/lib/views/createViewMeta.js

@@ -29,7 +29,6 @@ var createViewMeta_exports = {};
 __export(createViewMeta_exports, {
   buildPopupRuntime: () => buildPopupRuntime,
   createPopupMeta: () => createPopupMeta,
-  createViewMeta: () => createViewMeta,
   registerPopupVariable: () => registerPopupVariable
 });
 module.exports = __toCommonJS(createViewMeta_exports);
@@ -82,67 +81,15 @@ function makeMetaFromValue(value, title, seen) {
   return { type: "any", title };
 }
 __name(makeMetaFromValue, "makeMetaFromValue");
-function createViewMeta(ctx) {
-  const viewTitle = ctx.t("\u5F53\u524D\u89C6\u56FE");
-  const factory = /* @__PURE__ */ __name(async () => {
-    const view = ctx.view;
-    return {
-      type: "object",
-      title: ctx.t("\u5F53\u524D\u89C6\u56FE"),
-      buildVariablesParams: /* @__PURE__ */ __name((c) => {
-        const params = (0, import_variablesParams.inferViewRecordRef)(c);
-        if (params) {
-          return {
-            record: params
-          };
-        }
-        return void 0;
-      }, "buildVariablesParams"),
-      properties: /* @__PURE__ */ __name(async () => {
-        var _a, _b, _c;
-        const props = {};
-        const refNow = (0, import_variablesParams.inferViewRecordRef)(ctx);
-        if (refNow && refNow.collection) {
-          const recordFactory = /* @__PURE__ */ __name(async () => {
-            var _a2, _b2, _c2, _d;
-            try {
-              const ref = (0, import_variablesParams.inferViewRecordRef)(ctx);
-              if (!(ref == null ? void 0 : ref.collection)) return null;
-              const dsKey = ref.dataSourceKey || "main";
-              const ds = (_b2 = (_a2 = ctx.dataSourceManager) == null ? void 0 : _a2.getDataSource) == null ? void 0 : _b2.call(_a2, dsKey);
-              const col = (_d = (_c2 = ds == null ? void 0 : ds.collectionManager) == null ? void 0 : _c2.getCollection) == null ? void 0 : _d.call(_c2, ref.collection);
-              if (!col) return null;
-              return await (0, import_variablesParams.buildRecordMeta)(
-                () => col,
-                ctx.t("\u5F53\u524D\u89C6\u56FE\u8BB0\u5F55"),
-                (c) => (0, import_variablesParams.inferViewRecordRef)(c)
-              );
-            } catch (e) {
-              return null;
-            }
-          }, "recordFactory");
-          recordFactory.title = ctx.t("\u5F53\u524D\u89C6\u56FE\u8BB0\u5F55");
-          recordFactory.hasChildren = true;
-          props.record = recordFactory;
-        }
-        props.type = { type: "string", title: ((_a = ctx.t) == null ? void 0 : _a.call(ctx, "\u7C7B\u578B")) || "\u7C7B\u578B" };
-        props.preventClose = { type: "boolean", title: ((_b = ctx.t) == null ? void 0 : _b.call(ctx, "\u662F\u5426\u5141\u8BB8\u5173\u95ED")) || "\u662F\u5426\u5141\u8BB8\u5173\u95ED" };
-        props.inputArgs = makeMetaFromValue(view == null ? void 0 : view.inputArgs, ((_c = ctx.t) == null ? void 0 : _c.call(ctx, "\u8F93\u5165\u53C2\u6570")) || "\u8F93\u5165\u53C2\u6570");
-        return props;
-      }, "properties")
-    };
-  }, "factory");
-  factory.title = viewTitle;
-  return factory;
-}
-__name(createViewMeta, "createViewMeta");
 function createPopupMeta(ctx, anchorView) {
   const t = /* @__PURE__ */ __name((k) => ctx.t(k), "t");
   const isPopupView = /* @__PURE__ */ __name((view) => {
-    var _a;
+    var _a, _b;
     if (!view) return false;
     const stack = Array.isArray((_a = view.navigation) == null ? void 0 : _a.viewStack) ? view.navigation.viewStack : [];
-    return stack.length >= 2;
+    const openerUids = (_b = view == null ? void 0 : view.inputArgs) == null ? void 0 : _b.openerUids;
+    const hasOpener = Array.isArray(openerUids) && openerUids.length > 0;
+    return stack.length >= 2 || hasOpener;
   }, "isPopupView");
   const hasPopupNow = /* @__PURE__ */ __name(() => isPopupView(anchorView ?? ctx.view), "hasPopupNow");
   const resolveRecordRef = /* @__PURE__ */ __name(async (flowCtx) => {
@@ -329,18 +276,21 @@ function createPopupMeta(ctx, anchorView) {
         var _a, _b, _c, _d, _e, _f;
         const props = {};
         props.uid = { type: "string", title: t("Popup uid") };
-        const recordFactory = /* @__PURE__ */ __name(async () => {
-          const col = await getCurrentCollection();
-          if (!col) return null;
-          return await (0, import_variablesParams.buildRecordMeta)(
-            () => col,
-            t("Current popup record"),
-            (c) => resolveRecordRef(c)
-          );
-        }, "recordFactory");
-        recordFactory.title = t("Current popup record");
-        recordFactory.hasChildren = true;
-        props.record = recordFactory;
+        const recordRef = await resolveRecordRef(ctx);
+        if (recordRef) {
+          const recordFactory = /* @__PURE__ */ __name(async () => {
+            const col = await getCurrentCollection();
+            if (!col) return null;
+            return await (0, import_variablesParams.buildRecordMeta)(
+              () => col,
+              t("Current popup record"),
+              (c) => resolveRecordRef(c)
+            );
+          }, "recordFactory");
+          recordFactory.title = t("Current popup record");
+          recordFactory.hasChildren = true;
+          props.record = recordFactory;
+        }
         try {
           const inputArgs = (_a = ctx.view) == null ? void 0 : _a.inputArgs;
           const srcId = inputArgs == null ? void 0 : inputArgs.sourceId;
@@ -483,6 +433,5 @@ __name(registerPopupVariable, "registerPopupVariable");
 0 && (module.exports = {
   buildPopupRuntime,
   createPopupMeta,
-  createViewMeta,
   registerPopupVariable
 });

package/lib/views/index.d.ts

@@ -8,7 +8,6 @@
  */
 export { useDialog } from './useDialog';
 export { useDrawer } from './useDrawer';
-export { usePage } from './usePage';
+export { usePage, GLOBAL_EMBED_CONTAINER_ID, EMBED_REPLACING_DATA_KEY } from './usePage';
 export { usePopover } from './usePopover';
 export { ViewNavigation } from './ViewNavigation';
-export { createViewMeta } from './createViewMeta';

package/lib/views/index.js

@@ -26,8 +26,9 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var views_exports = {};
 __export(views_exports, {
+  EMBED_REPLACING_DATA_KEY: () => import_usePage.EMBED_REPLACING_DATA_KEY,
+  GLOBAL_EMBED_CONTAINER_ID: () => import_usePage.GLOBAL_EMBED_CONTAINER_ID,
   ViewNavigation: () => import_ViewNavigation.ViewNavigation,
-  createViewMeta: () => import_createViewMeta.createViewMeta,
   useDialog: () => import_useDialog.useDialog,
   useDrawer: () => import_useDrawer.useDrawer,
   usePage: () => import_usePage.usePage,
@@ -39,11 +40,11 @@ var import_useDrawer = require("./useDrawer");
 var import_usePage = require("./usePage");
 var import_usePopover = require("./usePopover");
 var import_ViewNavigation = require("./ViewNavigation");
-var import_createViewMeta = require("./createViewMeta");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  EMBED_REPLACING_DATA_KEY,
+  GLOBAL_EMBED_CONTAINER_ID,
   ViewNavigation,
-  createViewMeta,
   useDialog,
   useDrawer,
   usePage,

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) => {
@@ -146,7 +152,6 @@ function useDialog() {
     };
     ctx.defineProperty("view", {
       get: /* @__PURE__ */ __name(() => currentDialog, "get"),
-      // meta: createViewMeta(ctx),
       resolveOnServer: (0, import_variablesParams.createViewRecordResolveOnServer)(ctx, () => (0, import_variablesParams.getViewRecordFromParent)(flowContext, ctx))
     });
     (0, import_createViewMeta.registerPopupVariable)(ctx, currentDialog);
@@ -170,9 +175,9 @@ function useDialog() {
             className: "nb-dialog-overflow-hidden",
             ref: dialogRef,
             hidden: (_d = (_c2 = config.inputArgs) == null ? void 0 : _c2.hidden) == null ? void 0 : _d.value,
-            ...config,
             footer: currentFooter,
             header: currentHeader,
+            ...config,
             onCancel: () => {
               currentDialog.close(config.result);
             }

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) => {
@@ -165,7 +171,6 @@ function useDrawer() {
     };
     ctx.defineProperty("view", {
       get: /* @__PURE__ */ __name(() => currentDrawer, "get"),
-      // meta: createViewMeta(ctx),
       resolveOnServer: (0, import_variablesParams.createViewRecordResolveOnServer)(ctx, () => (0, import_variablesParams.getViewRecordFromParent)(flowContext, ctx))
     });
     (0, import_createViewMeta.registerPopupVariable)(ctx, currentDrawer);

package/lib/views/usePage.d.ts

@@ -7,6 +7,10 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import React from 'react';
+/** Global embed container element ID */
+export declare const GLOBAL_EMBED_CONTAINER_ID = "nocobase-embed-container";
+/** Dataset key used to signal embed replacement in progress (skip style reset on close) */
+export declare const EMBED_REPLACING_DATA_KEY = "nocobaseEmbedReplacing";
 export declare function usePage(): (React.JSX.Element | {
     open: (config: any, flowContext: any) => Promise<unknown> & {
         type: "embed";

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,26 @@ 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");
 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 +99,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,14 +129,23 @@ function usePage() {
     }
     const currentPage = {
       type: "embed",
-      inputArgs: config.inputArgs || {},
+      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();
         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) => {
@@ -147,7 +180,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 +218,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 +236,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;