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

package/lib/utils/runjsValue.js

@@ -231,6 +231,34 @@ function normalizeSubPath(raw) {
   return { subPath: s, wildcard: false };
 }
 __name(normalizeSubPath, "normalizeSubPath");
+function extractCtxRootUsage(expr) {
+  const raw = String(expr || "").trim();
+  if (!raw || raw === "ctx") return null;
+  const dotMatch = raw.match(/^ctx\.([a-zA-Z_$][a-zA-Z0-9_$]*)([\s\S]*)$/);
+  if (dotMatch) {
+    const varName = dotMatch[1] || "";
+    const rest = dotMatch[2] || "";
+    const normalized = normalizeSubPath(rest);
+    return {
+      varName,
+      subPath: normalized.subPath,
+      wildcard: normalized.wildcard
+    };
+  }
+  const bracketMatch = raw.match(/^ctx\s*\[\s*(['"])([a-zA-Z_$][a-zA-Z0-9_$]*)\1\s*\]([\s\S]*)$/);
+  if (bracketMatch) {
+    const varName = bracketMatch[2] || "";
+    const rest = bracketMatch[3] || "";
+    const normalized = normalizeSubPath(rest);
+    return {
+      varName,
+      subPath: normalized.subPath,
+      wildcard: normalized.wildcard
+    };
+  }
+  return null;
+}
+__name(extractCtxRootUsage, "extractCtxRootUsage");
 function extractUsedVariablePathsFromRunJS(code) {
   if (typeof code !== "string" || !code.trim()) return {};
   const src = stripStringsAndComments(code);
@@ -242,23 +270,25 @@ function extractUsedVariablePathsFromRunJS(code) {
     set.add(subPath || "");
     usage.set(varName, set);
   }, "add");
+  const addCtxUsage = /* @__PURE__ */ __name((expr) => {
+    const hit = extractCtxRootUsage(expr);
+    if (!(hit == null ? void 0 : hit.varName)) return;
+    add(hit.varName, hit.wildcard ? "" : hit.subPath);
+  }, "addCtxUsage");
   const dotRe = /ctx\.([a-zA-Z_$][a-zA-Z0-9_$]*(?:(?:\.[a-zA-Z_$][a-zA-Z0-9_$]*)|(?:\[[^\]]+\]))*)(?!\s*\()/g;
   let match;
   while (match = dotRe.exec(src)) {
-    const pathAfterCtx = match[1] || "";
-    const firstKeyMatch = pathAfterCtx.match(/^([a-zA-Z_$][a-zA-Z0-9_$]*)/);
-    if (!firstKeyMatch) continue;
-    const firstKey = firstKeyMatch[1];
-    const rest = pathAfterCtx.slice(firstKey.length);
-    const { subPath, wildcard } = normalizeSubPath(rest);
-    add(firstKey, wildcard ? "" : subPath);
+    addCtxUsage(`ctx.${match[1] || ""}`);
   }
   const bracketRootRe = /ctx\s*\[\s*(['"])([a-zA-Z_$][a-zA-Z0-9_$]*)\1\s*\]((?:(?:\.[a-zA-Z_$][a-zA-Z0-9_$]*)|(?:\[[^\]]+\]))*)(?!\s*\()/g;
   while (match = bracketRootRe.exec(srcWithStrings)) {
-    const varName = match[2] || "";
-    const rest = match[3] || "";
-    const { subPath, wildcard } = normalizeSubPath(rest);
-    add(varName, wildcard ? "" : subPath);
+    addCtxUsage(`ctx['${match[2] || ""}']${match[3] || ""}`);
+  }
+  const getVarRe = /ctx\.getVar\s*\(\s*(['"])((?:\\.|(?!\1)[\s\S])*)\1\s*\)/g;
+  while (match = getVarRe.exec(srcWithStrings)) {
+    const expr = String(match[2] || "").replace(/\\'/g, "'").replace(/\\"/g, '"').trim();
+    if (!expr.startsWith("ctx")) continue;
+    addCtxUsage(expr);
   }
   const out = {};
   for (const [k, set] of usage.entries()) {

package/lib/utils/schema-utils.d.ts

@@ -9,7 +9,7 @@
 import type { ISchema } from '@formily/json-schema';
 import type { FlowModel } from '../models';
 import { FlowRuntimeContext } from '../flowContext';
-import type { StepDefinition, StepUIMode } from '../types';
+import type { EventDefinition, StepDefinition, StepUIMode } from '../types';
 /**
  * 解析 uiMode，支持静态值和函数形式
  * 函数可以接收 FlowRuntimeContext
@@ -38,6 +38,12 @@ export declare function compileUiSchema(scope: Record<string, any>, uiSchema: an
  * @returns 合并后的uiSchema对象，如果为空则返回null
  */
 export declare function resolveStepUiSchema<TModel extends FlowModel = FlowModel>(model: TModel, flow: any, step: StepDefinition): Promise<Record<string, ISchema> | null>;
+/**
+ * 判断事件在设置菜单中是否应被隐藏。
+ * - 支持 EventDefinition.hideInSettings。
+ * - hideInSettings 可为布尔值或函数（接收 FlowRuntimeContext）。
+ */
+export declare function shouldHideEventInSettings<TModel extends FlowModel = FlowModel>(model: TModel, flow: any, event: EventDefinition<TModel> | undefined): Promise<boolean>;
 /**
  * 判断步骤在设置菜单中是否应被隐藏。
  * - 支持 StepDefinition.hideInSettings 与 ActionDefinition.hideInSettings（step 优先）。

package/lib/utils/schema-utils.js

@@ -31,6 +31,7 @@ __export(schema_utils_exports, {
   resolveStepDisabledInSettings: () => resolveStepDisabledInSettings,
   resolveStepUiSchema: () => resolveStepUiSchema,
   resolveUiMode: () => resolveUiMode,
+  shouldHideEventInSettings: () => shouldHideEventInSettings,
   shouldHideStepInSettings: () => shouldHideStepInSettings
 });
 module.exports = __toCommonJS(schema_utils_exports);
@@ -195,6 +196,23 @@ async function resolveStepUiSchema(model, flow, step) {
   return resolvedStepUiSchema;
 }
 __name(resolveStepUiSchema, "resolveStepUiSchema");
+async function shouldHideEventInSettings(model, flow, event) {
+  if (!event) return true;
+  const { hideInSettings } = event;
+  if (typeof hideInSettings === "function") {
+    try {
+      const ctx = new import_flowContext.FlowRuntimeContext(model, flow.key, "settings");
+      (0, import_setupRuntimeContextSteps.setupRuntimeContextSteps)(ctx, flow.steps || {}, model, flow.key);
+      const result = await hideInSettings(ctx);
+      return !!result;
+    } catch (error) {
+      console.warn(`Error evaluating hideInSettings for event '${event.name || ""}' in flow '${flow.key}':`, error);
+      return false;
+    }
+  }
+  return !!hideInSettings;
+}
+__name(shouldHideEventInSettings, "shouldHideEventInSettings");
 async function shouldHideStepInSettings(model, flow, step) {
   var _a;
   if (!step) return true;
@@ -283,5 +301,6 @@ __name(resolveStepDisabledInSettings, "resolveStepDisabledInSettings");
   resolveStepDisabledInSettings,
   resolveStepUiSchema,
   resolveUiMode,
+  shouldHideEventInSettings,
   shouldHideStepInSettings
 });

package/lib/views/FlowView.d.ts

@@ -10,6 +10,11 @@
 import { PopoverProps as AntdPopoverProps } from 'antd';
 import { FlowContext } from '../flowContext';
 import { ViewNavigation } from './ViewNavigation';
+export type FlowViewBeforeClosePayload = {
+    result?: any;
+    force?: boolean;
+};
+export type FlowViewBeforeCloseHandler = (payload: FlowViewBeforeClosePayload) => Promise<boolean | void> | boolean | void;
 export type FlowView = {
     type: 'drawer' | 'popover' | 'dialog' | 'embed';
     inputArgs: any;
@@ -20,8 +25,9 @@ export type FlowView = {
     Footer: React.FC<{
         children?: React.ReactNode;
     }> | null;
-    close: (result?: any, force?: boolean) => void;
+    close: (result?: any, force?: boolean) => Promise<boolean | void> | boolean | void;
     update: (newConfig: any) => void;
+    beforeClose?: FlowViewBeforeCloseHandler;
     navigation?: ViewNavigation;
     /** 页面的销毁方法 */
     destroy?: () => void;

package/lib/views/FlowView.js

@@ -47,11 +47,21 @@ const _FlowViewer = class _FlowViewer {
     if (this.types[type]) {
       zIndex += 1;
       const onClose = others.onClose;
+      let zIndexReleased = false;
+      const releaseZIndex = /* @__PURE__ */ __name(() => {
+        if (!zIndexReleased) {
+          zIndexReleased = true;
+          zIndex -= 1;
+        }
+      }, "releaseZIndex");
       const _zIndex = others.zIndex;
       others.onClose = (...args) => {
         onClose == null ? void 0 : onClose(...args);
-        zIndex -= 1;
+        releaseZIndex();
       };
+      if (type === "embed") {
+        others.onOpenCancelled = releaseZIndex;
+      }
       if (type !== "embed") {
         others.zIndex = _zIndex ?? this.getNextZIndex();
       }

package/lib/views/PageComponent.js

@@ -55,8 +55,9 @@ const PageComponent = (0, import_react.forwardRef)((props, ref) => {
     hidden,
     title: _title,
     styles = {},
-    zIndex = 4
+    zIndex = 4,
     // 这个默认值是为了防止表格的阴影显示到子页面上面
+    onClose
   } = mergedProps;
   const closedRef = (0, import_react.useRef)(false);
   const flowEngine = (0, import_provider.useFlowEngine)();
@@ -114,11 +115,12 @@ const PageComponent = (0, import_react.forwardRef)((props, ref) => {
           type: "text",
           size: "small",
           icon: /* @__PURE__ */ import_react.default.createElement(import_icons.CloseOutlined, null),
-          onClick: () => {
-            var _a;
+          onClick: async () => {
             if (!closedRef.current) {
-              closedRef.current = true;
-              (_a = props.onClose) == null ? void 0 : _a.call(props);
+              const closed = await (onClose == null ? void 0 : onClose());
+              if (closed !== false) {
+                closedRef.current = true;
+              }
             }
           },
           style: {
@@ -138,7 +140,7 @@ const PageComponent = (0, import_react.forwardRef)((props, ref) => {
       )),
       extra && /* @__PURE__ */ import_react.default.createElement("div", null, extra)
     );
-  }, [header, _title, flowEngine.context.themeToken, styles.header, props.onClose]);
+  }, [header, _title, flowEngine.context.themeToken, styles.header, onClose]);
   const FooterComponent = (0, import_react.useMemo)(() => {
     if (!footer) return null;
     const token = flowEngine.context.themeToken;

package/lib/views/ViewNavigation.d.ts

@@ -11,6 +11,14 @@ import { ViewParam as SharedViewParam } from '../utils';
 type ViewParams = Omit<SharedViewParam, 'viewUid'> & {
     viewUid?: string;
 };
+export interface GeneratePathnameFromViewParamsOptions {
+    prefix?: string;
+    basePath?: string;
+}
+export interface ViewNavigationOptions {
+    basePath?: string;
+    layoutBasePath?: string;
+}
 /**
  * 将 ViewParam 数组转换为 pathname
  *
@@ -24,12 +32,13 @@ type ViewParams = Omit<SharedViewParam, 'viewUid'> & {
  * generatePathnameFromViewParams([{ viewUid: 'xxx' }, { viewUid: 'yyy' }]) // '/admin/xxx/view/yyy'
  * ```
  */
-export declare function generatePathnameFromViewParams(viewParams: ViewParams[]): string;
+export declare function generatePathnameFromViewParams(viewParams: ViewParams[], options?: GeneratePathnameFromViewParamsOptions): string;
 export declare class ViewNavigation {
     viewStack: ReadonlyArray<ViewParams>;
     ctx: FlowEngineContext;
     viewParams: ViewParams;
-    constructor(ctx: FlowEngineContext, viewParams: ViewParams[]);
+    private readonly basePath?;
+    constructor(ctx: FlowEngineContext, viewParams: ViewParams[], options?: ViewNavigationOptions);
     setViewStack(viewParams: ViewParams[]): void;
     changeTo(viewParam: ViewParams): void;
     navigateTo(viewParam: ViewParams, opts?: {
@@ -37,5 +46,6 @@ export declare class ViewNavigation {
         state?: any;
     }): void;
     back(): void;
+    private getLayoutBasePath;
 }
 export {};

package/lib/views/ViewNavigation.js

@@ -43,11 +43,21 @@ function encodeFilterByTk(val) {
   return encodeURIComponent(String(val));
 }
 __name(encodeFilterByTk, "encodeFilterByTk");
-function generatePathnameFromViewParams(viewParams) {
+function hasUsableSourceId(sourceId) {
+  return sourceId !== void 0 && sourceId !== null && String(sourceId) !== "";
+}
+__name(hasUsableSourceId, "hasUsableSourceId");
+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");
@@ -62,8 +72,8 @@ function generatePathnameFromViewParams(viewParams) {
         segments.push("filterbytk", encoded);
       }
     }
-    if (viewParam.sourceId) {
-      segments.push("sourceid", viewParam.sourceId);
+    if (hasUsableSourceId(viewParam.sourceId)) {
+      segments.push("sourceid", String(viewParam.sourceId));
     }
   });
   return "/" + segments.join("/");
@@ -74,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
     });
@@ -92,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;