@nocobase/flow-engine 2.2.0-beta.8 → 2.2.0

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) {
@@ -2626,12 +2638,16 @@ const _FlowEngineContext = class _FlowEngineContext extends BaseFlowEngineContex
       }, "get")
     });
     this.defineProperty("auth", {
-      get: /* @__PURE__ */ __name(() => ({
-        roleName: this.api.auth.role,
-        locale: this.api.auth.locale,
-        token: this.api.auth.token,
-        user: this.user
-      }), "get")
+      get: /* @__PURE__ */ __name(() => {
+        var _a, _b, _c, _d, _e, _f;
+        return {
+          roleName: (_b = (_a = this.api) == null ? void 0 : _a.auth) == null ? void 0 : _b.role,
+          locale: (_d = (_c = this.api) == null ? void 0 : _c.auth) == null ? void 0 : _d.locale,
+          token: (_f = (_e = this.api) == null ? void 0 : _e.auth) == null ? void 0 : _f.token,
+          user: this.user
+        };
+      }, "get"),
+      cache: false
     });
     this.defineProperty("date", {
       get: /* @__PURE__ */ __name(() => {
@@ -3494,9 +3510,38 @@ function __mergeRunJSDocMeta(base, patch) {
 }
 __name(__mergeRunJSDocMeta, "__mergeRunJSDocMeta");
 const _FlowRunJSContext = class _FlowRunJSContext extends FlowContext {
+  [import_dirtyAwareApiClient.PREPARE_CONTEXT_RESOURCE_ACTION_PARAMS](action, params) {
+    var _a, _b, _c, _d, _e;
+    if (action.actionName.toLowerCase() !== "create" || !params || Array.isArray(params) || Object.prototype.hasOwnProperty.call(params, "updateAssociationValues") || !this.form || typeof ((_a = this.blockModel) == null ? void 0 : _a.submitFromRunJs) !== "function") {
+      return params;
+    }
+    const resource = this.resource;
+    const currentResourceName = (_b = resource == null ? void 0 : resource.getResourceName) == null ? void 0 : _b.call(resource);
+    const currentDataSourceKey = ((_c = resource == null ? void 0 : resource.getDataSourceKey) == null ? void 0 : _c.call(resource)) || "main";
+    if (action.resourceName !== currentResourceName || (action.dataSourceKey || "main") !== currentDataSourceKey) {
+      return params;
+    }
+    const currentSourceId = (_d = resource == null ? void 0 : resource.getSourceId) == null ? void 0 : _d.call(resource);
+    if ((currentResourceName == null ? void 0 : currentResourceName.includes(".")) && currentSourceId !== null && typeof currentSourceId !== "undefined" && String(action.resourceOf ?? "") !== String(currentSourceId)) {
+      return params;
+    }
+    const updateAssociationValues = (_e = resource == null ? void 0 : resource.getUpdateAssociationValues) == null ? void 0 : _e.call(resource);
+    if (!Array.isArray(updateAssociationValues) || updateAssociationValues.length === 0) {
+      return params;
+    }
+    return {
+      ...params,
+      updateAssociationValues: [...updateAssociationValues]
+    };
+  }
   constructor(delegate) {
+    var _a, _b;
     super();
     this.addDelegate(delegate);
+    const submit = (_b = (_a = delegate.blockModel) == null ? void 0 : _a.submitFromRunJs) == null ? void 0 : _b.bind(delegate.blockModel);
+    if (delegate.form && submit) {
+      this.defineProperty("form", { value: { ...delegate.form, submit } });
+    }
     this.defineProperty("React", { value: import_react.default });
     this.defineProperty("antd", { value: antd });
     this.defineProperty("dayjs", {

package/lib/flowEngine.js

@@ -1141,6 +1141,9 @@ const _FlowEngine = class _FlowEngine {
     if (!this.ensureModelRepository()) return;
     const refresh = !!(options == null ? void 0 : options.refresh);
     const bypassLoadedPageCache = this._loadedPageCache.shouldBypass(options, () => this.context.flowSettingsEnabled);
+    if (this.context.flowSettingsEnabled) {
+      this._loadedPageCache.markDirtyForOptions(options);
+    }
     if (!refresh && !bypassLoadedPageCache) {
       const model2 = this.findModelByParentId(options.parentId, options.subKey);
       if (model2) {
@@ -1201,6 +1204,9 @@ const _FlowEngine = class _FlowEngine {
     if (!this.ensureModelRepository()) return;
     const { uid, parentId, subKey } = options;
     const bypassLoadedPageCache = this._loadedPageCache.shouldBypass(options, () => this.context.flowSettingsEnabled);
+    if (this.context.flowSettingsEnabled) {
+      this._loadedPageCache.markDirtyForOptions(options);
+    }
     if (uid && !bypassLoadedPageCache && this._modelInstances.has(uid)) {
       return this._modelInstances.get(uid);
     }

package/lib/flowI18n.js

@@ -81,7 +81,7 @@ const _FlowI18n = class _FlowI18n {
    * @private
    */
   isTemplate(str) {
-    return /\{\{\s*t\s*\(\s*["'`].*?["'`]\s*(?:,\s*.*?)?\s*\)\s*\}\}/g.test(str);
+    return /\{\{\s*t\s*\(\s*(["'`])(?:\\.|(?!\1).)*?\1\s*(?:,\s*.*?)?\s*\)\s*\}\}/.test(str);
   }
   /**
    * 编译模板字符串
@@ -89,8 +89,8 @@ const _FlowI18n = class _FlowI18n {
    */
   compileTemplate(template) {
     return template.replace(
-      /\{\{\s*t\s*\(\s*["'`](.*?)["'`]\s*(?:,\s*((?:[^{}]|\{[^}]*\})*?))?\s*\)\s*\}\}/g,
-      (match, key, optionsStr) => {
+      /\{\{\s*t\s*\(\s*(["'`])((?:\\.|(?!\1).)*?)\1\s*(?:,\s*((?:[^{}]|\{[^}]*\})*?))?\s*\)\s*\}\}/g,
+      (match, _quote, key, optionsStr) => {
         try {
           let templateOptions = {};
           if (optionsStr) {

package/lib/locale/en-US.json

@@ -1,5 +1,6 @@
 {
   "Add": "Add",
+  "Are you sure you want to perform the action?": "Are you sure you want to perform the action?",
   "Are you sure you want to delete this item? This action cannot be undone.": "Are you sure you want to delete this item? This action cannot be undone.",
   "Are you sure to convert this template block to copy mode?": "Are you sure you want to convert this template block to copy mode?",
   "Array index out of bounds": "Array index {{index}} out of bounds for '{{subKey}}'",
@@ -53,6 +54,7 @@
   "Other blocks": "Other blocks",
   "Parent not found, cannot replace block": "Parent not found, cannot replace block",
   "Previous step": "Previous step",
+  "Please Confirm": "Please Confirm",
   "Replace current block with template?": "Replace current block with template?",
   "Replaced with template block": "Replaced with template block",
   "Render failed": "Render failed",

package/lib/locale/index.d.ts

@@ -9,6 +9,7 @@
 export declare const locales: {
     'en-US': {
         Add: string;
+        "Are you sure you want to perform the action?": string;
         "Are you sure you want to delete this item? This action cannot be undone.": string;
         "Are you sure to convert this template block to copy mode?": string;
         "Array index out of bounds": string;
@@ -62,6 +63,7 @@ export declare const locales: {
         "Other blocks": string;
         "Parent not found, cannot replace block": string;
         "Previous step": string;
+        "Please Confirm": string;
         "Replace current block with template?": string;
         "Replaced with template block": string;
         "Render failed": string;
@@ -91,6 +93,7 @@ export declare const locales: {
     };
     'zh-CN': {
         Add: string;
+        "Are you sure you want to perform the action?": string;
         "Are you sure you want to delete this item? This action cannot be undone.": string;
         "Are you sure to convert this template block to copy mode?": string;
         "Array index out of bounds": string;
@@ -150,6 +153,7 @@ export declare const locales: {
         OK: string;
         "Other blocks": string;
         "Previous step": string;
+        "Please Confirm": string;
         "Render failed": string;
         "Response record": string;
         "Step configuration": string;

package/lib/locale/zh-CN.json

@@ -1,5 +1,6 @@
 {
   "Add": "添加",
+  "Are you sure you want to perform the action?": "确定要执行此操作吗？",
   "Are you sure you want to delete this item? This action cannot be undone.": "确定要删除此项吗？此操作不可撤销。",
   "Are you sure to convert this template block to copy mode?": "确定将该模板区块转换为复制模式吗？",
   "Array index out of bounds": "数组索引 {{index}} 超出 '{{subKey}}' 的边界",
@@ -59,6 +60,7 @@
   "OK": "确定",
   "Other blocks": "其他区块",
   "Previous step": "上一步",
+  "Please Confirm": "请确认",
   "Render failed": "渲染失败",
   "Response record": "响应结果记录",
   "Step configuration": "步骤配置",

package/lib/resources/flowResource.js

@@ -60,6 +60,7 @@ const _ResourceError = class _ResourceError extends Error {
   constructor(error) {
     const data = toErrMessages(error).shift();
     super(data.message);
+    this.data = data;
     this.name = "ResponseError";
   }
   get code() {

package/lib/types.d.ts

@@ -122,7 +122,9 @@ export declare enum ActionScene {
     /** 动态事件流可用 */
     DYNAMIC_EVENT_FLOW = 6,
     /** 菜单项联动规则可用 */
-    MENU_LINKAGE_RULES = 7
+    MENU_LINKAGE_RULES = 7,
+    /** 标签页联动规则可用 */
+    TAB_LINKAGE_RULES = 8
 }
 /**
  * Defines a reusable action with generic model type support.

package/lib/types.js

@@ -37,6 +37,7 @@ var ActionScene = /* @__PURE__ */ ((ActionScene2) => {
   ActionScene2[ActionScene2["ACTION_LINKAGE_RULES"] = 5] = "ACTION_LINKAGE_RULES";
   ActionScene2[ActionScene2["DYNAMIC_EVENT_FLOW"] = 6] = "DYNAMIC_EVENT_FLOW";
   ActionScene2[ActionScene2["MENU_LINKAGE_RULES"] = 7] = "MENU_LINKAGE_RULES";
+  ActionScene2[ActionScene2["TAB_LINKAGE_RULES"] = 8] = "TAB_LINKAGE_RULES";
   return ActionScene2;
 })(ActionScene || {});
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -8,4 +8,5 @@
  */
 import type { FlowContext } from '../flowContext';
 export declare const SKIP_DATA_SOURCE_DIRTY = "__nocobaseSkipDataSourceDirty";
+export declare const PREPARE_CONTEXT_RESOURCE_ACTION_PARAMS: unique symbol;
 export declare function getDirtyAwareApiClient(value: unknown, context: FlowContext): unknown;