@nocobase/flow-engine 2.2.0-beta.15 → 2.2.0-beta.17

package/lib/acl/Acl.d.ts

@@ -5,7 +5,7 @@ interface CheckOptions {
     actionName: string;
     fields?: string[];
     recordPkValue?: string | number;
-    allowedActions: any[];
+    allowedActions?: Record<string, Array<string | number>>;
 }
 export declare class ACL {
     private flowEngine;
@@ -26,6 +26,7 @@ export declare class ACL {
     verifyScope: (actionName: string, recordPkValue: any, allowedActions: any) => boolean;
     parseAction(options: CheckOptions): any;
     parseField(options: CheckOptions): boolean;
+    can(options: CheckOptions): boolean;
     aclCheck(options: CheckOptions): Promise<boolean>;
 }
 export {};

package/lib/acl/Acl.js

@@ -154,6 +154,34 @@ const _ACL = class _ACL {
     const allowed = whitelist.includes(fields[0]);
     return allowed;
   }
+  can(options) {
+    var _a;
+    const { allowAll } = this.data;
+    if (allowAll) {
+      return true;
+    }
+    const { actionName, allowedActions, recordPkValue } = options;
+    const hasRecordPkValue = recordPkValue !== void 0 && recordPkValue !== null;
+    const recordPermission = hasRecordPkValue && allowedActions ? this.verifyScope(actionName, recordPkValue, allowedActions) : null;
+    if (hasRecordPkValue && allowedActions && recordPermission !== true) {
+      return false;
+    }
+    const params = this.parseAction(options);
+    if (!params) {
+      return false;
+    }
+    if (!import_lodash.default.isEmpty(params.filter) && recordPermission !== true) {
+      return false;
+    }
+    if (!((_a = options.fields) == null ? void 0 : _a.length)) {
+      return true;
+    }
+    const allowedFields = [].concat(params.whitelist || []).concat(params.fields || []).concat(params.appends || []);
+    if (!allowedFields.length) {
+      return true;
+    }
+    return options.fields.every((field) => allowedFields.includes(field));
+  }
   async aclCheck(options) {
     const { allowAll } = this.data;
     if (allowAll) {

package/lib/components/FlowContextSelector.js

@@ -247,6 +247,7 @@ const FlowContextSelectorComponent = /* @__PURE__ */ __name(({
   }, [active, cascaderProps.disabled, 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);
@@ -256,6 +257,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) {
@@ -267,12 +269,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/components/MobilePopup.js

@@ -47,25 +47,36 @@ var import_react_i18next = require("react-i18next");
 var import_lazy_helper = require("../lazy-helper");
 const { Popup } = (0, import_lazy_helper.lazy)(() => import("antd-mobile"), "Popup");
 const { CloseOutline } = (0, import_lazy_helper.lazy)(() => import("antd-mobile-icons"), "CloseOutline");
+const getMobilePopupMaxHeight = /* @__PURE__ */ __name(() => {
+  var _a;
+  if (typeof CSS !== "undefined" && ((_a = CSS.supports) == null ? void 0 : _a.call(CSS, "height", "100dvh"))) {
+    return "calc(100dvh - var(--nb-mobile-page-header-height, 46px))";
+  }
+  return "calc(100vh - var(--nb-mobile-page-header-height, 46px))";
+}, "getMobilePopupMaxHeight");
 const MobilePopup = /* @__PURE__ */ __name((props) => {
   var _a;
   const { title, visible, onClose: closePopup, children, minHeight, className, footer } = props;
   const { t } = (0, import_react_i18next.useTranslation)();
   const { componentCls, hashId } = (0, import_MobilePopup.useMobileActionDrawerStyle)();
   const bodyStyles = (_a = props.styles) == null ? void 0 : _a.body;
+  const defaultMaxHeight = getMobilePopupMaxHeight();
   const popupStyle = (0, import_react.useMemo)(() => {
     return {
       minHeight: (bodyStyles == null ? void 0 : bodyStyles.minHeight) ?? minHeight,
       height: bodyStyles == null ? void 0 : bodyStyles.height,
-      maxHeight: bodyStyles == null ? void 0 : bodyStyles.maxHeight
+      maxHeight: (bodyStyles == null ? void 0 : bodyStyles.maxHeight) ?? defaultMaxHeight
     };
-  }, [bodyStyles == null ? void 0 : bodyStyles.height, bodyStyles == null ? void 0 : bodyStyles.maxHeight, bodyStyles == null ? void 0 : bodyStyles.minHeight, minHeight]);
+  }, [bodyStyles == null ? void 0 : bodyStyles.height, bodyStyles == null ? void 0 : bodyStyles.maxHeight, bodyStyles == null ? void 0 : bodyStyles.minHeight, defaultMaxHeight, minHeight]);
   const bodyStyle = (0, import_react.useMemo)(() => {
     return {
       padding: 0,
+      maxHeight: defaultMaxHeight,
+      overflowY: "auto",
+      overflowX: "hidden",
       ...bodyStyles
     };
-  }, [bodyStyles]);
+  }, [bodyStyles, defaultMaxHeight]);
   const handleCloseKeyDown = (0, import_react.useCallback)(
     (event) => {
       if (event.key !== "Enter" && event.key !== " ") {

package/lib/components/subModel/LazyDropdown.js

@@ -347,19 +347,15 @@ const createSearchItem = /* @__PURE__ */ __name((item, searchKey, currentSearchV
         e.stopPropagation();
       },
       onChange: (e) => {
-        var _a;
         e.stopPropagation();
         const value = e.target.value;
         if (shouldActivateSearchSubmenu) {
           activateSearchSubmenu(searchKey);
         }
-        if (((_a = e.nativeEvent) == null ? void 0 : _a.isComposing) || searchHandlers.isComposing(searchKey)) {
+        if (e.nativeEvent.isComposing || searchHandlers.isComposing(searchKey)) {
           searchHandlers.updateInputValue(searchKey, value);
           return;
         }
-        if (!value && shouldActivateSearchSubmenu) {
-          deactivateSearchSubmenu(searchKey);
-        }
         searchHandlers.updateSearchValue(searchKey, value);
       },
       onCompositionStart: (e) => {
@@ -373,11 +369,7 @@ const createSearchItem = /* @__PURE__ */ __name((item, searchKey, currentSearchV
         e.stopPropagation();
         const value = e.currentTarget.value;
         if (shouldActivateSearchSubmenu) {
-          if (value) {
-            activateSearchSubmenu(searchKey);
-          } else {
-            deactivateSearchSubmenu(searchKey);
-          }
+          activateSearchSubmenu(searchKey);
         }
         searchHandlers.endComposition(searchKey, value);
       },
@@ -385,10 +377,20 @@ const createSearchItem = /* @__PURE__ */ __name((item, searchKey, currentSearchV
         e.stopPropagation();
       },
       onKeyDown: (e) => {
+        if (e.key === "Escape" || e.key === "Tab") {
+          deactivateSearchSubmenu(searchKey);
+          return;
+        }
+        if (shouldActivateSearchSubmenu) {
+          activateSearchSubmenu(searchKey);
+        }
         e.stopPropagation();
       },
       onMouseDown: (e) => {
         e.stopPropagation();
+        if (shouldActivateSearchSubmenu) {
+          activateSearchSubmenu(searchKey);
+        }
       },
       size: "small",
       style: {
@@ -409,7 +411,7 @@ const KEEP_OPEN_LABEL_STYLE = {
   width: "100%"
 };
 const DROPDOWN_PERSIST_TTL_MS = 350;
-const SUBMENU_CLOSE_DELAY = 0.05;
+const MENU_CLOSE_DELAY = 0.3;
 const SUBMENU_MOTION_DISABLED = {
   motionEnter: false,
   motionLeave: false
@@ -417,13 +419,18 @@ const SUBMENU_MOTION_DISABLED = {
 const dropdownPersistRegistry = /* @__PURE__ */ new Map();
 const LazyDropdown = /* @__PURE__ */ __name(({ menu, ...props }) => {
   const engine = (0, import_provider.useFlowEngine)();
+  const { getPrefixCls } = import_react.default.useContext(import_antd.ConfigProvider.ConfigContext);
+  const triggerId = import_react.default.useId();
   const [menuVisible, setMenuVisible] = (0, import_react.useState)(false);
   const [openKeys, setOpenKeys] = (0, import_react.useState)(/* @__PURE__ */ new Set());
-  const [activeSearchKey, setActiveSearchKey] = (0, import_react.useState)(null);
   const [rootItems, setRootItems] = (0, import_react.useState)([]);
   const [rootLoading, setRootLoading] = (0, import_react.useState)(false);
+  const activeSearchKeyRef = (0, import_react.useRef)(null);
   const closeByOutsideClickRef = (0, import_react.useRef)(false);
   const skipPreserveActiveSearchRef = (0, import_react.useRef)(false);
+  const triggerOpenClassName = `nb-lazy-dropdown-trigger-${triggerId.replace(/[^a-zA-Z0-9_-]/g, "")}`;
+  const defaultOpenClassName = `${getPrefixCls("dropdown", props.prefixCls)}-open`;
+  const mergedOpenClassName = [props.openClassName ?? defaultOpenClassName, triggerOpenClassName].filter(Boolean).join(" ");
   const dropdownMaxHeight = useNiceDropdownMaxHeight();
   const t = engine.translate.bind(engine);
   const { items: menuItems, keepDropdownOpen, persistKey, stateVersion, refreshKeys, ...dropdownMenuProps } = menu;
@@ -440,12 +447,12 @@ const LazyDropdown = /* @__PURE__ */ __name(({ menu, ...props }) => {
   useSubmenuStyles(menuVisible, dropdownMaxHeight);
   const closeMenu = (0, import_react.useCallback)(() => {
     setMenuVisible(false);
-    setActiveSearchKey(null);
+    activeSearchKeyRef.current = null;
     setOpenKeys(/* @__PURE__ */ new Set());
     clearAllSearchValues();
   }, [clearAllSearchValues]);
   const activateSearchSubmenu = (0, import_react.useCallback)((key) => {
-    setActiveSearchKey(key);
+    activeSearchKeyRef.current = key;
     setOpenKeys((prev) => {
       if (prev.has(key)) return prev;
       const next = new Set(prev);
@@ -454,34 +461,38 @@ const LazyDropdown = /* @__PURE__ */ __name(({ menu, ...props }) => {
     });
   }, []);
   const deactivateSearchSubmenu = (0, import_react.useCallback)((key) => {
-    setActiveSearchKey((prev) => prev === key ? null : prev);
+    if (activeSearchKeyRef.current === key) {
+      activeSearchKeyRef.current = null;
+    }
   }, []);
   const closeActiveSearchForPath = (0, import_react.useCallback)(
     (keyPath) => {
+      const activeSearchKey = activeSearchKeyRef.current;
       if (!activeSearchKey || keyPath === activeSearchKey || keyPath.startsWith(`${activeSearchKey}/`) || activeSearchKey.startsWith(`${keyPath}/`)) {
         return;
       }
       skipPreserveActiveSearchRef.current = true;
       clearSearchValue(activeSearchKey);
-      setActiveSearchKey(null);
+      activeSearchKeyRef.current = null;
       setOpenKeys((prev) => {
         const next = new Set(prev);
         next.delete(activeSearchKey);
         return next;
       });
     },
-    [activeSearchKey, clearSearchValue]
+    [clearSearchValue]
   );
   const handleMenuOpenChange = (0, import_react.useCallback)(
     (nextOpenKeys) => {
       var _a, _b;
       let normalized = normalizeOpenKeys(nextOpenKeys);
-      if (activeSearchKey && openKeys.has(activeSearchKey) && !normalized.includes(activeSearchKey)) {
-        if (normalized.length || skipPreserveActiveSearchRef.current) {
+      const activeSearchKey = activeSearchKeyRef.current;
+      if (activeSearchKey && !normalized.includes(activeSearchKey)) {
+        if (skipPreserveActiveSearchRef.current) {
           clearSearchValue(activeSearchKey);
-          setActiveSearchKey(null);
+          activeSearchKeyRef.current = null;
         } else {
-          normalized = [activeSearchKey];
+          normalized = Array.from(openKeys);
         }
       }
       if (!normalized.length && shouldPreventClose()) {
@@ -498,13 +509,15 @@ const LazyDropdown = /* @__PURE__ */ __name(({ menu, ...props }) => {
       (_b = dropdownMenuProps.onOpenChange) == null ? void 0 : _b.call(dropdownMenuProps, normalized);
       skipPreserveActiveSearchRef.current = false;
     },
-    [activeSearchKey, clearSearchValue, dropdownMenuProps, openKeys, shouldPreventClose]
+    [clearSearchValue, dropdownMenuProps, openKeys, shouldPreventClose]
   );
   (0, import_react.useEffect)(() => {
     if (!menuVisible) return;
     const markOutsideClick = /* @__PURE__ */ __name((event) => {
       const target = event.target;
-      const isOutside = !(target == null ? void 0 : target.closest(".ant-dropdown, .ant-dropdown-menu, .ant-dropdown-menu-submenu-popup"));
+      const isInsidePopup = target == null ? void 0 : target.closest(".ant-dropdown, .ant-dropdown-menu, .ant-dropdown-menu-submenu-popup");
+      const isInsideCurrentTrigger = target == null ? void 0 : target.closest(`.${triggerOpenClassName}`);
+      const isOutside = !isInsidePopup && !isInsideCurrentTrigger;
       closeByOutsideClickRef.current = isOutside;
       if (isOutside) {
         closeMenu();
@@ -516,7 +529,7 @@ const LazyDropdown = /* @__PURE__ */ __name(({ menu, ...props }) => {
       document.removeEventListener("pointerdown", markOutsideClick, true);
       document.removeEventListener("mousedown", markOutsideClick, true);
     };
-  }, [closeMenu, menuVisible]);
+  }, [closeMenu, menuVisible, triggerOpenClassName]);
   (0, import_react.useEffect)(() => {
     if (!persistKey) return;
     const until = dropdownPersistRegistry.get(persistKey) || 0;
@@ -734,13 +747,15 @@ const LazyDropdown = /* @__PURE__ */ __name(({ menu, ...props }) => {
       ...props,
       open: menuVisible,
       destroyPopupOnHide: true,
+      mouseLeaveDelay: props.mouseLeaveDelay ?? MENU_CLOSE_DELAY,
+      openClassName: mergedOpenClassName,
       overlayClassName,
       placement: "bottomLeft",
       menu: {
         ...dropdownMenuProps,
         openKeys: Array.from(openKeys),
         items,
-        subMenuCloseDelay: dropdownMenuProps.subMenuCloseDelay ?? SUBMENU_CLOSE_DELAY,
+        subMenuCloseDelay: dropdownMenuProps.subMenuCloseDelay ?? MENU_CLOSE_DELAY,
         motion: dropdownMenuProps.motion ?? SUBMENU_MOTION_DISABLED,
         onClick: /* @__PURE__ */ __name(() => {
         }, "onClick"),
@@ -752,7 +767,7 @@ const LazyDropdown = /* @__PURE__ */ __name(({ menu, ...props }) => {
         }
       },
       onOpenChange: (visible, info) => {
-        if (!visible && activeSearchKey && (info == null ? void 0 : info.source) === "trigger" && !closeByOutsideClickRef.current) {
+        if (!visible && activeSearchKeyRef.current && (info == null ? void 0 : info.source) === "trigger" && !closeByOutsideClickRef.current) {
           return;
         }
         if (!visible && shouldPreventClose()) {

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/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/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 {};