@nocobase/flow-engine 2.3.0-alpha.1 → 2.3.0-beta.2

package/src/utils/dirtyAwareApiClient.ts

@@ -42,9 +42,19 @@ type ResourceRequestOptions = RequestOptions & {
 type DirtyResourceAction = {
   dataSourceKey?: string;
   resourceName: string;
+  resourceOf?: unknown;
   actionName: string;
 };
 
+export const PREPARE_CONTEXT_RESOURCE_ACTION_PARAMS = Symbol('prepareContextResourceActionParams');
+
+type ContextResourceActionParamsPreparer = {
+  [PREPARE_CONTEXT_RESOURCE_ACTION_PARAMS]?: (
+    action: DirtyResourceAction,
+    params: ActionParams | undefined,
+  ) => ActionParams | undefined;
+};
+
 type ApiUrlProvider = {
   getApiUrl?: (pathname?: string) => string;
 };
@@ -328,6 +338,7 @@ function resolveDirtyResourceActionFromResource(
 
   return {
     resourceName: normalizedResourceName,
+    resourceOf,
     actionName: normalizedActionName,
   };
 }
@@ -442,6 +453,18 @@ function createDirtyAwareResource(
       return async (...args: Parameters<ResourceActionFn>) => {
         const actionOptions = isObjectRecord(args[1]) ? args[1] : undefined;
         const dirtyResourceAction = resolveDirtyResourceActionFromResource(resourceName, resourceOf, prop, context);
+        const prepareParams = (context as ContextResourceActionParamsPreparer)[PREPARE_CONTEXT_RESOURCE_ACTION_PARAMS];
+        const actionParams =
+          dirtyResourceAction && typeof prepareParams === 'function'
+            ? prepareParams.call(
+                context,
+                {
+                  ...dirtyResourceAction,
+                  dataSourceKey: dirtyResourceAction.dataSourceKey || getDataSourceKeyFromHeaders(headers),
+                },
+                args[0],
+              )
+            : args[0];
         const requestKey = getDirtyResourceActionDispatchKey(dirtyResourceAction, headers);
         const resourceKey = getResourceDispatchKey(resourceName, resourceOf, headers);
         const inheritedToken =
@@ -459,13 +482,13 @@ function createDirtyAwareResource(
         const forwardedArgs: Parameters<ResourceActionFn> =
           actionOptions || args[1] == null
             ? [
-                args[0],
+                actionParams,
                 {
                   ...actionOptions,
                   [DIRTY_DISPATCH_TOKEN]: token,
                 },
               ]
-            : args;
+            : [actionParams, args[1]];
         let actionResult: Promise<unknown>;
         requestTokenStack.push({ key: requestKey, token });
         try {

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,
@@ -83,8 +92,14 @@ export {
   isCtxDatePathPrefix,
   isCtxDateExpression,
   parseCtxDateExpression,
+  parseCtxDateExpressionConfig,
   resolveCtxDatePath,
+  serializeCtxDateExpressionConfig,
   serializeCtxDateValue,
+  type CtxDateExpressionConfig,
+  type CtxDatePreset,
+  type CtxDateRelativeDirection,
+  type CtxDateRelativeUnit,
 } from './dateVariable';
 
 // RunJS value helpers

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,8 @@ export type JSONValue = string | { [key: string]: JSONValue } | JSONValue[];
 // =========================
 
 type BatchPayload = {
+  contractRd?: string;
+  rd?: string;
   template: JSONValue;
   contextParams?: ServerContextParams | undefined;
 };
@@ -170,6 +173,8 @@ export function enqueueVariablesResolve(ctx: FlowRuntimeContext, payload: BatchP
     try {
       const batch = items.map((it) => ({
         id: it.id,
+        contractRd: it.payload.contractRd,
+        rd: it.payload.rd,
         template: it.payload.template,
         contextParams: it.payload.contextParams || {},
       }));
@@ -218,6 +223,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');
         }
@@ -474,12 +475,14 @@ interface PopupNodeResource {
 interface PopupNode {
   uid?: string;
   resource: PopupNodeResource;
+  sourceRecord?: unknown;
   parent?: PopupNode;
 }
 
 export async function buildPopupRuntime(ctx: FlowContext, view: FlowView): Promise<PopupNode | undefined> {
   const stack = getViewStack(view);
   const currentIndex = getAnchoredViewStackIndex(view, stack);
+  const sourceRecord = view?.inputArgs?.parentItem?.value;
 
   const openerUids = view?.inputArgs?.openerUids;
   const hasOpener = Array.isArray(openerUids) && openerUids.length > 0;
@@ -502,6 +505,7 @@ export async function buildPopupRuntime(ctx: FlowContext, view: FlowView): Promi
         filterByTk: args.filterByTk,
         sourceId: args.sourceId,
       },
+      ...(typeof sourceRecord !== 'undefined' ? { sourceRecord } : {}),
     };
   }
 
@@ -530,6 +534,9 @@ export async function buildPopupRuntime(ctx: FlowContext, view: FlowView): Promi
     return node;
   };
   const currentNode = await buildNode(currentIndex);
+  if (currentNode && typeof sourceRecord !== 'undefined') {
+    currentNode.sourceRecord = sourceRecord;
+  }
   return currentNode;
 }
 
@@ -541,6 +548,30 @@ export function registerPopupVariable(ctx: FlowContext, view: FlowView) {
   // - 任意层级 parent.parent... 下的 record / sourceRecord 及其子字段
   const POPUP_SERVER_PATH_RE =
     /^(?:record|sourceRecord)(?:\.|$)|^parent(?:\.parent)*(?:\.(?:record|sourceRecord))(?:\.|$)/;
+  const shouldResolveSourceRecordOnServer = (path: string): boolean => {
+    if (path !== 'sourceRecord' && !path.startsWith('sourceRecord.')) return false;
+
+    const parentItem = view?.inputArgs?.parentItem;
+    if (typeof parentItem?.value === 'undefined') return true;
+
+    const sourcePath = path === 'sourceRecord' ? '' : path.slice('sourceRecord.'.length);
+    if (!sourcePath) return false;
+
+    const parentItemResolver = view?.inputArgs?.parentItemResolver;
+    if (typeof parentItemResolver === 'function') {
+      return parentItemResolver(`value.${sourcePath}`);
+    }
+
+    const segments = sourcePath.split('.').filter(Boolean);
+    let current = parentItem.value;
+    for (const segment of segments) {
+      if (current === null || typeof current !== 'object' || !(segment in current)) {
+        return true;
+      }
+      current = current[segment];
+    }
+    return false;
+  };
   // 始终注册 popup 变量：
   // - 若当前视图无可推断记录，仅在元信息中不呈现 record 字段；
   // - 但仍可依据 navigation 推断并展示上级弹窗信息。
@@ -549,6 +580,9 @@ export function registerPopupVariable(ctx: FlowContext, view: FlowView) {
     meta: createPopupMeta(ctx, view),
     resolveOnServer: (p: string) => {
       try {
+        if (p === 'sourceRecord' || p.startsWith('sourceRecord.')) {
+          return shouldResolveSourceRecordOnServer(p);
+        }
         return !!p && POPUP_SERVER_PATH_RE.test(p);
       } catch (_) {
         return false;