@nocobase/flow-engine 2.1.0-alpha.40 → 2.1.0-alpha.45

package/lib/views/ViewNavigation.js

@@ -47,11 +47,17 @@ function hasUsableSourceId(sourceId) {
   return sourceId !== void 0 && sourceId !== null && String(sourceId) !== "";
 }
 __name(hasUsableSourceId, "hasUsableSourceId");
-function generatePathnameFromViewParams(viewParams) {
+function normalizeBasePath(basePath) {
+  const value = basePath || "/admin";
+  return `/${value.replace(/^\/+/, "").replace(/\/+$/, "")}`;
+}
+__name(normalizeBasePath, "normalizeBasePath");
+function generatePathnameFromViewParams(viewParams, options = {}) {
+  const basePath = normalizeBasePath(options.basePath || options.prefix);
   if (!viewParams || viewParams.length === 0) {
-    return "/admin";
+    return basePath;
   }
-  const segments = ["admin"];
+  const segments = basePath.replace(/^\/+/, "").split("/").filter(Boolean);
   viewParams.forEach((viewParam, index) => {
     if (index > 0) {
       segments.push("view");
@@ -78,9 +84,11 @@ const _ViewNavigation = class _ViewNavigation {
   // 只能通过 setViewStack 修改
   ctx;
   viewParams;
-  constructor(ctx, viewParams) {
+  basePath;
+  constructor(ctx, viewParams, options = {}) {
     this.setViewStack(viewParams);
     this.ctx = ctx;
+    this.basePath = options.basePath || options.layoutBasePath;
     (0, import_reactive.define)(this, {
       viewParams: import_reactive.observable
     });
@@ -96,19 +104,26 @@ const _ViewNavigation = class _ViewNavigation {
       }
       return { ...item };
     });
-    const newPathname = generatePathnameFromViewParams(newViewStack);
+    const newPathname = generatePathnameFromViewParams(newViewStack, { basePath: this.getLayoutBasePath() });
     this.ctx.router.navigate(newPathname, { replace: true });
   }
   navigateTo(viewParam, opts) {
-    const newViewPathname = generatePathnameFromViewParams([...this.viewStack, viewParam]);
+    const newViewPathname = generatePathnameFromViewParams([...this.viewStack, viewParam], {
+      basePath: this.getLayoutBasePath()
+    });
     const newPathname = newViewPathname;
     this.ctx.router.navigate(newPathname, opts);
   }
   back() {
     const prevStack = this.viewStack.slice(0, -1);
-    const prevPath = generatePathnameFromViewParams(prevStack);
+    const prevPath = generatePathnameFromViewParams(prevStack, { basePath: this.getLayoutBasePath() });
     this.ctx.router.navigate(prevPath, { replace: true });
   }
+  getLayoutBasePath() {
+    var _a, _b;
+    const routePath = (_a = this.ctx.layout) == null ? void 0 : _a.routePath;
+    return this.basePath || ((_b = this.ctx.layoutRoute) == null ? void 0 : _b.basePathname) || ((routePath == null ? void 0 : routePath.startsWith("/")) ? routePath : "/admin");
+  }
 };
 __name(_ViewNavigation, "ViewNavigation");
 let ViewNavigation = _ViewNavigation;

package/lib/views/createViewMeta.js

@@ -33,6 +33,75 @@ __export(createViewMeta_exports, {
 });
 module.exports = __toCommonJS(createViewMeta_exports);
 var import_variablesParams = require("../utils/variablesParams");
+function isDefined(value) {
+  return value !== void 0 && value !== null;
+}
+__name(isDefined, "isDefined");
+function isSameViewParamValue(left, right) {
+  if (left === right) return true;
+  if (!isDefined(left) || !isDefined(right)) return false;
+  try {
+    return JSON.stringify(left) === JSON.stringify(right);
+  } catch (_) {
+    return String(left) === String(right);
+  }
+}
+__name(isSameViewParamValue, "isSameViewParamValue");
+function getViewStack(view) {
+  var _a;
+  const stack = (_a = view == null ? void 0 : view.navigation) == null ? void 0 : _a.viewStack;
+  return Array.isArray(stack) ? stack : [];
+}
+__name(getViewStack, "getViewStack");
+function getAnchoredViewStackIndex(view, stack = getViewStack(view)) {
+  var _a;
+  if (!stack.length) return -1;
+  const args = (view == null ? void 0 : view.inputArgs) || {};
+  const navParams = ((_a = view == null ? void 0 : view.navigation) == null ? void 0 : _a.viewParams) || {};
+  const viewUid = args.viewUid ?? navParams.viewUid;
+  if (!viewUid) {
+    return stack.length - 1;
+  }
+  const candidates = stack.map((item, index) => ({ item, index })).filter(({ item }) => (item == null ? void 0 : item.viewUid) === viewUid);
+  if (!candidates.length) {
+    return stack.length - 1;
+  }
+  const keys = ["filterByTk", "sourceId", "tabUid"];
+  let bestIndex = candidates[candidates.length - 1].index;
+  let bestScore = -1;
+  for (const { item, index } of candidates) {
+    let score = 0;
+    let matched = true;
+    for (const key of keys) {
+      if (!isDefined(args[key])) continue;
+      if (!isSameViewParamValue(item == null ? void 0 : item[key], args[key])) {
+        matched = false;
+        break;
+      }
+      score += 1;
+    }
+    if (!matched) continue;
+    if (score >= bestScore) {
+      bestIndex = index;
+      bestScore = score;
+    }
+  }
+  return bestIndex;
+}
+__name(getAnchoredViewStackIndex, "getAnchoredViewStackIndex");
+function getPopupView(ctx, anchorView) {
+  return anchorView ?? ctx.view;
+}
+__name(getPopupView, "getPopupView");
+function isPopupView(view) {
+  var _a;
+  if (!view) return false;
+  const stack = getViewStack(view);
+  const openerUids = (_a = view == null ? void 0 : view.inputArgs) == null ? void 0 : _a.openerUids;
+  const hasOpener = Array.isArray(openerUids) && openerUids.length > 0;
+  return getAnchoredViewStackIndex(view, stack) >= 1 || hasOpener;
+}
+__name(isPopupView, "isPopupView");
 function isPlainObject(val) {
   if (val === null || typeof val !== "object") return false;
   const proto = Object.getPrototypeOf(val);
@@ -83,17 +152,9 @@ function makeMetaFromValue(value, title, seen) {
 __name(makeMetaFromValue, "makeMetaFromValue");
 function createPopupMeta(ctx, anchorView) {
   const t = /* @__PURE__ */ __name((k) => ctx.t(k), "t");
-  const isPopupView = /* @__PURE__ */ __name((view) => {
-    var _a, _b;
-    if (!view) return false;
-    const stack = Array.isArray((_a = view.navigation) == null ? void 0 : _a.viewStack) ? view.navigation.viewStack : [];
-    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 hasPopupNow = /* @__PURE__ */ __name((flowCtx = ctx) => isPopupView(getPopupView(flowCtx, anchorView)), "hasPopupNow");
   const resolveRecordRef = /* @__PURE__ */ __name(async (flowCtx) => {
-    const view = anchorView ?? flowCtx.view;
+    const view = getPopupView(flowCtx, anchorView);
     if (!view || !isPopupView(view)) return void 0;
     const base = await buildPopupRuntime(flowCtx, view);
     const res = base == null ? void 0 : base.resource;
@@ -116,25 +177,26 @@ function createPopupMeta(ctx, anchorView) {
     return ((_d = (_c = ds == null ? void 0 : ds.collectionManager) == null ? void 0 : _c.getCollection) == null ? void 0 : _d.call(_c, ref.collection)) || null;
   }, "getCurrentCollection");
   const getParentRecordRef = /* @__PURE__ */ __name(async (level, flowCtx) => {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f;
     try {
       const useCtx = flowCtx || ctx;
-      const nav = (_a = useCtx.view) == null ? void 0 : _a.navigation;
-      const stack = Array.isArray(nav == null ? void 0 : nav.viewStack) ? nav.viewStack : [];
-      if (stack.length < 2 || level < 1) return void 0;
-      const idx = stack.length - 1 - level;
-      if (idx < 0) return void 0;
+      const view = getPopupView(useCtx, anchorView);
+      const stack = getViewStack(view);
+      const currentIndex = getAnchoredViewStackIndex(view, stack);
+      if (currentIndex < 1 || level < 1) return void 0;
+      const idx = currentIndex - level;
+      if (idx < 1) return void 0;
       const parent = stack[idx];
       if (!(parent == null ? void 0 : parent.viewUid)) return void 0;
-      let model = (_b = useCtx.engine) == null ? void 0 : _b.getModel(parent.viewUid, true);
+      let model = (_a = useCtx.engine) == null ? void 0 : _a.getModel(parent.viewUid, true);
       if (!model) {
         try {
           model = await useCtx.engine.loadModel({ uid: parent.viewUid });
         } catch (e) {
-          (_d = (_c = useCtx.logger || ctx.logger) == null ? void 0 : _c.warn) == null ? void 0 : _d.call(_c, { err: e }, "[FlowEngine] popup.getParentRecordRef loadModel failed");
+          (_c = (_b = useCtx.logger || ctx.logger) == null ? void 0 : _b.warn) == null ? void 0 : _c.call(_b, { err: e }, "[FlowEngine] popup.getParentRecordRef loadModel failed");
         }
       }
-      const params = ((_e = model == null ? void 0 : model.getStepParams) == null ? void 0 : _e.call(model, "popupSettings", "openView")) || {};
+      const params = ((_d = model == null ? void 0 : model.getStepParams) == null ? void 0 : _d.call(model, "popupSettings", "openView")) || {};
       const collection = params == null ? void 0 : params.collectionName;
       const dataSourceKey = (params == null ? void 0 : params.dataSourceKey) || "main";
       const filterByTk = (parent == null ? void 0 : parent.filterByTk) ?? (parent == null ? void 0 : parent.sourceId);
@@ -148,16 +210,16 @@ function createPopupMeta(ctx, anchorView) {
       };
       return ref;
     } catch (e) {
-      (_g = (_f = (flowCtx == null ? void 0 : flowCtx.logger) || ctx.logger) == null ? void 0 : _f.warn) == null ? void 0 : _g.call(_f, { err: e }, "[FlowEngine] popup.getParentRecordRef failed");
+      (_f = (_e = (flowCtx == null ? void 0 : flowCtx.logger) || ctx.logger) == null ? void 0 : _e.warn) == null ? void 0 : _f.call(_e, { err: e }, "[FlowEngine] popup.getParentRecordRef failed");
       return void 0;
     }
   }, "getParentRecordRef");
   const hasParentNow = /* @__PURE__ */ __name((level) => {
-    var _a;
     try {
-      const nav = (_a = anchorView ?? ctx.view) == null ? void 0 : _a.navigation;
-      const stack = Array.isArray(nav == null ? void 0 : nav.viewStack) ? nav.viewStack : [];
-      return stack.length >= level + 1;
+      const view = getPopupView(ctx, anchorView);
+      const stack = getViewStack(view);
+      const currentIndex = getAnchoredViewStackIndex(view, stack);
+      return currentIndex - level >= 1;
     } catch (_) {
       return false;
     }
@@ -220,10 +282,11 @@ function createPopupMeta(ctx, anchorView) {
       disabled: /* @__PURE__ */ __name(() => !hasPopupNow(), "disabled"),
       hidden: /* @__PURE__ */ __name(() => !hasPopupNow(), "hidden"),
       buildVariablesParams: /* @__PURE__ */ __name(async (c) => {
-        var _a, _b, _c, _d, _e, _f;
-        if (!hasPopupNow()) return void 0;
+        var _a, _b, _c, _d;
+        if (!hasPopupNow(c)) return void 0;
         const ref = await resolveRecordRef(c);
-        const inputArgs = (_a = c.view) == null ? void 0 : _a.inputArgs;
+        const view = getPopupView(c, anchorView);
+        const inputArgs = view == null ? void 0 : view.inputArgs;
         const params = {};
         if (ref) {
           const merged = { ...ref };
@@ -236,9 +299,9 @@ function createPopupMeta(ctx, anchorView) {
           params.record = merged;
         }
         try {
-          const nav = (_b = c.view) == null ? void 0 : _b.navigation;
-          const stack = Array.isArray(nav == null ? void 0 : nav.viewStack) ? nav.viewStack : [];
-          if (stack.length >= 2) {
+          const stack = getViewStack(view);
+          const currentIndex = getAnchoredViewStackIndex(view, stack);
+          if (currentIndex >= 2) {
             let cur = params;
             let level = 1;
             let parentRef = await getParentRecordRef(level, c);
@@ -251,7 +314,7 @@ function createPopupMeta(ctx, anchorView) {
             }
           }
         } catch (err) {
-          (_d = (_c = c.logger) == null ? void 0 : _c.debug) == null ? void 0 : _d.call(_c, { err }, "[FlowEngine] buildVariablesParams: build parent-chain failed");
+          (_b = (_a = c.logger) == null ? void 0 : _a.debug) == null ? void 0 : _b.call(_a, { err }, "[FlowEngine] buildVariablesParams: build parent-chain failed");
         }
         try {
           const srcId = inputArgs == null ? void 0 : inputArgs.sourceId;
@@ -268,12 +331,12 @@ function createPopupMeta(ctx, anchorView) {
             }
           }
         } catch (err) {
-          (_f = (_e = c.logger) == null ? void 0 : _e.debug) == null ? void 0 : _f.call(_e, { err }, "[FlowEngine] buildVariablesParams: infer sourceRecord failed");
+          (_d = (_c = c.logger) == null ? void 0 : _c.debug) == null ? void 0 : _d.call(_c, { err }, "[FlowEngine] buildVariablesParams: infer sourceRecord failed");
         }
         return params;
       }, "buildVariablesParams"),
       properties: /* @__PURE__ */ __name(async () => {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d;
         const props = {};
         props.uid = { type: "string", title: t("Popup uid") };
         const recordRef = await resolveRecordRef(ctx);
@@ -292,20 +355,21 @@ function createPopupMeta(ctx, anchorView) {
           props.record = recordFactory;
         }
         try {
-          const inputArgs = (_a = ctx.view) == null ? void 0 : _a.inputArgs;
+          const view = getPopupView(ctx, anchorView);
+          const inputArgs = view == null ? void 0 : view.inputArgs;
           const srcId = inputArgs == null ? void 0 : inputArgs.sourceId;
           let assoc = inputArgs == null ? void 0 : inputArgs.associationName;
           let dsKey = (inputArgs == null ? void 0 : inputArgs.dataSourceKey) || "main";
           if (!assoc || typeof assoc !== "string" || !assoc.includes(".")) {
-            const nav = (_b = ctx.view) == null ? void 0 : _b.navigation;
-            const stack = Array.isArray(nav == null ? void 0 : nav.viewStack) ? nav.viewStack : [];
-            const last = stack == null ? void 0 : stack[stack.length - 1];
-            if (last == null ? void 0 : last.viewUid) {
-              let model = (_c = ctx == null ? void 0 : ctx.engine) == null ? void 0 : _c.getModel(last.viewUid, true);
+            const stack = getViewStack(view);
+            const currentIndex = getAnchoredViewStackIndex(view, stack);
+            const current = currentIndex >= 0 ? stack == null ? void 0 : stack[currentIndex] : void 0;
+            if (current == null ? void 0 : current.viewUid) {
+              let model = (_a = ctx == null ? void 0 : ctx.engine) == null ? void 0 : _a.getModel(current.viewUid, true);
               if (!model) {
-                model = await ctx.engine.loadModel({ uid: last.viewUid });
+                model = await ctx.engine.loadModel({ uid: current.viewUid });
               }
-              const p = ((_d = model == null ? void 0 : model.getStepParams) == null ? void 0 : _d.call(model, "popupSettings", "openView")) || {};
+              const p = ((_b = model == null ? void 0 : model.getStepParams) == null ? void 0 : _b.call(model, "popupSettings", "openView")) || {};
               assoc = (p == null ? void 0 : p.associationName) || assoc;
               dsKey = (p == null ? void 0 : p.dataSourceKey) || dsKey;
             }
@@ -333,7 +397,7 @@ function createPopupMeta(ctx, anchorView) {
             }
           }
         } catch (err) {
-          (_f = (_e = ctx.logger) == null ? void 0 : _e.debug) == null ? void 0 : _f.call(_e, { err }, "[FlowEngine] popup.properties: build sourceRecord failed");
+          (_d = (_c = ctx.logger) == null ? void 0 : _c.debug) == null ? void 0 : _d.call(_c, { err }, "[FlowEngine] popup.properties: build sourceRecord failed");
         }
         const resourceMeta = {
           type: "object",
@@ -362,12 +426,12 @@ function createPopupMeta(ctx, anchorView) {
 }
 __name(createPopupMeta, "createPopupMeta");
 async function buildPopupRuntime(ctx, view) {
-  var _a, _b, _c;
-  const nav = view == null ? void 0 : view.navigation;
-  const stack = Array.isArray(nav == null ? void 0 : nav.viewStack) ? nav.viewStack : [];
+  var _a;
+  const stack = getViewStack(view);
+  const currentIndex = getAnchoredViewStackIndex(view, stack);
   const openerUids = (_a = view == null ? void 0 : view.inputArgs) == null ? void 0 : _a.openerUids;
   const hasOpener = Array.isArray(openerUids) && openerUids.length > 0;
-  const hasStackPopup = stack.length >= 2;
+  const hasStackPopup = currentIndex >= 1;
   const isPopup = hasStackPopup || hasOpener;
   if (!isPopup) return void 0;
   if (!stack.length) {
@@ -386,12 +450,12 @@ async function buildPopupRuntime(ctx, view) {
     };
   }
   const buildNode = /* @__PURE__ */ __name(async (idx) => {
-    var _a2, _b2, _c2, _d, _e, _f;
+    var _a2, _b, _c, _d, _e, _f;
     if (idx < 0 || !((_a2 = stack[idx]) == null ? void 0 : _a2.viewUid)) return void 0;
     const viewUid = stack[idx].viewUid;
-    let model = (_b2 = ctx.engine) == null ? void 0 : _b2.getModel(viewUid, true);
+    let model = (_b = ctx.engine) == null ? void 0 : _b.getModel(viewUid, true);
     if (!model) {
-      model = await ((_c2 = ctx.engine) == null ? void 0 : _c2.loadModel({ uid: viewUid }));
+      model = await ((_c = ctx.engine) == null ? void 0 : _c.loadModel({ uid: viewUid }));
     }
     const p = ((_d = model == null ? void 0 : model.getStepParams) == null ? void 0 : _d.call(model, "popupSettings", "openView")) || {};
     const collectionName = p == null ? void 0 : p.collectionName;
@@ -410,7 +474,7 @@ async function buildPopupRuntime(ctx, view) {
     if (parentNode) node.parent = parentNode;
     return node;
   }, "buildNode");
-  const currentNode = await buildNode((((_c = (_b = view == null ? void 0 : view.navigation) == null ? void 0 : _b.viewStack) == null ? void 0 : _c.length) || 1) - 1);
+  const currentNode = await buildNode(currentIndex);
   return currentNode;
 }
 __name(buildPopupRuntime, "buildPopupRuntime");

package/lib/views/inheritLayoutContext.d.ts

@@ -0,0 +1,10 @@
+/**
+ * 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 { FlowContext } from '../flowContext';
+export declare function inheritLayoutContextForDetachedView(viewContext: FlowContext, sourceContext: FlowContext): void;

package/lib/views/inheritLayoutContext.js

@@ -0,0 +1,50 @@
+/**
+ * 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 inheritLayoutContext_exports = {};
+__export(inheritLayoutContext_exports, {
+  inheritLayoutContextForDetachedView: () => inheritLayoutContextForDetachedView
+});
+module.exports = __toCommonJS(inheritLayoutContext_exports);
+var import_flowContext = require("../flowContext");
+function inheritLayoutContextForDetachedView(viewContext, sourceContext) {
+  var _a;
+  const layoutContext = sourceContext == null ? void 0 : sourceContext.layoutContext;
+  const engineContext = (_a = sourceContext == null ? void 0 : sourceContext.engine) == null ? void 0 : _a.context;
+  if (!(layoutContext instanceof import_flowContext.FlowContext)) {
+    return;
+  }
+  if (layoutContext === sourceContext || layoutContext === engineContext) {
+    return;
+  }
+  viewContext.addDelegate(layoutContext);
+}
+__name(inheritLayoutContextForDetachedView, "inheritLayoutContextForDetachedView");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  inheritLayoutContextForDetachedView
+});

package/lib/views/useDialog.js

@@ -53,6 +53,7 @@ var import_provider = require("../provider");
 var import_ViewScopedFlowEngine = require("../ViewScopedFlowEngine");
 var import_variablesParams = require("../utils/variablesParams");
 var import_runViewBeforeClose = require("./runViewBeforeClose");
+var import_inheritLayoutContext = require("./inheritLayoutContext");
 let uuid = 0;
 function useDialog() {
   const holderRef = React.useRef(null);
@@ -103,6 +104,7 @@ function useDialog() {
       ctx.addDelegate(flowContext);
     } else {
       ctx.addDelegate(flowContext.engine.context);
+      (0, import_inheritLayoutContext.inheritLayoutContextForDetachedView)(ctx, flowContext);
     }
     let destroyed = false;
     const currentDialog = {

package/lib/views/useDrawer.js

@@ -53,6 +53,7 @@ var import_provider = require("../provider");
 var import_ViewScopedFlowEngine = require("../ViewScopedFlowEngine");
 var import_variablesParams = require("../utils/variablesParams");
 var import_runViewBeforeClose = require("./runViewBeforeClose");
+var import_inheritLayoutContext = require("./inheritLayoutContext");
 function useDrawer() {
   const holderRef = React.useRef(null);
   const drawerList = React.useMemo(() => import__.observable.shallow({ value: [] }), []);
@@ -122,6 +123,7 @@ function useDrawer() {
       ctx.addDelegate(flowContext);
     } else {
       ctx.addDelegate(flowContext.engine.context);
+      (0, import_inheritLayoutContext.inheritLayoutContextForDetachedView)(ctx, flowContext);
     }
     let destroyed = false;
     const currentDrawer = {

package/lib/views/usePage.js

@@ -55,6 +55,7 @@ var import_provider = require("../provider");
 var import_ViewScopedFlowEngine = require("../ViewScopedFlowEngine");
 var import_variablesParams = require("../utils/variablesParams");
 var import_runViewBeforeClose = require("./runViewBeforeClose");
+var import_inheritLayoutContext = require("./inheritLayoutContext");
 let uuid = 0;
 const GLOBAL_EMBED_CONTAINER_ID = "nocobase-embed-container";
 const EMBED_REPLACING_DATA_KEY = "nocobaseEmbedReplacing";
@@ -217,6 +218,7 @@ function usePage() {
         ctx.addDelegate(flowContext);
       } else {
         ctx.addDelegate(flowContext.engine.context);
+        (0, import_inheritLayoutContext.inheritLayoutContextForDetachedView)(ctx, flowContext);
       }
       let destroyed = false;
       let closingPromise;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/flow-engine",
-  "version": "2.1.0-alpha.40",
+  "version": "2.1.0-alpha.45",
   "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.40",
-    "@nocobase/shared": "2.1.0-alpha.40",
+    "@nocobase/sdk": "2.1.0-alpha.45",
+    "@nocobase/shared": "2.1.0-alpha.45",
     "ahooks": "^3.7.2",
     "axios": "^1.7.0",
     "dayjs": "^1.11.9",
@@ -37,5 +37,5 @@
   ],
   "author": "NocoBase Team",
   "license": "Apache-2.0",
-  "gitHead": "e73f99dd0abefe847f2e50ff0fea1f41a82fd048"
+  "gitHead": "e9e24987e12d0ad10a5db8815b1e1b7b447f1938"
 }

package/src/FlowContextProvider.tsx

@@ -9,7 +9,7 @@
 
 import React, { createContext, useContext } from 'react';
 import { FlowContext, FlowEngineContext } from './flowContext';
-import { FlowView } from './views/FlowView';
+import { FlowView, FlowViewer } from './views/FlowView';
 
 export const FlowReactContext = createContext<FlowContext>(null);
 export const FlowViewContext = createContext<FlowContext>(null);
@@ -40,3 +40,11 @@ export function useFlowView() {
   const ctx = useFlowContext();
   return ctx.view as FlowView;
 }
+
+/**
+ * Access the `FlowViewer` that opens new drawers / modals / pages (`viewer.drawer({...})`, `viewer.modal({...})`, etc.). This is the counterpart to `useFlowView()`: `useFlowView()` returns the *current* mounted view (use it to close yourself, render Header/Footer slots, etc.), while `useFlowViewer()` returns the surface that lets you open a *new* view from inside any flow-context subtree.
+ */
+export function useFlowViewer() {
+  const ctx = useFlowContext();
+  return ctx.viewer as FlowViewer;
+}

package/src/__tests__/createViewMeta.popup.test.ts

@@ -11,7 +11,7 @@ import { describe, it, expect, vi } from 'vitest';
 import { FlowContext } from '../flowContext';
 import { FlowEngine } from '../flowEngine';
 import type { FlowView } from '../views/FlowView';
-import { createPopupMeta } from '../views/createViewMeta';
+import { buildPopupRuntime, createPopupMeta } from '../views/createViewMeta';
 
 describe('createPopupMeta - popup variables', () => {
   function makeCtx() {
@@ -23,6 +23,62 @@ describe('createPopupMeta - popup variables', () => {
     return { engine, ctx };
   }
 
+  function makeNestedPopupView(viewUid: string, filterByTk: number): FlowView {
+    return {
+      type: 'drawer',
+      inputArgs: {
+        viewUid,
+        filterByTk,
+        sourceId: 13,
+      },
+      Header: null,
+      Footer: null,
+      close: () => void 0,
+      update: () => void 0,
+      navigation: {
+        viewStack: [
+          { viewUid: 'base-page-uid' },
+          { viewUid: 'parent-popup-uid', filterByTk: 13, sourceId: 13 },
+          { viewUid: 'child-popup-uid', filterByTk: 24, sourceId: 13 },
+        ],
+      } as any,
+    } as any;
+  }
+
+  function mockNestedPopupModels(engine: FlowEngine) {
+    vi.spyOn(engine as any, 'getModel').mockImplementation((uid: string) => {
+      if (uid === 'parent-popup-uid') {
+        return {
+          getStepParams: vi.fn((_fk: string, sk: string) =>
+            sk === 'openView'
+              ? {
+                  collectionName: 'users',
+                  dataSourceKey: 'main',
+                  associationName: 'users.orgs',
+                }
+              : undefined,
+          ),
+        };
+      }
+      if (uid === 'child-popup-uid') {
+        return {
+          getStepParams: vi.fn((_fk: string, sk: string) =>
+            sk === 'openView'
+              ? {
+                  collectionName: 'orgs',
+                  dataSourceKey: 'main',
+                  associationName: 'users.orgs',
+                }
+              : undefined,
+          ),
+        };
+      }
+      return {
+        getStepParams: vi.fn(() => undefined),
+      };
+    });
+  }
+
   it('buildVariablesParams(record) uses anchor view instead of ctx.view', async () => {
     const { engine, ctx } = makeCtx();
 
@@ -108,6 +164,64 @@ describe('createPopupMeta - popup variables', () => {
     expect(vars.record.collection).not.toBe('comments');
   });
 
+  it('buildPopupRuntime anchors current popup even when the navigation stack already has a child popup', async () => {
+    const { engine, ctx } = makeCtx();
+    const parentView = makeNestedPopupView('parent-popup-uid', 13);
+    mockNestedPopupModels(engine);
+
+    const popup = await buildPopupRuntime(ctx, parentView);
+
+    expect(popup?.uid).toBe('parent-popup-uid');
+    expect(popup?.resource).toEqual({
+      dataSourceKey: 'main',
+      collectionName: 'users',
+      associationName: 'users.orgs',
+      filterByTk: 13,
+      sourceId: 13,
+    });
+  });
+
+  it('buildVariablesParams(record) keeps the parent view record when a child popup is open', async () => {
+    const { engine, ctx } = makeCtx();
+    const parentView = makeNestedPopupView('parent-popup-uid', 13);
+    mockNestedPopupModels(engine);
+
+    const meta = (await createPopupMeta(ctx, parentView)())!;
+    const vars = (await meta.buildVariablesParams!(ctx)) as any;
+
+    expect(vars.record).toEqual({
+      collection: 'users',
+      dataSourceKey: 'main',
+      filterByTk: 13,
+      associationName: 'users.orgs',
+      sourceId: 13,
+    });
+  });
+
+  it('buildVariablesParams(parent.record) is still relative to the child popup view', async () => {
+    const { engine, ctx } = makeCtx();
+    const childView = makeNestedPopupView('child-popup-uid', 24);
+    mockNestedPopupModels(engine);
+
+    const meta = (await createPopupMeta(ctx, childView)())!;
+    const vars = (await meta.buildVariablesParams!(ctx)) as any;
+
+    expect(vars.record).toEqual({
+      collection: 'orgs',
+      dataSourceKey: 'main',
+      filterByTk: 24,
+      associationName: 'users.orgs',
+      sourceId: 13,
+    });
+    expect(vars.parent.record).toEqual({
+      collection: 'users',
+      dataSourceKey: 'main',
+      filterByTk: 13,
+      sourceId: 13,
+      associationName: 'users.orgs',
+    });
+  });
+
   it('properties() provides a record factory node (lazy) with title', async () => {
     const { engine, ctx } = makeCtx();
     // 只要能通过 anchorView 推断到集合名和主键即可；集合详情在懒加载时再取