@nocobase/flow-engine 2.0.0-alpha.4 → 2.0.0-alpha.40

package/lib/utils/params-resolvers.js

@@ -44,8 +44,8 @@ __export(params_resolvers_exports, {
   resolveExpressions: () => resolveExpressions
 });
 module.exports = __toCommonJS(params_resolvers_exports);
+var import_shared = require("@nocobase/shared");
 var import_lodash = __toESM(require("lodash"));
-var import_client = require("@nocobase/utils/client");
 async function resolveDefaultParams(defaultParams, ctx) {
   if (!defaultParams) {
     return {};
@@ -275,9 +275,9 @@ async function compileExpression(expression, ctx) {
     if (!first) return void 0;
     const base = await ctx[first];
     if (segs.length === 0) return base;
-    return (0, import_client.getValuesByPath)(base, segs.join("."));
+    return (0, import_shared.getValuesByPath)(base, segs.join("."));
   }, "resolveDotOnlyPath");
-  const singleMatch = expression.match(/^\{\{\s*(.+)\s*\}\}$/);
+  const singleMatch = expression.match(/^\s*\{\{\s*([^{}]+?)\s*\}\}\s*$/);
   if (singleMatch) {
     const inner = singleMatch[1];
     const dotPath = matchDotOnly(inner);

package/lib/utils/parsePathnameToViewParams.d.ts

@@ -12,7 +12,7 @@ export interface ViewParam {
     /** 标签页唯一标识符 */
     tabUid?: string;
     /** 弹窗记录的 id */
-    filterByTk?: string;
+    filterByTk?: string | Record<string, string | number>;
     /** source Id */
     sourceId?: string;
 }

package/lib/utils/parsePathnameToViewParams.js

@@ -54,16 +54,52 @@ const parsePathnameToViewParams = /* @__PURE__ */ __name((pathname) => {
         break;
       }
     } else if (currentView && i + 1 < segments.length) {
-      const value = segments[i + 1];
+      const rawValue = segments[i + 1];
+      let decoded = rawValue;
+      try {
+        decoded = decodeURIComponent(rawValue);
+      } catch (_) {
+      }
       switch (segment) {
         case "tab":
-          currentView.tabUid = value;
+          currentView.tabUid = decoded;
           break;
-        case "filterbytk":
-          currentView.filterByTk = value;
+        case "filterbytk": {
+          const parseKeyValuePairs = /* @__PURE__ */ __name((s) => {
+            const obj = {};
+            s.split("&").forEach((pair) => {
+              const [k, v = ""] = pair.split("=");
+              if (!k) return;
+              try {
+                const key = decodeURIComponent(k);
+                const val = decodeURIComponent(v);
+                obj[key] = val;
+              } catch (_) {
+                obj[k] = v;
+              }
+            });
+            return obj;
+          }, "parseKeyValuePairs");
+          let parsed = decoded;
+          if (decoded && (decoded.startsWith("{") || decoded.startsWith("["))) {
+            try {
+              const maybe = JSON.parse(decoded);
+              if (maybe && typeof maybe === "object" && !Array.isArray(maybe)) {
+                parsed = maybe;
+              } else {
+                parsed = decoded;
+              }
+            } catch (_) {
+              parsed = decoded;
+            }
+          } else if (decoded && decoded.includes("=") && decoded.includes("&")) {
+            parsed = parseKeyValuePairs(decoded);
+          }
+          currentView.filterByTk = parsed;
           break;
+        }
         case "sourceid":
-          currentView.sourceId = value;
+          currentView.sourceId = decoded;
           break;
         default:
           break;

package/lib/utils/pruneFilter.d.ts

@@ -0,0 +1,21 @@
+/**
+ * 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.
+ */
+/**
+ * 递归清理筛选对象中的“空值”。
+ *
+ * 规则：
+ * - 移除：`null`、`undefined`、空字符串 `''`、空数组 `[]`、空对象 `{}`；
+ * - 保留：`false`、`0` 等有意义的“假值”。
+ *
+ * 注意：当清理后整体变为空结构时，返回 `undefined`，用于表示无需下发该条件。
+ *
+ * @param input 任意筛选对象/数组/原始值
+ * @returns 清理后的对象；若为空则返回 `undefined`
+ */
+export declare function pruneFilter<T = any>(input: T): T | undefined;

package/lib/{runjs-context/snippets/global/try-catch-async.snippet.js → utils/pruneFilter.js}

@@ -11,6 +11,7 @@ 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 });
@@ -24,21 +25,28 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var try_catch_async_snippet_exports = {};
-__export(try_catch_async_snippet_exports, {
-  default: () => try_catch_async_snippet_default
+var pruneFilter_exports = {};
+__export(pruneFilter_exports, {
+  pruneFilter: () => pruneFilter
 });
-module.exports = __toCommonJS(try_catch_async_snippet_exports);
-var try_catch_async_snippet_default = {
-  contexts: ["*"],
-  prefix: "sn-try",
-  label: "Try/catch template",
-  description: "Async try/catch template with toast message",
-  content: `
-try {
-  // await some async work
-} catch (e) {
-  ctx.message.error(ctx.t('Operation failed: {{msg}}', { msg: String(e?.message || e) }));
+module.exports = __toCommonJS(pruneFilter_exports);
+function pruneFilter(input) {
+  if (Array.isArray(input)) {
+    const arr = input.map((v) => pruneFilter(v)).filter((v) => v !== void 0);
+    return arr.length ? arr : void 0;
+  }
+  if (input && typeof input === "object") {
+    const out = {};
+    Object.keys(input).forEach((k) => {
+      const v = pruneFilter(input[k]);
+      if (v !== void 0) out[k] = v;
+    });
+    return Object.keys(out).length ? out : void 0;
+  }
+  return input === null || input === void 0 || typeof input === "string" && input === "" ? void 0 : input;
 }
-`
-};
+__name(pruneFilter, "pruneFilter");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  pruneFilter
+});

package/lib/utils/safeGlobals.d.ts

@@ -7,10 +7,12 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 /**
- * 统一的安全全局对象代理：window/document
- * - 默认仅允许常用的定时器、console、Math、Date、addEventListener（绑定原 window）
- * - document 仅允许 createElement/querySelector/querySelectorAll
+ * 统一的安全全局对象代理：window/document/navigator
+ * - window：仅允许常用的定时器、console、Math、Date、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 createSafeNavigator(extra?: Record<string, any>): {};

package/lib/utils/safeGlobals.js

@@ -28,6 +28,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var safeGlobals_exports = {};
 __export(safeGlobals_exports, {
   createSafeDocument: () => createSafeDocument,
+  createSafeNavigator: () => createSafeNavigator,
   createSafeWindow: () => createSafeWindow
 });
 module.exports = __toCommonJS(safeGlobals_exports);
@@ -172,8 +173,47 @@ function createSafeDocument(extra) {
   );
 }
 __name(createSafeDocument, "createSafeDocument");
+function createSafeNavigator(extra) {
+  var _a;
+  const nav = typeof window !== "undefined" && window.navigator || void 0;
+  const clipboard = {};
+  const writeText = (_a = nav == null ? void 0 : nav.clipboard) == null ? void 0 : _a.writeText;
+  if (typeof writeText === "function") {
+    clipboard.writeText = writeText.bind(nav.clipboard);
+  }
+  const allowed = {
+    clipboard
+  };
+  Object.defineProperty(allowed, "onLine", {
+    get: /* @__PURE__ */ __name(() => !!(nav == null ? void 0 : nav.onLine), "get"),
+    enumerable: true,
+    configurable: false
+  });
+  Object.defineProperty(allowed, "language", {
+    get: /* @__PURE__ */ __name(() => nav == null ? void 0 : nav.language, "get"),
+    enumerable: true,
+    configurable: false
+  });
+  Object.defineProperty(allowed, "languages", {
+    get: /* @__PURE__ */ __name(() => (nav == null ? void 0 : nav.languages) ? [...nav.languages] : void 0, "get"),
+    enumerable: true,
+    configurable: false
+  });
+  Object.assign(allowed, extra || {});
+  return new Proxy(
+    {},
+    {
+      get(_t, prop) {
+        if (prop in allowed) return allowed[prop];
+        throw new Error(`Access to navigator property "${String(prop)}" is not allowed.`);
+      }
+    }
+  );
+}
+__name(createSafeNavigator, "createSafeNavigator");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   createSafeDocument,
+  createSafeNavigator,
   createSafeWindow
 });

