@nocobase/flow-engine 3.0.0-alpha.5 → 3.0.0-alpha.7

package/lib/flowContext.js

@@ -2384,7 +2384,7 @@ const _FlowEngineContext = class _FlowEngineContext extends BaseFlowEngineContex
       return this.resolveJsonTemplate(template);
     });
     this.defineMethod("resolveJsonTemplate", async function(template) {
-      var _a, _b;
+      var _a, _b, _c;
       const used = (0, import_utils.extractUsedVariablePaths)(template);
       const usedVarNames = Object.keys(used || {});
       if (!usedVarNames.length) {
@@ -2412,13 +2412,13 @@ const _FlowEngineContext = class _FlowEngineContext extends BaseFlowEngineContex
       let serverResolved = template;
       if (needServer) {
         const inferRecordRefWithMeta = /* @__PURE__ */ __name((ctx) => {
-          var _a2, _b2, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
+          var _a2, _b2, _c2, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
           const ref = (0, import_variablesParams.inferRecordRef)(ctx);
           if (ref) return ref;
           try {
             const tk = (_b2 = (_a2 = ctx == null ? void 0 : ctx.resource) == null ? void 0 : _a2.getMeta) == null ? void 0 : _b2.call(_a2, "currentFilterByTk");
             if (typeof tk === "undefined" || tk === null) return void 0;
-            const collection = ((_c = ctx == null ? void 0 : ctx.collection) == null ? void 0 : _c.name) || ((_j = (_i = (_h = (_g = (_f = (_e = (_d = ctx == null ? void 0 : ctx.resource) == null ? void 0 : _d.getResourceName) == null ? void 0 : _e.call(_d)) == null ? void 0 : _f.split) == null ? void 0 : _g.call(_f, ".")) == null ? void 0 : _h.slice) == null ? void 0 : _i.call(_h, -1)) == null ? void 0 : _j[0]);
+            const collection = ((_c2 = ctx == null ? void 0 : ctx.collection) == null ? void 0 : _c2.name) || ((_j = (_i = (_h = (_g = (_f = (_e = (_d = ctx == null ? void 0 : ctx.resource) == null ? void 0 : _d.getResourceName) == null ? void 0 : _e.call(_d)) == null ? void 0 : _f.split) == null ? void 0 : _g.call(_f, ".")) == null ? void 0 : _h.slice) == null ? void 0 : _i.call(_h, -1)) == null ? void 0 : _j[0]);
             if (!collection) return void 0;
             const dataSourceKey = ((_k = ctx == null ? void 0 : ctx.collection) == null ? void 0 : _k.dataSourceKey) || ((_m = (_l = ctx == null ? void 0 : ctx.resource) == null ? void 0 : _l.getDataSourceKey) == null ? void 0 : _m.call(_l));
             return { collection, dataSourceKey, filterByTk: tk };
@@ -2461,6 +2461,11 @@ const _FlowEngineContext = class _FlowEngineContext extends BaseFlowEngineContex
         }, "collectFromMeta");
         const inputFromMeta = await collectFromMeta();
         const autoInput = { ...inputFromMeta };
+        const viewPaths = serverVarPaths.view || [];
+        if (!autoInput.view && viewPaths.some((path) => path === "record" || path.startsWith("record.") || path.startsWith("record["))) {
+          const recordRef = (0, import_variablesParams.inferViewRecordRef)(this);
+          if (recordRef) autoInput.view = { record: recordRef };
+        }
         try {
           const varName = "formValues";
           const neededPaths = serverVarPaths[varName] || [];
@@ -2512,11 +2517,12 @@ const _FlowEngineContext = class _FlowEngineContext extends BaseFlowEngineContex
         if (this.api) {
           try {
             serverResolved = await (0, import_params_resolvers.enqueueVariablesResolve)(this, {
+              rd: (0, import_params_resolvers.buildFlowModelResolveDescriptor)(this, (_a = this.model) == null ? void 0 : _a.uid),
               template,
               contextParams: autoContextParams || {}
             });
           } catch (e) {
-            (_b = (_a = this.logger) == null ? void 0 : _a.warn) == null ? void 0 : _b.call(_a, { err: e }, "variables:resolve failed, fallback to client-only");
+            (_c = (_b = this.logger) == null ? void 0 : _b.warn) == null ? void 0 : _c.call(_b, { err: e }, "variables:resolve failed, fallback to client-only");
             serverResolved = template;
           }
         }

package/lib/utils/associationObjectVariable.d.ts

@@ -8,6 +8,16 @@
  */
 import type { Collection } from '../data-source';
 import type { FlowContext, PropertyMetaFactory } from '../flowContext';
+/**
+ * 从值中提取主键：
+ * - 支持主键原始值（string/number）
+ * - 支持对象（按主键名取值）
+ *
+ * @param value 字段当前值
+ * @param primaryKey 主键字段名
+ * @returns 解析出的主键值，无法解析时返回 undefined
+ */
+export declare function getAssociationFilterByTk(value: unknown, primaryKey: string | string[]): unknown;
 /**
  * 创建一个用于“对象类变量”（如 formValues / item）的 `resolveOnServer` 判定函数。
  * 仅当访问路径以“关联字段名”开头（且继续访问其子属性）时，返回 true 交由服务端解析；

package/lib/utils/associationObjectVariable.js

@@ -38,7 +38,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var associationObjectVariable_exports = {};
 __export(associationObjectVariable_exports, {
   createAssociationAwareObjectMetaFactory: () => createAssociationAwareObjectMetaFactory,
-  createAssociationSubpathResolver: () => createAssociationSubpathResolver
+  createAssociationSubpathResolver: () => createAssociationSubpathResolver,
+  getAssociationFilterByTk: () => getAssociationFilterByTk
 });
 module.exports = __toCommonJS(associationObjectVariable_exports);
 var import_lodash = __toESM(require("lodash"));
@@ -58,13 +59,14 @@ function findFieldByName(collection, name) {
   return fields.find((f) => f.name === name);
 }
 __name(findFieldByName, "findFieldByName");
-function toFilterByTk(value, primaryKey) {
+function getAssociationFilterByTk(value, primaryKey) {
   if (value == null) return void 0;
   if (Array.isArray(primaryKey)) {
     if (typeof value !== "object" || !value) return void 0;
+    const record = value;
     const out = {};
     for (const k of primaryKey) {
-      const v = value[k];
+      const v = record[k];
       if (typeof v === "undefined" || v === null) return void 0;
       out[k] = v;
     }
@@ -76,7 +78,7 @@ function toFilterByTk(value, primaryKey) {
   }
   return void 0;
 }
-__name(toFilterByTk, "toFilterByTk");
+__name(getAssociationFilterByTk, "getAssociationFilterByTk");
 function createAssociationSubpathResolver(collectionAccessor, valueAccessor) {
   return (p) => {
     if (!p || !p.includes(".")) return false;
@@ -122,7 +124,7 @@ function createAssociationAwareObjectMetaFactory(collectionAccessor, title, valu
           const associationValue = obj[name];
           if (associationValue == null) continue;
           if (Array.isArray(associationValue)) {
-            const ids = associationValue.map((item) => toFilterByTk(item, primaryKey)).filter((v) => v != null);
+            const ids = associationValue.map((item) => getAssociationFilterByTk(item, primaryKey)).filter((v) => v != null);
             if (ids.length) {
               params[name] = {
                 collection: target,
@@ -131,7 +133,7 @@ function createAssociationAwareObjectMetaFactory(collectionAccessor, title, valu
               };
             }
           } else {
-            const id = toFilterByTk(associationValue, primaryKey);
+            const id = getAssociationFilterByTk(associationValue, primaryKey);
             if (id != null) {
               params[name] = {
                 collection: target,
@@ -153,5 +155,6 @@ __name(createAssociationAwareObjectMetaFactory, "createAssociationAwareObjectMet
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   createAssociationAwareObjectMetaFactory,
-  createAssociationSubpathResolver
+  createAssociationSubpathResolver,
+  getAssociationFilterByTk
 });

package/lib/utils/index.d.ts

@@ -11,11 +11,11 @@ export { escapeT, getT, tExpr } from './translation';
 export { FlowCancelSaveException, FlowExitAllException, FlowExitException } from './exceptions';
 export { defineAction } from './flow-definitions';
 export { isInheritedFrom } from './inheritance';
-export { resolveCreateModelOptions, resolveDefaultParams, resolveExpressions } from './params-resolvers';
+export { buildFlowModelResolveDescriptor, resolveCreateModelOptions, resolveDefaultParams, resolveExpressions, } from './params-resolvers';
 export { compileUiSchema, resolveStepUiSchema, resolveStepDisabledInSettings, resolveUiMode, shouldHideEventInSettings, shouldHideStepInSettings, } from './schema-utils';
 export { setupRuntimeContextSteps } from './setupRuntimeContextSteps';
 export { createCollectionContextMeta } from './createCollectionContextMeta';
-export { createAssociationAwareObjectMetaFactory, createAssociationSubpathResolver } from './associationObjectVariable';
+export { createAssociationAwareObjectMetaFactory, createAssociationSubpathResolver, getAssociationFilterByTk, } from './associationObjectVariable';
 export { buildRecordMeta, collectContextParamsForTemplate, createCurrentRecordMetaFactory, createRecordResolveOnServerWithLocal, createRecordMetaFactory, extractUsedVariableNames, extractUsedVariablePaths, inferRecordRef, type RecordParamsBuilder, } from './variablesParams';
 export { extractPropertyPath, formatPathToVariable, isVariableExpression } from './context';
 export { clearAutoFlowError, getAutoFlowError, setAutoFlowError, type AutoFlowError } from './autoFlowError';

package/lib/utils/index.js

@@ -34,6 +34,7 @@ __export(utils_exports, {
   FlowExitException: () => import_exceptions.FlowExitException,
   MENU_KEYS: () => import_constants.MENU_KEYS,
   RUNJS_OPEN_VIEW_ROUTE_STATE: () => import_openViewRouteState.RUNJS_OPEN_VIEW_ROUTE_STATE,
+  buildFlowModelResolveDescriptor: () => import_params_resolvers.buildFlowModelResolveDescriptor,
   buildRecordMeta: () => import_variablesParams.buildRecordMeta,
   clearAutoFlowError: () => import_autoFlowError.clearAutoFlowError,
   collectContextParamsForTemplate: () => import_variablesParams.collectContextParamsForTemplate,
@@ -57,6 +58,7 @@ __export(utils_exports, {
   extractUsedVariablePaths: () => import_variablesParams.extractUsedVariablePaths,
   extractUsedVariablePathsFromRunJS: () => import_runjsValue.extractUsedVariablePathsFromRunJS,
   formatPathToVariable: () => import_context.formatPathToVariable,
+  getAssociationFilterByTk: () => import_associationObjectVariable.getAssociationFilterByTk,
   getAutoFlowError: () => import_autoFlowError.getAutoFlowError,
   getT: () => import_translation.getT,
   inferRecordRef: () => import_variablesParams.inferRecordRef,
@@ -127,6 +129,7 @@ var import_randomId = require("./randomId");
   FlowExitException,
   MENU_KEYS,
   RUNJS_OPEN_VIEW_ROUTE_STATE,
+  buildFlowModelResolveDescriptor,
   buildRecordMeta,
   clearAutoFlowError,
   collectContextParamsForTemplate,
@@ -150,6 +153,7 @@ var import_randomId = require("./randomId");
   extractUsedVariablePaths,
   extractUsedVariablePathsFromRunJS,
   formatPathToVariable,
+  getAssociationFilterByTk,
   getAutoFlowError,
   getT,
   inferRecordRef,

package/lib/utils/params-resolvers.d.ts

@@ -27,10 +27,12 @@ export type JSONValue = string | {
     [key: string]: JSONValue;
 } | JSONValue[];
 type BatchPayload = {
+    rd?: string;
     template: JSONValue;
     contextParams?: ServerContextParams | undefined;
 };
 export declare function enqueueVariablesResolve(ctx: FlowRuntimeContext, payload: BatchPayload): Promise<unknown>;
+export declare function buildFlowModelResolveDescriptor(ctx: Pick<FlowModelContext, 'api'>, flowModelUid?: string | number | null): any;
 /**
  * 解析参数中的 {{xxx}} 表达式，自动处理异步属性访问
  */

package/lib/utils/params-resolvers.js

@@ -37,6 +37,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var params_resolvers_exports = {};
 __export(params_resolvers_exports, {
+  buildFlowModelResolveDescriptor: () => buildFlowModelResolveDescriptor,
   enqueueVariablesResolve: () => enqueueVariablesResolve,
   preprocessExpression: () => preprocessExpression,
   resolveCreateModelOptions: () => resolveCreateModelOptions,
@@ -45,6 +46,7 @@ __export(params_resolvers_exports, {
 });
 module.exports = __toCommonJS(params_resolvers_exports);
 var import_shared = require("@nocobase/shared");
+var import_client = require("@nocobase/utils/client");
 var import_lodash = __toESM(require("lodash"));
 async function resolveDefaultParams(defaultParams, ctx) {
   if (!defaultParams) {
@@ -144,6 +146,7 @@ function enqueueVariablesResolve(ctx, payload) {
     try {
       const batch = items.map((it) => ({
         id: it.id,
+        rd: it.payload.rd,
         template: it.payload.template,
         contextParams: it.payload.contextParams || {}
       }));
@@ -187,6 +190,11 @@ function enqueueVariablesResolve(ctx, payload) {
   return p;
 }
 __name(enqueueVariablesResolve, "enqueueVariablesResolve");
+function buildFlowModelResolveDescriptor(ctx, flowModelUid) {
+  var _a, _b;
+  return (0, import_client.generateFlowModelRdFromToken)(flowModelUid, (_b = (_a = ctx == null ? void 0 : ctx.api) == null ? void 0 : _a.auth) == null ? void 0 : _b.token);
+}
+__name(buildFlowModelResolveDescriptor, "buildFlowModelResolveDescriptor");
 async function resolveExpressions(params, ctx) {
   const compile = /* @__PURE__ */ __name(async (source) => {
     if (typeof source === "string" && /\{\{.*?\}\}/.test(source)) {
@@ -308,6 +316,7 @@ async function compileExpression(expression, ctx) {
 __name(compileExpression, "compileExpression");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  buildFlowModelResolveDescriptor,
   enqueueVariablesResolve,
   preprocessExpression,
   resolveCreateModelOptions,

package/lib/utils/variablesParams.js

@@ -210,6 +210,11 @@ async function collectContextParamsForTemplate(ctx, template) {
       input[key] = built;
     }
   }
+  const viewPaths = usage.view || [];
+  if (!input.view && viewPaths.some((path) => path === "record" || path.startsWith("record.") || path.startsWith("record["))) {
+    const recordRef = inferViewRecordRef(ctx);
+    if (recordRef) input.view = { record: recordRef };
+  }
   return (0, import_serverContextParams.buildServerContextParams)(ctx, input);
 }
 __name(collectContextParamsForTemplate, "collectContextParamsForTemplate");

package/lib/views/createViewMeta.js

@@ -33,6 +33,13 @@ __export(createViewMeta_exports, {
 });
 module.exports = __toCommonJS(createViewMeta_exports);
 var import_variablesParams = require("../utils/variablesParams");
+function buildPopupSourceRecordRef(ref) {
+  if ((ref == null ? void 0 : ref.sourceId) == null || ref.sourceId === "" || typeof ref.associationName !== "string") return void 0;
+  const collection = ref.associationName.split(".")[0];
+  if (!collection) return void 0;
+  return { collection, dataSourceKey: ref.dataSourceKey || "main", filterByTk: ref.sourceId };
+}
+__name(buildPopupSourceRecordRef, "buildPopupSourceRecordRef");
 function isDefined(value) {
   return value !== void 0 && value !== null;
 }
@@ -306,9 +313,11 @@ function createPopupMeta(ctx, anchorView) {
             let level = 1;
             let parentRef = await getParentRecordRef(level, c);
             while (parentRef) {
-              if (!cur.parent) cur.parent = {};
-              cur.parent.record = parentRef;
-              cur = cur.parent;
+              const parent = { record: parentRef };
+              const sourceRecord = buildPopupSourceRecordRef(parentRef);
+              if (sourceRecord) parent.sourceRecord = sourceRecord;
+              cur.parent = parent;
+              cur = parent;
               level += 1;
               parentRef = await getParentRecordRef(level, c);
             }
@@ -317,19 +326,12 @@ function createPopupMeta(ctx, anchorView) {
           (_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;
-          const assoc = inputArgs == null ? void 0 : inputArgs.associationName;
-          const dsKey = (inputArgs == null ? void 0 : inputArgs.dataSourceKey) || "main";
-          if (srcId != null && srcId !== "" && assoc && typeof assoc === "string") {
-            const parentCollectionName = String(assoc).split(".")[0];
-            if (parentCollectionName) {
-              params.sourceRecord = {
-                collection: parentCollectionName,
-                dataSourceKey: dsKey,
-                filterByTk: srcId
-              };
-            }
-          }
+          const sourceRecord = buildPopupSourceRecordRef({
+            sourceId: inputArgs == null ? void 0 : inputArgs.sourceId,
+            associationName: inputArgs == null ? void 0 : inputArgs.associationName,
+            dataSourceKey: inputArgs == null ? void 0 : inputArgs.dataSourceKey
+          });
+          if (sourceRecord) params.sourceRecord = sourceRecord;
         } catch (err) {
           (_d = (_c = c.logger) == null ? void 0 : _c.debug) == null ? void 0 : _d.call(_c, { err }, "[FlowEngine] buildVariablesParams: infer sourceRecord failed");
         }

package/package.json

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

package/src/flowContext.ts

@@ -50,11 +50,11 @@ import {
   resolveModuleUrl,
 } from './utils';
 import { FlowExitAllException } from './utils/exceptions';
-import { enqueueVariablesResolve, JSONValue } from './utils/params-resolvers';
+import { buildFlowModelResolveDescriptor, enqueueVariablesResolve, JSONValue } from './utils/params-resolvers';
 import type { RecordRef } from './utils/serverContextParams';
 import { buildServerContextParams as _buildServerContextParams } from './utils/serverContextParams';
 import { getDirtyAwareApiClient } from './utils/dirtyAwareApiClient';
-import { inferRecordRef } from './utils/variablesParams';
+import { inferRecordRef, inferViewRecordRef } from './utils/variablesParams';
 import { FlowView, FlowViewer } from './views/FlowView';
 import { RunJSContextRegistry, getModelClassName, type RunJSVersion } from './runjs-context/registry';
 import { createEphemeralContext } from './utils/createEphemeralContext';
@@ -3316,6 +3316,15 @@ export class FlowEngineContext extends BaseFlowEngineContext {
         const inputFromMeta = await collectFromMeta();
         const autoInput = { ...inputFromMeta } as Record<string, any>;
 
+        const viewPaths = serverVarPaths.view || [];
+        if (
+          !autoInput.view &&
+          viewPaths.some((path) => path === 'record' || path.startsWith('record.') || path.startsWith('record['))
+        ) {
+          const recordRef = inferViewRecordRef(this);
+          if (recordRef) autoInput.view = { record: recordRef };
+        }
+
         // Special-case: formValues
         // If server needs to resolve some formValues paths but meta params only cover association anchors
         // (e.g. formValues.customer) and some top-level paths are missing (e.g. formValues.status),
@@ -3388,6 +3397,7 @@ export class FlowEngineContext extends BaseFlowEngineContext {
         if (this.api) {
           try {
             serverResolved = await enqueueVariablesResolve(this as FlowRuntimeContext<FlowModel>, {
+              rd: buildFlowModelResolveDescriptor(this as FlowRuntimeContext<FlowModel>, this.model?.uid),
               template,
               contextParams: autoContextParams || {},
             });

package/src/utils/__tests__/variablesParams.test.ts

@@ -34,7 +34,8 @@ describe('variablesParams helpers', () => {
 
   it('inferRecordRef fallback to collection.getFilterByTK when resource has no filterByTk', () => {
     const engine = new FlowEngine();
-    const ds = engine.context.dataSourceManager.getDataSource('main')!;
+    const ds = engine.context.dataSourceManager.getDataSource('main');
+    if (!ds) throw new Error('main data source is required');
     ds.addCollection({
       name: 'users',
       filterTargetKey: 'id',
@@ -108,6 +109,32 @@ describe('variablesParams helpers', () => {
     });
   });
 
+  it('collectContextParamsForTemplate infers view.record when its meta has no descriptor', async () => {
+    const ctx: any = {
+      getPropertyOptions: () => undefined,
+      view: {
+        inputArgs: {
+          collectionName: 'posts',
+          dataSourceKey: 'main',
+          filterByTk: 3,
+        },
+      },
+    };
+
+    const res = await collectContextParamsForTemplate(ctx, {
+      recordId: '{{ ctx.view.record.id }}',
+      viewType: '{{ ctx.view.type }}',
+    });
+
+    expect(res).toEqual({
+      'view.record': {
+        collection: 'posts',
+        dataSourceKey: 'main',
+        filterByTk: 3,
+      },
+    });
+  });
+
   it('createRecordResolveOnServerWithLocal: no local record => always use server', () => {
     const resolver = createRecordResolveOnServerWithLocal(
       () => ({ name: 'posts', dataSourceKey: 'main' }) as any,

package/src/utils/associationObjectVariable.ts

@@ -51,13 +51,14 @@ function findFieldByName(collection: Collection | null | undefined, name?: strin
  * @param primaryKey 主键字段名
  * @returns 解析出的主键值，无法解析时返回 undefined
  */
-function toFilterByTk(value: unknown, primaryKey: string | string[]) {
+export function getAssociationFilterByTk(value: unknown, primaryKey: string | string[]) {
   if (value == null) return undefined;
   if (Array.isArray(primaryKey)) {
     if (typeof value !== 'object' || !value) return undefined;
-    const out: Record<string, any> = {};
+    const record = value as Record<string, unknown>;
+    const out: Record<string, unknown> = {};
     for (const k of primaryKey) {
-      const v = (value as any)[k];
+      const v = record[k];
       if (typeof v === 'undefined' || v === null) return undefined;
       out[k] = v;
     }
@@ -65,7 +66,7 @@ function toFilterByTk(value: unknown, primaryKey: string | string[]) {
   }
   if (typeof value === 'string' || typeof value === 'number') return value;
   if (typeof value === 'object') {
-    return (value as any)[primaryKey];
+    return (value as Record<string, unknown>)[primaryKey];
   }
   return undefined;
 }
@@ -149,7 +150,9 @@ export function createAssociationAwareObjectMetaFactory(
           if (associationValue == null) continue;
 
           if (Array.isArray(associationValue)) {
-            const ids = associationValue.map((item) => toFilterByTk(item, primaryKey)).filter((v) => v != null);
+            const ids = associationValue
+              .map((item) => getAssociationFilterByTk(item, primaryKey))
+              .filter((v) => v != null);
             if (ids.length) {
               params[name] = {
                 collection: target,
@@ -158,7 +161,7 @@ export function createAssociationAwareObjectMetaFactory(
               };
             }
           } else {
-            const id = toFilterByTk(associationValue, primaryKey);
+            const id = getAssociationFilterByTk(associationValue, primaryKey);
             if (id != null) {
               params[name] = {
                 collection: target,

package/src/utils/index.ts

@@ -31,7 +31,12 @@ export { defineAction } from './flow-definitions';
 export { isInheritedFrom } from './inheritance';
 
 // 参数解析器
-export { resolveCreateModelOptions, resolveDefaultParams, resolveExpressions } from './params-resolvers';
+export {
+  buildFlowModelResolveDescriptor,
+  resolveCreateModelOptions,
+  resolveDefaultParams,
+  resolveExpressions,
+} from './params-resolvers';
 
 // Schema 工具
 export {
@@ -48,7 +53,11 @@ export { setupRuntimeContextSteps } from './setupRuntimeContextSteps';
 
 // Record Proxy 工具
 export { createCollectionContextMeta } from './createCollectionContextMeta';
-export { createAssociationAwareObjectMetaFactory, createAssociationSubpathResolver } from './associationObjectVariable';
+export {
+  createAssociationAwareObjectMetaFactory,
+  createAssociationSubpathResolver,
+  getAssociationFilterByTk,
+} from './associationObjectVariable';
 export {
   buildRecordMeta,
   collectContextParamsForTemplate,

package/src/utils/params-resolvers.ts

@@ -8,6 +8,7 @@
  */
 
 import { getValuesByPath } from '@nocobase/shared';
+import { generateFlowModelRdFromToken } from '@nocobase/utils/client';
 import _ from 'lodash';
 import { FlowContext, FlowModelContext, FlowRuntimeContext } from '../flowContext';
 import type { FlowModel } from '../models';
@@ -78,6 +79,7 @@ export type JSONValue = string | { [key: string]: JSONValue } | JSONValue[];
 // =========================
 
 type BatchPayload = {
+  rd?: string;
   template: JSONValue;
   contextParams?: ServerContextParams | undefined;
 };
@@ -170,6 +172,7 @@ export function enqueueVariablesResolve(ctx: FlowRuntimeContext, payload: BatchP
     try {
       const batch = items.map((it) => ({
         id: it.id,
+        rd: it.payload.rd,
         template: it.payload.template,
         contextParams: it.payload.contextParams || {},
       }));
@@ -218,6 +221,13 @@ export function enqueueVariablesResolve(ctx: FlowRuntimeContext, payload: BatchP
   return p;
 }
 
+export function buildFlowModelResolveDescriptor(
+  ctx: Pick<FlowModelContext, 'api'>,
+  flowModelUid?: string | number | null,
+) {
+  return generateFlowModelRdFromToken(flowModelUid, ctx?.api?.auth?.token);
+}
+
 /**
  * 解析参数中的 {{xxx}} 表达式，自动处理异步属性访问
  */

package/src/utils/variablesParams.ts

@@ -263,5 +263,15 @@ export async function collectContextParamsForTemplate(
       input[key] = built;
     }
   }
+
+  const viewPaths = usage.view || [];
+  if (
+    !input.view &&
+    viewPaths.some((path) => path === 'record' || path.startsWith('record.') || path.startsWith('record['))
+  ) {
+    const recordRef = inferViewRecordRef(ctx);
+    if (recordRef) input.view = { record: recordRef };
+  }
+
   return buildServerContextParams(ctx, input);
 }

package/src/views/createViewMeta.ts

@@ -15,6 +15,13 @@ import type { FlowView } from './FlowView';
 
 type PopupModelLike = { getStepParams?: (a: string, b: string) => any } | undefined;
 
+function buildPopupSourceRecordRef(ref?: Pick<RecordRef, 'associationName' | 'dataSourceKey' | 'sourceId'>) {
+  if (ref?.sourceId == null || ref.sourceId === '' || typeof ref.associationName !== 'string') return undefined;
+  const collection = ref.associationName.split('.')[0];
+  if (!collection) return undefined;
+  return { collection, dataSourceKey: ref.dataSourceKey || 'main', filterByTk: ref.sourceId };
+}
+
 function isDefined(value: any) {
   return value !== undefined && value !== null;
 }
@@ -327,13 +334,15 @@ export function createPopupMeta(ctx: FlowContext, anchorView?: FlowView): Proper
           const stack = getViewStack(view);
           const currentIndex = getAnchoredViewStackIndex(view, stack);
           if (currentIndex >= 2) {
-            let cur: Record<string, any> = params;
+            let cur = params;
             let level = 1;
             let parentRef = await getParentRecordRef(level, c);
             while (parentRef) {
-              if (!cur.parent) cur.parent = {};
-              cur.parent.record = parentRef;
-              cur = cur.parent;
+              const parent: PopupVariableParams = { record: parentRef };
+              const sourceRecord = buildPopupSourceRecordRef(parentRef);
+              if (sourceRecord) parent.sourceRecord = sourceRecord;
+              cur.parent = parent;
+              cur = parent;
               level += 1;
               parentRef = await getParentRecordRef(level, c);
             }
@@ -343,20 +352,12 @@ export function createPopupMeta(ctx: FlowContext, anchorView?: FlowView): Proper
         }
 
         try {
-          const srcId = inputArgs?.sourceId;
-          const assoc: string | undefined = inputArgs?.associationName;
-          const dsKey: string = inputArgs?.dataSourceKey || 'main';
-          if (srcId != null && srcId !== '' && assoc && typeof assoc === 'string') {
-            // associationName 形如 `posts.comments`，父级集合为 `posts`
-            const parentCollectionName = String(assoc).split('.')[0];
-            if (parentCollectionName) {
-              params.sourceRecord = {
-                collection: parentCollectionName,
-                dataSourceKey: dsKey,
-                filterByTk: srcId,
-              };
-            }
-          }
+          const sourceRecord = buildPopupSourceRecordRef({
+            sourceId: inputArgs?.sourceId,
+            associationName: inputArgs?.associationName,
+            dataSourceKey: inputArgs?.dataSourceKey,
+          });
+          if (sourceRecord) params.sourceRecord = sourceRecord;
         } catch (err) {
           c.logger?.debug?.({ err }, '[FlowEngine] buildVariablesParams: infer sourceRecord failed');
         }