@nocobase/flow-engine 2.1.36 → 2.1.38

package/lib/components/FlowContextSelector.js

@@ -224,6 +224,7 @@ const FlowContextSelectorComponent = /* @__PURE__ */ __name(({
   }, [currentPath]);
   const handleChange = (0, import_react.useCallback)(
     (selectedValues, selectedOptions) => {
+      var _a;
       const lastOption = selectedOptions == null ? void 0 : selectedOptions[selectedOptions.length - 1];
       if (!selectedValues || selectedValues.length === 0) {
         onChange == null ? void 0 : onChange("", lastOption == null ? void 0 : lastOption.meta);
@@ -233,6 +234,7 @@ const FlowContextSelectorComponent = /* @__PURE__ */ __name(({
       const path = selectedValues.map(String);
       const pathString = path.join(".");
       const isLeaf = lastOption == null ? void 0 : lastOption.isLeaf;
+      const isSelectable = ((_a = lastOption == null ? void 0 : lastOption.meta) == null ? void 0 : _a.selectable) !== false;
       const now = Date.now();
       let formattedValue;
       if (customFormatPathToValue) {
@@ -244,12 +246,16 @@ const FlowContextSelectorComponent = /* @__PURE__ */ __name(({
         formattedValue = (0, import_utils.formatPathToValue)(lastOption == null ? void 0 : lastOption.meta);
       }
       if (isLeaf) {
+        if (!isSelectable) {
+          setTempSelectedPath(path);
+          return;
+        }
         onChange == null ? void 0 : onChange(formattedValue, lastOption == null ? void 0 : lastOption.meta);
         setTempSelectedPath([]);
         return;
       }
       const lastSelected = lastSelectedRef.current;
-      const isDoubleClick = !onlyLeafSelectable && (lastSelected == null ? void 0 : lastSelected.path) === pathString && now - lastSelected.time < 300;
+      const isDoubleClick = isSelectable && !onlyLeafSelectable && (lastSelected == null ? void 0 : lastSelected.path) === pathString && now - lastSelected.time < 300;
       if (isDoubleClick) {
         onChange == null ? void 0 : onChange(formattedValue, lastOption == null ? void 0 : lastOption.meta);
         lastSelectedRef.current = null;

package/lib/flowContext.d.ts

@@ -27,6 +27,9 @@ import type { RecordRef } from './utils/serverContextParams';
 import { FlowView, FlowViewer } from './views/FlowView';
 import { type RunJSVersion } from './runjs-context/registry';
 type Getter<T = any> = (ctx: FlowContext) => T | Promise<T>;
+export type ResolveJsonTemplateOptions = {
+    contractModelUid?: string | number | null;
+};
 export type FlowContextDocRef = string | {
     url: string;
     title?: string;
@@ -77,6 +80,7 @@ export interface MetaTreeNode {
     hidden?: boolean | (() => boolean);
     disabled?: boolean | (() => boolean);
     disabledReason?: string | (() => string | undefined);
+    selectable?: boolean;
     children?: MetaTreeNode[] | (() => Promise<MetaTreeNode[]>);
 }
 export interface PropertyMeta {
@@ -343,7 +347,7 @@ declare class BaseFlowEngineContext extends FlowContext {
      * @deprecated use `resolveJsonTemplate` instead
      */
     renderJson: (template: JSONValue) => Promise<any>;
-    resolveJsonTemplate: (template: JSONValue) => Promise<any>;
+    resolveJsonTemplate: (template: JSONValue, options?: ResolveJsonTemplateOptions) => Promise<any>;
     getVar: (path: string) => Promise<any>;
     request: (options: RequestOptions) => Promise<any>;
     runjs: (code: string, variables?: Record<string, any>, options?: JSRunnerOptions) => Promise<any>;

package/lib/flowContext.js

@@ -2383,8 +2383,8 @@ const _FlowEngineContext = class _FlowEngineContext extends BaseFlowEngineContex
     this.defineMethod("renderJson", function(template) {
       return this.resolveJsonTemplate(template);
     });
-    this.defineMethod("resolveJsonTemplate", async function(template) {
-      var _a, _b;
+    const resolveJsonTemplate = /* @__PURE__ */ __name(async function(template, options) {
+      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] || [];
@@ -2511,18 +2516,25 @@ const _FlowEngineContext = class _FlowEngineContext extends BaseFlowEngineContex
         }
         if (this.api) {
           try {
+            const contractRd = (0, import_params_resolvers.buildFlowModelResolveDescriptor)(
+              this,
+              options == null ? void 0 : options.contractModelUid
+            );
             serverResolved = await (0, import_params_resolvers.enqueueVariablesResolve)(this, {
+              ...contractRd ? { contractRd } : {},
+              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;
           }
         }
       }
       return (0, import_utils.resolveExpressions)(serverResolved, this);
-    });
+    }, "resolveJsonTemplate");
+    this.defineMethod("resolveJsonTemplate", resolveJsonTemplate);
     this.defineMethod(
       "getVar",
       async function(varPath) {

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/dateVariable.d.ts

@@ -6,11 +6,33 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
+declare const PRESET_KEY_LIST: readonly ["today", "now", "yesterday", "tomorrow", "thisWeek", "lastWeek", "nextWeek", "thisMonth", "lastMonth", "nextMonth", "thisQuarter", "lastQuarter", "nextQuarter", "thisYear", "lastYear", "nextYear"];
+export type CtxDatePreset = (typeof PRESET_KEY_LIST)[number];
+export type CtxDateRelativeDirection = 'next' | 'past';
+export type CtxDateRelativeUnit = 'day' | 'week' | 'month' | 'year';
+export type CtxDateExpressionConfig = {
+    kind: 'exact';
+    value: string | [string, string];
+    format?: string;
+} | {
+    kind: 'relative';
+    direction: CtxDateRelativeDirection;
+    amount: number;
+    unit: CtxDateRelativeUnit;
+    format?: string;
+} | {
+    kind: 'preset';
+    preset: CtxDatePreset;
+    format?: string;
+};
 export declare function isCtxDatePathPrefix(pathSegments: string[]): boolean;
 export declare function encodeBase64Url(input: string): string;
 export declare function decodeBase64Url(input: string): string | undefined;
 export declare function isCtxDateExpression(value: unknown): value is string;
 export declare function isCompleteCtxDatePath(pathSegments: string[]): boolean;
 export declare function parseCtxDateExpression(value: unknown): any;
+export declare function parseCtxDateExpressionConfig(value: unknown): CtxDateExpressionConfig | undefined;
+export declare function serializeCtxDateExpressionConfig(config: CtxDateExpressionConfig): string | undefined;
 export declare function serializeCtxDateValue(value: unknown): string | undefined;
 export declare function resolveCtxDatePath(pathSegments: string[]): any;
+export {};

package/lib/utils/dateVariable.js

@@ -43,13 +43,15 @@ __export(dateVariable_exports, {
   isCtxDateExpression: () => isCtxDateExpression,
   isCtxDatePathPrefix: () => isCtxDatePathPrefix,
   parseCtxDateExpression: () => parseCtxDateExpression,
+  parseCtxDateExpressionConfig: () => parseCtxDateExpressionConfig,
   resolveCtxDatePath: () => resolveCtxDatePath,
+  serializeCtxDateExpressionConfig: () => serializeCtxDateExpressionConfig,
   serializeCtxDateValue: () => serializeCtxDateValue
 });
 module.exports = __toCommonJS(dateVariable_exports);
 var import_dayjs = __toESM(require("dayjs"));
 const CTX_DATE_REGEX = /^\{\{\s*ctx\.date(?:\.(.+?))?\s*\}\}$/;
-const PRESET_KEYS = /* @__PURE__ */ new Set([
+const PRESET_KEY_LIST = [
   "today",
   "now",
   "yesterday",
@@ -66,9 +68,11 @@ const PRESET_KEYS = /* @__PURE__ */ new Set([
   "thisYear",
   "lastYear",
   "nextYear"
-]);
+];
+const PRESET_KEYS = new Set(PRESET_KEY_LIST);
 const RELATIVE_DIRECTIONS = /* @__PURE__ */ new Set(["next", "past"]);
 const RELATIVE_UNITS = /* @__PURE__ */ new Set(["day", "week", "month", "year"]);
+const MAX_DATE_FORMAT_LENGTH = 128;
 function parseCtxDateSegments(value) {
   if (typeof value !== "string") return null;
   const trimmed = value.trim();
@@ -79,8 +83,7 @@ function parseCtxDateSegments(value) {
   return rawPath.split(".").map((seg) => seg.trim()).filter(Boolean);
 }
 __name(parseCtxDateSegments, "parseCtxDateSegments");
-function isCtxDatePathPrefix(pathSegments) {
-  const segments = withDatePrefix((pathSegments || []).map((seg) => String(seg)));
+function isBaseCtxDatePathPrefix(segments) {
   if (segments[0] !== "date") return false;
   if (segments.length === 1) return true;
   if (segments[1] === "preset") {
@@ -117,6 +120,34 @@ function isCtxDatePathPrefix(pathSegments) {
   }
   return false;
 }
+__name(isBaseCtxDatePathPrefix, "isBaseCtxDatePathPrefix");
+function decodeFormatToken(token) {
+  const raw = String(token || "");
+  if (!raw.startsWith("v")) return void 0;
+  const decoded = decodeBase64Url(raw.slice(1));
+  if (!decoded || decoded.length > MAX_DATE_FORMAT_LENGTH) return void 0;
+  return decoded;
+}
+__name(decodeFormatToken, "decodeFormatToken");
+function splitFormattedDateSegments(segments) {
+  if (segments[0] !== "date") return null;
+  if (segments[1] !== "format") return { baseSegments: segments };
+  if (segments.length < 4) return null;
+  const format = decodeFormatToken(segments[2]);
+  if (!format) return null;
+  return { baseSegments: ["date", ...segments.slice(3)], format };
+}
+__name(splitFormattedDateSegments, "splitFormattedDateSegments");
+function isCtxDatePathPrefix(pathSegments) {
+  const segments = withDatePrefix((pathSegments || []).map((seg) => String(seg)));
+  if (segments[0] !== "date") return false;
+  if (segments.length === 1) return true;
+  if (segments[1] !== "format") return isBaseCtxDatePathPrefix(segments);
+  if (segments.length === 2) return true;
+  if (segments.length === 3) return typeof decodeFormatToken(segments[2]) === "string";
+  const formatted = splitFormattedDateSegments(segments);
+  return formatted ? isBaseCtxDatePathPrefix(formatted.baseSegments) : false;
+}
 __name(isCtxDatePathPrefix, "isCtxDatePathPrefix");
 function withDatePrefix(pathSegments) {
   if (pathSegments[0] === "date") {
@@ -225,26 +256,31 @@ __name(isCtxDateExpression, "isCtxDateExpression");
 function isCompleteCtxDatePath(pathSegments) {
   if (!isCtxDatePathPrefix(pathSegments)) return false;
   const segments = withDatePrefix((pathSegments || []).map((seg) => String(seg)));
-  if (segments[0] !== "date") return false;
-  if (segments[1] === "preset") {
-    return segments.length === 3 && PRESET_KEYS.has(segments[2]);
+  const formatted = splitFormattedDateSegments(segments);
+  if (!formatted) return false;
+  const baseSegments = formatted.baseSegments;
+  if (baseSegments[1] === "preset") {
+    return baseSegments.length === 3 && PRESET_KEYS.has(baseSegments[2]);
   }
-  if (segments[1] === "relative") {
-    if (segments.length !== 5) return false;
-    return RELATIVE_DIRECTIONS.has(segments[2]) && RELATIVE_UNITS.has(segments[3]) && typeof parseNumberToken(segments[4]) === "number";
+  if (baseSegments[1] === "relative") {
+    if (baseSegments.length !== 5) return false;
+    return RELATIVE_DIRECTIONS.has(baseSegments[2]) && RELATIVE_UNITS.has(baseSegments[3]) && typeof parseNumberToken(baseSegments[4]) === "number";
   }
-  if (segments[1] === "exact" && segments[2] === "single" && segments[3] === "date") {
-    return segments.length === 5 && /^v.+/.test(segments[4]);
+  if (baseSegments[1] === "exact" && baseSegments[2] === "single" && baseSegments[3] === "date") {
+    return baseSegments.length === 5 && /^v.+/.test(baseSegments[4]);
   }
-  if (segments[1] === "exact" && segments[2] === "range" && segments[3] === "date") {
-    return segments.length === 6 && /^v.+/.test(segments[4]) && /^v.+/.test(segments[5]);
+  if (baseSegments[1] === "exact" && baseSegments[2] === "range" && baseSegments[3] === "date") {
+    return baseSegments.length === 6 && /^v.+/.test(baseSegments[4]) && /^v.+/.test(baseSegments[5]);
   }
   return false;
 }
 __name(isCompleteCtxDatePath, "isCompleteCtxDatePath");
 function parseCtxDateExpression(value) {
   if (!isCtxDateExpression(value)) return void 0;
-  const segments = withDatePrefix(parseCtxDateSegments(value) || []);
+  const rawSegments = withDatePrefix(parseCtxDateSegments(value) || []);
+  const formatted = splitFormattedDateSegments(rawSegments);
+  if (!formatted) return void 0;
+  const segments = formatted.baseSegments;
   if (segments[1] === "preset" && segments.length === 3 && PRESET_KEYS.has(segments[2])) {
     return { type: segments[2] };
   }
@@ -272,6 +308,60 @@ function parseCtxDateExpression(value) {
   return void 0;
 }
 __name(parseCtxDateExpression, "parseCtxDateExpression");
+function parseCtxDateExpressionConfig(value) {
+  if (!isCtxDateExpression(value)) return void 0;
+  const segments = withDatePrefix(parseCtxDateSegments(value) || []);
+  const formatted = splitFormattedDateSegments(segments);
+  if (!formatted) return void 0;
+  const parsed = parseCtxDateExpression(value);
+  const formatConfig = formatted.format ? { format: formatted.format } : {};
+  if (typeof parsed === "string") {
+    return { kind: "exact", value: parsed, ...formatConfig };
+  }
+  if (Array.isArray(parsed) && parsed.length === 2 && typeof parsed[0] === "string" && typeof parsed[1] === "string") {
+    return { kind: "exact", value: [parsed[0], parsed[1]], ...formatConfig };
+  }
+  if (!parsed || typeof parsed !== "object") return void 0;
+  const typed = parsed;
+  if (typed.type === "past" || typed.type === "next") {
+    if (typeof typed.unit !== "string" || !RELATIVE_UNITS.has(typed.unit) || typeof typed.number !== "number") {
+      return void 0;
+    }
+    return {
+      kind: "relative",
+      direction: typed.type,
+      amount: typed.number,
+      unit: typed.unit,
+      ...formatConfig
+    };
+  }
+  if (typeof typed.type === "string" && PRESET_KEYS.has(typed.type)) {
+    return { kind: "preset", preset: typed.type, ...formatConfig };
+  }
+  return void 0;
+}
+__name(parseCtxDateExpressionConfig, "parseCtxDateExpressionConfig");
+function serializeCtxDateExpressionConfig(config) {
+  let legacyValue;
+  if (config.kind === "preset") {
+    if (!PRESET_KEYS.has(config.preset)) return void 0;
+    legacyValue = { type: config.preset };
+  } else if (config.kind === "relative") {
+    if (!RELATIVE_DIRECTIONS.has(config.direction) || !RELATIVE_UNITS.has(config.unit)) return void 0;
+    const amount = Math.floor(Number(config.amount));
+    if (!Number.isFinite(amount) || amount <= 0) return void 0;
+    legacyValue = { type: config.direction, unit: config.unit, number: amount };
+  } else {
+    legacyValue = config.value;
+  }
+  const expression = serializeCtxDateValue(legacyValue);
+  if (!expression || !config.format) return expression;
+  const format = String(config.format);
+  if (!format.trim() || format.length > MAX_DATE_FORMAT_LENGTH) return void 0;
+  const segments = withDatePrefix(parseCtxDateSegments(expression) || []);
+  return toCtxDateExpression(["date", "format", `v${encodeBase64Url(format)}`, ...segments.slice(1)]);
+}
+__name(serializeCtxDateExpressionConfig, "serializeCtxDateExpressionConfig");
 function serializeCtxDateValue(value) {
   if (isCtxDateExpression(value)) {
     return String(value).trim();
@@ -317,8 +407,23 @@ function serializeCtxDateValue(value) {
   return void 0;
 }
 __name(serializeCtxDateValue, "serializeCtxDateValue");
+function formatResolvedDateValue(value, format) {
+  const formatValue = /* @__PURE__ */ __name((item) => {
+    if (typeof item !== "string") return item;
+    const parsed = (0, import_dayjs.default)(item);
+    return parsed.isValid() ? parsed.format(format) : item;
+  }, "formatValue");
+  return Array.isArray(value) ? value.map(formatValue) : formatValue(value);
+}
+__name(formatResolvedDateValue, "formatResolvedDateValue");
 function resolveCtxDatePath(pathSegments) {
-  const segments = withDatePrefix((pathSegments || []).map((seg) => String(seg)));
+  const rawSegments = withDatePrefix((pathSegments || []).map((seg) => String(seg)));
+  const formatted = splitFormattedDateSegments(rawSegments);
+  if (!formatted) return void 0;
+  if (formatted.format) {
+    return formatResolvedDateValue(resolveCtxDatePath(formatted.baseSegments), formatted.format);
+  }
+  const segments = formatted.baseSegments;
   if (segments[0] !== "date") return void 0;
   if (segments[1] === "preset" && segments.length === 3) {
     const key = segments[2];
@@ -375,6 +480,8 @@ __name(resolveCtxDatePath, "resolveCtxDatePath");
   isCtxDateExpression,
   isCtxDatePathPrefix,
   parseCtxDateExpression,
+  parseCtxDateExpressionConfig,
   resolveCtxDatePath,
+  serializeCtxDateExpressionConfig,
   serializeCtxDateValue
 });

package/lib/utils/index.d.ts

@@ -11,17 +11,17 @@ 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';
 export { parsePathnameToViewParams, type ViewParam } from './parsePathnameToViewParams';
 export { createOpenViewRouteState, decodeOpenViewRouteState, encodeOpenViewRouteState, isOpenViewRouteStateToken, RUNJS_OPEN_VIEW_ROUTE_STATE, type OpenViewRouteMode, type OpenViewRouteSize, type OpenViewRouteState, } from './openViewRouteState';
-export { decodeBase64Url, encodeBase64Url, isCompleteCtxDatePath, isCtxDatePathPrefix, isCtxDateExpression, parseCtxDateExpression, resolveCtxDatePath, serializeCtxDateValue, } from './dateVariable';
+export { decodeBase64Url, encodeBase64Url, isCompleteCtxDatePath, isCtxDatePathPrefix, isCtxDateExpression, parseCtxDateExpression, parseCtxDateExpressionConfig, resolveCtxDatePath, serializeCtxDateExpressionConfig, serializeCtxDateValue, type CtxDateExpressionConfig, type CtxDatePreset, type CtxDateRelativeDirection, type CtxDateRelativeUnit, } from './dateVariable';
 export { createSafeDocument, createSafeWindow, createSafeNavigator, createSafeRunJSGlobals, runjsWithSafeGlobals, } from './safeGlobals';
 export { isRunJSValue, normalizeRunJSValue, extractUsedVariablePathsFromRunJS, type RunJSValue } from './runjsValue';
 export { resolveRunJSObjectValues } from './resolveRunJSObjectValues';

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,
@@ -61,6 +62,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,
@@ -75,6 +77,7 @@ __export(utils_exports, {
   isVariableExpression: () => import_context.isVariableExpression,
   normalizeRunJSValue: () => import_runjsValue.normalizeRunJSValue,
   parseCtxDateExpression: () => import_dateVariable.parseCtxDateExpression,
+  parseCtxDateExpressionConfig: () => import_dateVariable.parseCtxDateExpressionConfig,
   parsePathnameToViewParams: () => import_parsePathnameToViewParams.parsePathnameToViewParams,
   prepareRunJsCode: () => import_runjsTemplateCompat.prepareRunJsCode,
   preprocessRunJsTemplates: () => import_runjsTemplateCompat.preprocessRunJsTemplates,
@@ -90,6 +93,7 @@ __export(utils_exports, {
   resolveStepUiSchema: () => import_schema_utils.resolveStepUiSchema,
   resolveUiMode: () => import_schema_utils.resolveUiMode,
   runjsWithSafeGlobals: () => import_safeGlobals.runjsWithSafeGlobals,
+  serializeCtxDateExpressionConfig: () => import_dateVariable.serializeCtxDateExpressionConfig,
   serializeCtxDateValue: () => import_dateVariable.serializeCtxDateValue,
   setAutoFlowError: () => import_autoFlowError.setAutoFlowError,
   setupRuntimeContextSteps: () => import_setupRuntimeContextSteps.setupRuntimeContextSteps,
@@ -133,6 +137,7 @@ var import_randomId = require("./randomId");
   FlowExitException,
   MENU_KEYS,
   RUNJS_OPEN_VIEW_ROUTE_STATE,
+  buildFlowModelResolveDescriptor,
   buildRecordMeta,
   clearAutoFlowError,
   collectContextParamsForTemplate,
@@ -160,6 +165,7 @@ var import_randomId = require("./randomId");
   extractUsedVariablePaths,
   extractUsedVariablePathsFromRunJS,
   formatPathToVariable,
+  getAssociationFilterByTk,
   getAutoFlowError,
   getT,
   inferRecordRef,
@@ -174,6 +180,7 @@ var import_randomId = require("./randomId");
   isVariableExpression,
   normalizeRunJSValue,
   parseCtxDateExpression,
+  parseCtxDateExpressionConfig,
   parsePathnameToViewParams,
   prepareRunJsCode,
   preprocessRunJsTemplates,
@@ -189,6 +196,7 @@ var import_randomId = require("./randomId");
   resolveStepUiSchema,
   resolveUiMode,
   runjsWithSafeGlobals,
+  serializeCtxDateExpressionConfig,
   serializeCtxDateValue,
   setAutoFlowError,
   setupRuntimeContextSteps,

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

@@ -27,10 +27,13 @@ export type JSONValue = string | {
     [key: string]: JSONValue;
 } | JSONValue[];
 type BatchPayload = {
+    contractRd?: string;
+    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,8 @@ function enqueueVariablesResolve(ctx, payload) {
     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 || {}
       }));
@@ -187,6 +191,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 +317,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.d.ts

@@ -28,6 +28,7 @@ interface PopupNodeResource {
 interface PopupNode {
     uid?: string;
     resource: PopupNodeResource;
+    sourceRecord?: unknown;
     parent?: PopupNode;
 }
 export declare function buildPopupRuntime(ctx: FlowContext, view: FlowView): Promise<PopupNode | undefined>;