@nocobase/flow-engine 2.0.0-alpha.7 → 2.0.0-alpha.71

package/lib/utils/variablesParams.js

@@ -7,9 +7,11 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
@@ -24,6 +26,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var variablesParams_exports = {};
 __export(variablesParams_exports, {
@@ -31,60 +41,130 @@ __export(variablesParams_exports, {
   collectContextParamsForTemplate: () => collectContextParamsForTemplate,
   createCurrentRecordMetaFactory: () => createCurrentRecordMetaFactory,
   createRecordMetaFactory: () => createRecordMetaFactory,
+  createRecordResolveOnServerWithLocal: () => createRecordResolveOnServerWithLocal,
+  createViewRecordResolveOnServer: () => createViewRecordResolveOnServer,
   extractUsedVariableNames: () => extractUsedVariableNames,
   extractUsedVariablePaths: () => extractUsedVariablePaths,
+  getViewRecordFromParent: () => getViewRecordFromParent,
   inferParentRecordRef: () => inferParentRecordRef,
-  inferRecordRef: () => inferRecordRef
+  inferRecordRef: () => inferRecordRef,
+  inferViewRecordRef: () => inferViewRecordRef
 });
 module.exports = __toCommonJS(variablesParams_exports);
-var import_createCollectionContextMeta = require("./createCollectionContextMeta");
+var import_shared = require("@nocobase/shared");
 var import_serverContextParams = require("../utils/serverContextParams");
-var import_client = require("@nocobase/utils/client");
-function isObject(value) {
-  return typeof value === "object" && value !== null;
-}
-__name(isObject, "isObject");
-function getResource(ctx) {
-  const r = ctx["resource"];
-  return isObject(r) ? r : void 0;
-}
-__name(getResource, "getResource");
-function getCollection(ctx) {
-  const c = ctx["collection"];
-  if (isObject(c)) {
-    const mc = c;
-    return { name: mc.name, dataSourceKey: mc.dataSourceKey };
-  }
-  return void 0;
-}
-__name(getCollection, "getCollection");
+var import_createCollectionContextMeta = require("./createCollectionContextMeta");
+var import_associationObjectVariable = require("./associationObjectVariable");
+var import_lodash = __toESM(require("lodash"));
 function inferRecordRef(ctx) {
-  var _a, _b, _c;
-  const resource = getResource(ctx);
-  const collectionObj = getCollection(ctx);
+  var _a, _b, _c, _d;
+  const resource = ctx.resource;
+  const collectionObj = ctx.collection;
+  const recordValue = ctx.record;
   const resourceName = (collectionObj == null ? void 0 : collectionObj.name) || ((_a = resource == null ? void 0 : resource.getResourceName) == null ? void 0 : _a.call(resource));
   const dataSourceKey = (collectionObj == null ? void 0 : collectionObj.dataSourceKey) || ((_b = resource == null ? void 0 : resource.getDataSourceKey) == null ? void 0 : _b.call(resource));
-  const filterByTk = (_c = resource == null ? void 0 : resource.getFilterByTk) == null ? void 0 : _c.call(resource);
+  const filterByTk = ((_c = resource == null ? void 0 : resource.getFilterByTk) == null ? void 0 : _c.call(resource)) ?? ((_d = collectionObj == null ? void 0 : collectionObj.getFilterByTK) == null ? void 0 : _d.call(collectionObj, recordValue));
   if (!resourceName || typeof filterByTk === "undefined" || filterByTk === null) return void 0;
   const parts = String(resourceName).split(".");
   const collection = parts[parts.length - 1];
   return { collection, dataSourceKey, filterByTk };
 }
 __name(inferRecordRef, "inferRecordRef");
+function inferViewRecordRef(ctx) {
+  var _a, _b, _c;
+  const view = ctx.view;
+  if (!view) return void 0;
+  const inputArgs = (view == null ? void 0 : view.inputArgs) || {};
+  const collection = (inputArgs == null ? void 0 : inputArgs.collectionName) || ((_a = view == null ? void 0 : view.record) == null ? void 0 : _a.collection);
+  const dataSourceKey = (inputArgs == null ? void 0 : inputArgs.dataSourceKey) || ((_b = view == null ? void 0 : view.record) == null ? void 0 : _b.dataSourceKey) || "main";
+  const filterByTk = (inputArgs == null ? void 0 : inputArgs.filterByTk) || ((_c = view == null ? void 0 : view.record) == null ? void 0 : _c.filterByTk);
+  const associationName = inputArgs == null ? void 0 : inputArgs.associationName;
+  const sourceId = inputArgs == null ? void 0 : inputArgs.sourceId;
+  if (!collection || typeof filterByTk === "undefined" || filterByTk === null) return void 0;
+  return { collection, dataSourceKey, filterByTk, sourceId, associationName };
+}
+__name(inferViewRecordRef, "inferViewRecordRef");
+function getViewRecordFromParent(flowContext, viewContext) {
+  var _a, _b, _c;
+  const parentRecord = (_a = flowContext.inputArgs) == null ? void 0 : _a.record;
+  const parentTk = (_b = flowContext.collection) == null ? void 0 : _b.filterTargetKey;
+  if (!parentRecord || !parentTk) return void 0;
+  const view = viewContext.view;
+  const viewFilterByTk = (_c = view == null ? void 0 : view.inputArgs) == null ? void 0 : _c.filterByTk;
+  const recordFilterByTk = parentRecord[parentTk];
+  if (viewFilterByTk == null || recordFilterByTk == null) return void 0;
+  if (viewFilterByTk !== recordFilterByTk) return void 0;
+  return import_lodash.default.cloneDeep(parentRecord);
+}
+__name(getViewRecordFromParent, "getViewRecordFromParent");
+function createViewRecordResolveOnServer(ctx, getLocalRecord) {
+  return (p) => {
+    var _a, _b, _c, _d;
+    if (!(p === "record" || p.startsWith("record."))) return false;
+    const local = getLocalRecord();
+    if (!local) return true;
+    if (p === "record") return false;
+    const ref = inferViewRecordRef(ctx);
+    const colName = ref == null ? void 0 : ref.collection;
+    const dsKey = (ref == null ? void 0 : ref.dataSourceKey) || "main";
+    if (!colName) return true;
+    const ds = (_b = (_a = ctx.dataSourceManager) == null ? void 0 : _a.getDataSource) == null ? void 0 : _b.call(_a, dsKey);
+    const collection = (_d = (_c = ds == null ? void 0 : ds.collectionManager) == null ? void 0 : _c.getCollection) == null ? void 0 : _d.call(_c, colName);
+    if (!collection) return true;
+    const resolver = (0, import_associationObjectVariable.createAssociationSubpathResolver)(
+      () => collection,
+      () => local
+    );
+    const subPath = p.startsWith("record.") ? p.slice("record.".length) : "";
+    if (!subPath) return false;
+    return resolver(subPath);
+  };
+}
+__name(createViewRecordResolveOnServer, "createViewRecordResolveOnServer");
+function createRecordResolveOnServerWithLocal(collectionAccessor, valueAccessor) {
+  const assocSubpathResolver = (0, import_associationObjectVariable.createAssociationSubpathResolver)(collectionAccessor, () => valueAccessor());
+  return (p) => {
+    var _a;
+    const local = valueAccessor();
+    if (!local) return true;
+    if (!p) return false;
+    const collection = collectionAccessor();
+    if (!p.includes(".")) {
+      const name = p;
+      let field;
+      if (collection) {
+        if (typeof collection.getField === "function") {
+          field = collection.getField(name);
+        }
+        if (!field && typeof collection.getFields === "function") {
+          const fields = collection.getFields() || [];
+          field = fields.find((f) => (f == null ? void 0 : f.name) === name);
+        }
+      }
+      const isAssoc = !!((_a = field == null ? void 0 : field.isAssociationField) == null ? void 0 : _a.call(field));
+      if (!isAssoc) return false;
+      const value = local == null ? void 0 : local[name];
+      if (value === void 0 || value === null) return true;
+      return false;
+    }
+    return assocSubpathResolver(p);
+  };
+}
+__name(createRecordResolveOnServerWithLocal, "createRecordResolveOnServerWithLocal");
 function inferParentRecordRef(ctx) {
   var _a, _b, _c, _d;
-  const resource = getResource(ctx);
-  const dataSourceKey = ((_a = getCollection(ctx)) == null ? void 0 : _a.dataSourceKey) || ((_b = resource == null ? void 0 : resource.getDataSourceKey) == null ? void 0 : _b.call(resource));
-  const rn = (_c = resource == null ? void 0 : resource.getResourceName) == null ? void 0 : _c.call(resource);
+  const resource = ctx.resource;
+  const dataSourceKey = ((_a = ctx.collection) == null ? void 0 : _a.dataSourceKey) || ((_b = resource == null ? void 0 : resource.getDataSourceKey) == null ? void 0 : _b.call(resource));
+  const resourceName = (_c = resource == null ? void 0 : resource.getResourceName) == null ? void 0 : _c.call(resource);
   const sourceId = (_d = resource == null ? void 0 : resource.getSourceId) == null ? void 0 : _d.call(resource);
-  if (!rn || typeof sourceId === "undefined" || sourceId === null) return void 0;
-  const parts = String(rn).split(".");
+  if (!resourceName || typeof sourceId === "undefined" || sourceId === null) return void 0;
+  const parts = String(resourceName).split(".");
   if (parts.length < 2) return void 0;
   return { collection: parts[0], dataSourceKey, filterByTk: sourceId };
 }
 __name(inferParentRecordRef, "inferParentRecordRef");
 async function buildRecordMeta(collectionAccessor, title, paramsBuilder) {
-  const base = await (0, import_createCollectionContextMeta.createCollectionContextMeta)(collectionAccessor, title)();
+  const base = await (0, import_createCollectionContextMeta.createCollectionContextMeta)(collectionAccessor, title, true)();
   if (!base) return null;
   return {
     ...base,
@@ -98,43 +178,39 @@ function createRecordMetaFactory(collectionAccessor, title, paramsBuilder) {
   return factory;
 }
 __name(createRecordMetaFactory, "createRecordMetaFactory");
-function createCurrentRecordMetaFactory(ctx, collectionAccessor) {
-  var _a;
-  const title = ((_a = ctx == null ? void 0 : ctx.t) == null ? void 0 : _a.call(ctx, "Current record")) || "Current record";
+function createCurrentRecordMetaFactory(ctx, collectionAccessor, options) {
+  var _a, _b;
+  const title = (options == null ? void 0 : options.title) ? ((_a = ctx.t) == null ? void 0 : _a.call(ctx, options.title)) || options.title : ((_b = ctx.t) == null ? void 0 : _b.call(ctx, "Current record")) || "Current record";
   return createRecordMetaFactory(collectionAccessor, title, (c) => inferRecordRef(c));
 }
 __name(createCurrentRecordMetaFactory, "createCurrentRecordMetaFactory");
-const extractUsedVariableNames = import_client.extractUsedVariableNames;
-const extractUsedVariablePaths = import_client.extractUsedVariablePaths;
+const extractUsedVariableNames = import_shared.extractUsedVariableNames;
+const extractUsedVariablePaths = import_shared.extractUsedVariablePaths;
 async function collectContextParamsForTemplate(ctx, template) {
   var _a;
-  try {
-    const usage = (0, import_client.extractUsedVariablePaths)(template) || {};
-    const varNames = Object.keys(usage);
-    if (!varNames.length) return void 0;
-    const input = {};
-    for (const key of varNames) {
-      const opt = (_a = ctx.getPropertyOptions) == null ? void 0 : _a.call(ctx, key);
-      const meta = opt == null ? void 0 : opt.meta;
-      if (!meta) continue;
-      let built;
-      try {
-        const resolvedMeta = typeof meta === "function" ? await meta() : meta;
-        const builder = resolvedMeta == null ? void 0 : resolvedMeta.buildVariablesParams;
-        if (typeof builder === "function") {
-          built = await builder(ctx);
-        }
-      } catch (err) {
-        continue;
-      }
-      if (built) {
-        input[key] = built;
+  const usage = (0, import_shared.extractUsedVariablePaths)(template) || {};
+  const varNames = Object.keys(usage);
+  if (!varNames.length) return void 0;
+  const input = {};
+  for (const key of varNames) {
+    const opt = (_a = ctx.getPropertyOptions) == null ? void 0 : _a.call(ctx, key);
+    const meta = opt == null ? void 0 : opt.meta;
+    if (!meta) continue;
+    let built;
+    try {
+      const resolvedMeta = typeof meta === "function" ? await meta() : meta;
+      const builder = resolvedMeta == null ? void 0 : resolvedMeta.buildVariablesParams;
+      if (typeof builder === "function") {
+        built = await builder(ctx);
       }
+    } catch (err) {
+      continue;
+    }
+    if (built) {
+      input[key] = built;
     }
-    return (0, import_serverContextParams.buildServerContextParams)(ctx, input);
-  } catch (_) {
-    return void 0;
   }
+  return (0, import_serverContextParams.buildServerContextParams)(ctx, input);
 }
 __name(collectContextParamsForTemplate, "collectContextParamsForTemplate");
 // Annotate the CommonJS export names for ESM import in node:
@@ -143,8 +219,12 @@ __name(collectContextParamsForTemplate, "collectContextParamsForTemplate");
   collectContextParamsForTemplate,
   createCurrentRecordMetaFactory,
   createRecordMetaFactory,
+  createRecordResolveOnServerWithLocal,
+  createViewRecordResolveOnServer,
   extractUsedVariableNames,
   extractUsedVariablePaths,
+  getViewRecordFromParent,
   inferParentRecordRef,
-  inferRecordRef
+  inferRecordRef,
+  inferViewRecordRef
 });

package/lib/views/DialogComponent.js

@@ -82,11 +82,7 @@ const DialogComponent = (0, import_react.forwardRef)(
         getContainer: container,
         ...modalProps,
         open: visible,
-        onCancel: (e) => {
-          var _a;
-          setVisible(false);
-          (_a = config.onCancel) == null ? void 0 : _a.call(config, e);
-        },
+        onCancel: config.onCancel,
         afterClose: () => {
           afterClose == null ? void 0 : afterClose();
         }

package/lib/views/DrawerComponent.js

@@ -42,19 +42,18 @@ __export(DrawerComponent_exports, {
 module.exports = __toCommonJS(DrawerComponent_exports);
 var import_antd = require("antd");
 var React = __toESM(require("react"));
+var import_MobilePopup = require("../components/MobilePopup");
 const DrawerComponent = React.forwardRef((props, ref) => {
   var _a;
-  const { children, footer: initialFooter, title, extra, hidden, ...drawerProps } = props;
+  const { children, footer: initialFooter, title, extra, hidden, isMobile, ...drawerProps } = props;
   const [open, setOpen] = React.useState(true);
   const [footer, setFooter] = React.useState(() => initialFooter);
-  const [header, setHeader] = React.useState({ title, extra });
+  const [header, setHeader] = React.useState({ title, extra, ...drawerProps.header });
   React.useImperativeHandle(
     ref,
     () => ({
       destroy: /* @__PURE__ */ __name(() => {
-        var _a2;
         setOpen(false);
-        (_a2 = drawerProps.afterClose) == null ? void 0 : _a2.call(drawerProps);
       }, "destroy"),
       update: /* @__PURE__ */ __name((newConfig) => {
         Object.assign(drawerProps, newConfig);
@@ -75,6 +74,20 @@ const DrawerComponent = React.forwardRef((props, ref) => {
   const container = React.useMemo(() => {
     return document.querySelector("#nocobase-app-container");
   }, []);
+  if (isMobile) {
+    return /* @__PURE__ */ React.createElement(
+      import_MobilePopup.MobilePopup,
+      {
+        className: hidden ? "nb-hidden" : "",
+        visible: open,
+        ...drawerProps,
+        footer,
+        ...header,
+        onClose: drawerProps.onClose
+      },
+      children
+    );
+  }
   return /* @__PURE__ */ React.createElement(
     import_antd.Drawer,
     {
@@ -89,11 +102,7 @@ const DrawerComponent = React.forwardRef((props, ref) => {
         footer: { display: "flex", justifyContent: "flex-end", ...(_a = drawerProps.styles) == null ? void 0 : _a.footer }
       },
       ...header,
-      onClose: () => {
-        var _a2;
-        setOpen(false);
-        (_a2 = drawerProps.afterClose) == null ? void 0 : _a2.call(drawerProps);
-      }
+      onClose: drawerProps.onClose
     },
     children
   );

package/lib/views/PageComponent.js

@@ -51,12 +51,12 @@ const PageComponent = (0, import_react.forwardRef)((props, ref) => {
     visible = true,
     footer: _footer = null,
     header: _header = null,
-    afterClose,
     children,
     hidden,
     title: _title,
     styles = {},
-    zIndex
+    zIndex = 4
+    // 这个默认值是为了防止表格的阴影显示到子页面上面
   } = mergedProps;
   const closedRef = (0, import_react.useRef)(false);
   const flowEngine = (0, import_provider.useFlowEngine)();
@@ -66,7 +66,6 @@ const PageComponent = (0, import_react.forwardRef)((props, ref) => {
     destroy: /* @__PURE__ */ __name(() => {
       if (!closedRef.current) {
         closedRef.current = true;
-        afterClose == null ? void 0 : afterClose();
       }
     }, "destroy"),
     update: /* @__PURE__ */ __name((newConfig2) => {
@@ -116,9 +115,10 @@ const PageComponent = (0, import_react.forwardRef)((props, ref) => {
           size: "small",
           icon: /* @__PURE__ */ import_react.default.createElement(import_icons.CloseOutlined, null),
           onClick: () => {
+            var _a;
             if (!closedRef.current) {
               closedRef.current = true;
-              afterClose == null ? void 0 : afterClose();
+              (_a = props.onClose) == null ? void 0 : _a.call(props);
             }
           },
           style: {
@@ -138,7 +138,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, afterClose]);
+  }, [header, _title, flowEngine.context.themeToken, styles.header, props.onClose]);
   const FooterComponent = (0, import_react.useMemo)(() => {
     if (!footer) return null;
     const token = flowEngine.context.themeToken;

package/lib/views/ViewNavigation.d.ts

@@ -7,16 +7,10 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { FlowEngineContext } from '../flowContext';
-interface ViewParam {
-    /** 视图唯一标识符，一般为某个 Model 实例的 uid */
+import { ViewParam as SharedViewParam } from '../utils';
+type ViewParams = Omit<SharedViewParam, 'viewUid'> & {
     viewUid?: string;
-    /** 标签页唯一标识符 */
-    tabUid?: string;
-    /** 弹窗记录的 id */
-    filterByTk?: string;
-    /** source Id */
-    sourceId?: string;
-}
+};
 /**
  * 将 ViewParam 数组转换为 pathname
  *
@@ -30,16 +24,18 @@ interface ViewParam {
  * generatePathnameFromViewParams([{ viewUid: 'xxx' }, { viewUid: 'yyy' }]) // '/admin/xxx/view/yyy'
  * ```
  */
-export declare function generatePathnameFromViewParams(viewParams: ViewParam[]): string;
+export declare function generatePathnameFromViewParams(viewParams: ViewParams[]): string;
 export declare class ViewNavigation {
-    viewStack: ViewParam[];
+    viewStack: ReadonlyArray<ViewParams>;
     ctx: FlowEngineContext;
-    constructor(ctx: FlowEngineContext, viewParams: ViewParam[]);
-    changeTo(viewParam: ViewParam): void;
-    navigateTo(viewParam: ViewParam, opts?: {
+    viewParams: ViewParams;
+    constructor(ctx: FlowEngineContext, viewParams: ViewParams[]);
+    setViewStack(viewParams: ViewParams[]): void;
+    changeTo(viewParam: ViewParams): void;
+    navigateTo(viewParam: ViewParams, opts?: {
         replace?: boolean;
         state?: any;
-    }): Promise<void>;
+    }): void;
     back(): void;
 }
 export {};

package/lib/views/ViewNavigation.js

@@ -31,6 +31,18 @@ __export(ViewNavigation_exports, {
   generatePathnameFromViewParams: () => generatePathnameFromViewParams
 });
 module.exports = __toCommonJS(ViewNavigation_exports);
+var import_reactive = require("../reactive");
+function encodeFilterByTk(val) {
+  if (val === void 0 || val === null) return "";
+  if (val && typeof val === "object" && !Array.isArray(val)) {
+    const pairs = Object.entries(val).map(([k, v]) => {
+      return `${encodeURIComponent(String(k))}=${encodeURIComponent(String(v))}`;
+    });
+    return encodeURIComponent(pairs.join("&"));
+  }
+  return encodeURIComponent(String(val));
+}
+__name(encodeFilterByTk, "encodeFilterByTk");
 function generatePathnameFromViewParams(viewParams) {
   if (!viewParams || viewParams.length === 0) {
     return "/admin";
@@ -44,8 +56,11 @@ function generatePathnameFromViewParams(viewParams) {
     if (viewParam.tabUid) {
       segments.push("tab", viewParam.tabUid);
     }
-    if (viewParam.filterByTk) {
-      segments.push("filterbytk", viewParam.filterByTk);
+    if (viewParam.filterByTk != null) {
+      const encoded = encodeFilterByTk(viewParam.filterByTk);
+      if (encoded) {
+        segments.push("filterbytk", encoded);
+      }
     }
     if (viewParam.sourceId) {
       segments.push("sourceid", viewParam.sourceId);
@@ -56,36 +71,39 @@ function generatePathnameFromViewParams(viewParams) {
 __name(generatePathnameFromViewParams, "generatePathnameFromViewParams");
 const _ViewNavigation = class _ViewNavigation {
   viewStack;
+  // 只能通过 setViewStack 修改
   ctx;
+  viewParams;
   constructor(ctx, viewParams) {
-    this.viewStack = [...viewParams];
+    this.setViewStack(viewParams);
     this.ctx = ctx;
+    (0, import_reactive.define)(this, {
+      viewParams: import_reactive.observable
+    });
+  }
+  setViewStack(viewParams) {
+    this.viewStack = Object.freeze([...viewParams]);
+    this.viewParams = this.viewStack[this.viewStack.length - 1] || {};
   }
   changeTo(viewParam) {
-    if (this.viewStack.length === 0) {
-      this.viewStack.push(viewParam);
-    } else {
-      this.viewStack[this.viewStack.length - 1] = { ...this.viewStack[this.viewStack.length - 1], ...viewParam };
-    }
-    const newPathname = generatePathnameFromViewParams(this.viewStack);
+    const newViewStack = this.viewStack.map((item, index) => {
+      if (index === this.viewStack.length - 1) {
+        return { ...item, ...viewParam };
+      }
+      return { ...item };
+    });
+    const newPathname = generatePathnameFromViewParams(newViewStack);
     this.ctx.router.navigate(newPathname, { replace: true });
   }
   navigateTo(viewParam, opts) {
     const newViewPathname = generatePathnameFromViewParams([...this.viewStack, viewParam]);
     const newPathname = newViewPathname;
-    if (location.pathname.endsWith(newPathname)) {
-      return this.ctx.router.navigate(-1);
-    }
     this.ctx.router.navigate(newPathname, opts);
-    if (this.viewStack.length === 0) {
-      this.viewStack.push(viewParam);
-    }
   }
   back() {
-    const pathname = generatePathnameFromViewParams(this.viewStack);
-    if (location.pathname.endsWith(pathname)) {
-      this.ctx.router.navigate(-1);
-    }
+    const prevStack = this.viewStack.slice(0, -1);
+    const prevPath = generatePathnameFromViewParams(prevStack);
+    this.ctx.router.navigate(prevPath, { replace: true });
   }
 };
 __name(_ViewNavigation, "ViewNavigation");

package/lib/views/createViewMeta.d.ts

@@ -7,10 +7,32 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 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
+ * 为 ctx.popup 构建元信息：
+ * - popup.record：当前弹窗记录（服务端解析）
+ * - popup.resource：数据源信息（前端解析）
+ * - popup.parent：上级弹窗（无限级，前端解析；不存在则禁用/为空）
  */
-export declare function createViewMeta(ctx: FlowContext, getView: () => any): PropertyMetaFactory;
+export declare function createPopupMeta(ctx: FlowContext, anchorView?: FlowView): PropertyMetaFactory;
+/**
+ * 根据视图堆栈构建 popup 运行时值（resource + parent 链）
+ */
+interface PopupNodeResource {
+    dataSourceKey: string;
+    collectionName?: string;
+    associationName?: string;
+    filterByTk?: any;
+    sourceId?: any;
+}
+interface PopupNode {
+    uid?: string;
+    resource: PopupNodeResource;
+    parent?: PopupNode;
+}
+export declare function buildPopupRuntime(ctx: FlowContext, view: FlowView): Promise<PopupNode | undefined>;
+/**
+ * 在视图上下文中注册 popup 变量（统一消除重复）
+ */
+export declare function registerPopupVariable(ctx: FlowContext, view: FlowView): void;
+export {};