package/lib/utils/schema-utils.js

@@ -131,14 +131,14 @@ function compileUiSchema(scope, uiSchema, options = {}) {
 }
 __name(compileUiSchema, "compileUiSchema");
 async function resolveStepUiSchema(model, flow, step) {
-  var _a, _b;
+  var _a;
   const flowRuntimeContext = new import_flowContext.FlowRuntimeContext(model, flow.key, "settings");
   (0, import_setupRuntimeContextSteps.setupRuntimeContextSteps)(flowRuntimeContext, flow.steps, model, flow.key);
   flowRuntimeContext.defineProperty("currentStep", { value: step });
   let stepUiSchema = step.uiSchema;
   if (step.use) {
     try {
-      const action = (_b = (_a = model.flowEngine) == null ? void 0 : _a.getAction) == null ? void 0 : _b.call(_a, step.use);
+      const action = (_a = model.getAction) == null ? void 0 : _a.call(model, step.use);
       if (action && action.uiSchema) {
         stepUiSchema = stepUiSchema || action.uiSchema;
       }

package/lib/utils/serverContextParams.d.ts

@@ -12,6 +12,7 @@ export type RecordRef = {
     id?: any;
     filterByTk?: any;
     dataSourceKey?: string;
+    sourceId?: any;
     fields?: string[];
     appends?: string[];
     record?: any;

package/lib/utils/translation.d.ts

@@ -14,5 +14,8 @@ import type { FlowModel } from '../models';
  * @returns 翻译函数，自动使用 flow-engine 命名空间
  */
 export declare function getT(model: FlowModel): (key: string, options?: any) => string;
+export declare function tExpr(text: TFuncKey | TFuncKey[], options?: TOptions): string;
+/**
+ * @deprecated use tExpr from `@nocobase/flow-engine` instead
+ */
 export declare function escapeT(text: TFuncKey | TFuncKey[], options?: TOptions): string;
-export { escapeT as tExpr };

package/lib/utils/translation.js

@@ -29,7 +29,7 @@ var translation_exports = {};
 __export(translation_exports, {
   escapeT: () => escapeT,
   getT: () => getT,
-  tExpr: () => escapeT
+  tExpr: () => tExpr
 });
 module.exports = __toCommonJS(translation_exports);
 var import_constants = require("./constants");
@@ -43,12 +43,16 @@ function getT(model) {
   return (key) => key;
 }
 __name(getT, "getT");
-function escapeT(text, options) {
+function tExpr(text, options) {
   if (options) {
     return `{{t(${JSON.stringify(text)}, ${JSON.stringify(options)})}}`;
   }
   return `{{t(${JSON.stringify(text)})}}`;
 }
+__name(tExpr, "tExpr");
+function escapeT(text, options) {
+  return tExpr(text, options);
+}
 __name(escapeT, "escapeT");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/utils/variablesParams.d.ts

@@ -6,11 +6,13 @@
  * 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 type { FlowContext, PropertyMeta, PropertyMetaFactory } from '../flowContext';
-import type { JSONValue } from './params-resolvers';
+import { extractUsedVariableNames as _extractUsedVariableNames, extractUsedVariablePaths as _extractUsedVariablePaths } from '@nocobase/shared';
 import type { Collection } from '../data-source';
+import type { FlowContext, PropertyMeta, PropertyMetaFactory } from '../flowContext';
 import { type RecordRef, type ServerContextParams } from '../utils/serverContextParams';
+import type { JSONValue } from './params-resolvers';
 export declare function inferRecordRef(ctx: FlowContext): RecordRef | undefined;
+export declare function inferViewRecordRef(ctx: FlowContext): RecordRef | undefined;
 export declare function inferParentRecordRef(ctx: FlowContext): RecordRef | undefined;
 export type RecordParamsBuilder = (ctx: FlowContext) => RecordRef | Promise<RecordRef> | undefined;
 /**
@@ -27,12 +29,14 @@ export declare function createRecordMetaFactory(collectionAccessor: () => Collec
  * - Title: t('Current record')
  * - Params: inferRecordRef(ctx)
  */
-export declare function createCurrentRecordMetaFactory(ctx: FlowContext, collectionAccessor: () => Collection | null): PropertyMetaFactory;
+export declare function createCurrentRecordMetaFactory(ctx: FlowContext, collectionAccessor: () => Collection | null, options?: {
+    title?: string;
+}): PropertyMetaFactory;
 /**
  * Extract top-level ctx variable names used inside a JSON template.
  * Supports dot and bracket notations, e.g. {{ ctx.record.id }}, {{ ctx['parentRecord'].name }}.
  */
-export declare const extractUsedVariableNames: any;
+export declare const extractUsedVariableNames: typeof _extractUsedVariableNames;
 /**
  * Extract used top-level ctx variables with their subpaths.
  * Returns a map: varName -> string[] subPaths
@@ -42,7 +46,7 @@ export declare const extractUsedVariableNames: any;
  *  - {{ ctx.view.record.id }} => { view: ['record.id'] }
  *  - {{ ctx.twice(21) }}      => { twice: [''] } // method call -> empty subPath
  */
-export declare const extractUsedVariablePaths: any;
+export declare const extractUsedVariablePaths: typeof _extractUsedVariablePaths;
 /**
  * 根据模板中用到的 ctx 变量，收集并构建服务端解析所需的 contextParams。
  * - 通过 FlowContext 的 PropertyMeta.buildVariablesParams 收集 RecordRef

package/lib/utils/variablesParams.js

@@ -34,12 +34,13 @@ __export(variablesParams_exports, {
   extractUsedVariableNames: () => extractUsedVariableNames,
   extractUsedVariablePaths: () => extractUsedVariablePaths,
   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");
+var import_createCollectionContextMeta = require("./createCollectionContextMeta");
 function isObject(value) {
   return typeof value === "object" && value !== null;
 }
@@ -71,14 +72,27 @@ function inferRecordRef(ctx) {
   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 sourceId = inputArgs == null ? void 0 : inputArgs.sourceId;
+  if (!collection || typeof filterByTk === "undefined" || filterByTk === null) return void 0;
+  return { collection, dataSourceKey, filterByTk, sourceId };
+}
+__name(inferViewRecordRef, "inferViewRecordRef");
 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 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 };
 }
@@ -98,43 +112,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:
@@ -146,5 +156,6 @@ __name(collectContextParamsForTemplate, "collectContextParamsForTemplate");
   extractUsedVariableNames,
   extractUsedVariablePaths,
   inferParentRecordRef,
-  inferRecordRef
+  inferRecordRef,
+  inferViewRecordRef
 });

package/lib/views/DrawerComponent.js

@@ -42,12 +42,13 @@ __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,
     () => ({
@@ -75,6 +76,24 @@ 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: () => {
+          var _a2;
+          setOpen(false);
+          (_a2 = drawerProps.afterClose) == null ? void 0 : _a2.call(drawerProps);
+        }
+      },
+      children
+    );
+  }
   return /* @__PURE__ */ React.createElement(
     import_antd.Drawer,
     {

package/lib/views/PageComponent.js

@@ -56,7 +56,8 @@ const PageComponent = (0, import_react.forwardRef)((props, ref) => {
     hidden,
     title: _title,
     styles = {},
-    zIndex
+    zIndex = 4
+    // 这个默认值是为了防止表格的阴影显示到子页面上面
   } = mergedProps;
   const closedRef = (0, import_react.useRef)(false);
   const flowEngine = (0, import_provider.useFlowEngine)();

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 ViewParam = Omit<SharedViewParam, 'viewUid'> & {
     viewUid?: string;
-    /** 标签页唯一标识符 */
-    tabUid?: string;
-    /** 弹窗记录的 id */
-    filterByTk?: string;
-    /** source Id */
-    sourceId?: string;
-}
+};
 /**
  * 将 ViewParam 数组转换为 pathname
  *

package/lib/views/ViewNavigation.js

@@ -31,6 +31,17 @@ __export(ViewNavigation_exports, {
   generatePathnameFromViewParams: () => generatePathnameFromViewParams
 });
 module.exports = __toCommonJS(ViewNavigation_exports);
+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 +55,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);

package/lib/views/createViewMeta.d.ts

@@ -7,10 +7,38 @@
  * 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
  */
-export declare function createViewMeta(ctx: FlowContext, getView: () => any): PropertyMetaFactory;
+export declare function createViewMeta(ctx: FlowContext): PropertyMetaFactory;
+/**
+ * 为 ctx.popup 构建元信息：
+ * - popup.record：当前弹窗记录（服务端解析）
+ * - popup.resource：数据源信息（前端解析）
+ * - popup.parent：上级弹窗（无限级，前端解析；不存在则禁用/为空）
+ */
+export declare function createPopupMeta(ctx: FlowContext, anchorView?: FlowView): PropertyMetaFactory;
+/**
+ * 根据视图堆栈构建 popup 运行时值（resource + parent 链）
+ */
+interface PopupNodeResource {
+    dataSourceKey: string;
+    collectionName?: 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 {};