@nocobase/flow-engine 2.2.0-alpha.7 → 2.2.0-beta.10

package/lib/components/FlowContextSelector.js

@@ -57,15 +57,6 @@ const cascaderPopupAutoHeightClassName = import_css.css`
     max-height: 50vh;
   }
 `;
-function getMetaNodeTooltip(meta) {
-  if (!meta) {
-    return void 0;
-  }
-  const metaWithTooltip = meta;
-  const options = meta.options;
-  return metaWithTooltip.tooltip ?? (options == null ? void 0 : options.tooltip);
-}
-__name(getMetaNodeTooltip, "getMetaNodeTooltip");
 const normalizePath = /* @__PURE__ */ __name((path) => {
   if (!Array.isArray(path)) {
     return void 0;
@@ -99,7 +90,6 @@ const FlowContextSelectorComponent = /* @__PURE__ */ __name(({
   value,
   onChange,
   children,
-  active,
   metaTree,
   showSearch = false,
   parseValueToPath: customParseValueToPath = import_utils.parseValueToPath,
@@ -107,7 +97,6 @@ const FlowContextSelectorComponent = /* @__PURE__ */ __name(({
   open,
   onlyLeafSelectable = false,
   ignoreFieldNames,
-  dropdownFooter,
   ...cascaderProps
 }) => {
   const { token } = import_antd.theme.useToken();
@@ -122,27 +111,15 @@ const FlowContextSelectorComponent = /* @__PURE__ */ __name(({
         const disabled = meta ? !!(typeof meta.disabled === "function" ? meta.disabled() : meta.disabled) : false;
         const disabledReason = meta ? typeof meta.disabledReason === "function" ? meta.disabledReason() : meta.disabledReason : void 0;
         const baseLabel = typeof o.label === "string" ? flowCtx.t(o.label) : o.label;
-        const labelText = typeof baseLabel === "string" ? baseLabel : String(o.value);
-        const tooltip = getMetaNodeTooltip(meta);
-        const tooltipTitle = disabled ? disabledReason || tooltip || flowCtx.t("This variable is not available") : tooltip;
-        const label = tooltipTitle ? /* @__PURE__ */ import_react.default.createElement("span", null, baseLabel, /* @__PURE__ */ import_react.default.createElement(
+        const label = disabled ? /* @__PURE__ */ import_react.default.createElement("span", null, baseLabel, /* @__PURE__ */ import_react.default.createElement(
           import_antd.Tooltip,
           {
-            title: typeof tooltipTitle === "string" ? flowCtx.t(tooltipTitle) : tooltipTitle,
-            placement: "top",
-            classNames: { root: "flow-variable-tip" },
+            title: disabledReason || flowCtx.t("This variable is not available"),
+            placement: "right",
+            overlayClassName: "flow-variable-disabled-tip",
             destroyTooltipOnHide: true
           },
-          /* @__PURE__ */ import_react.default.createElement(
-            import_icons.QuestionCircleOutlined,
-            {
-              "aria-label": `${labelText} tooltip`,
-              style: {
-                marginLeft: token.marginXXS,
-                color: disabled ? token.colorTextDisabled : token.colorTextDescription
-              }
-            }
-          )
+          /* @__PURE__ */ import_react.default.createElement(import_icons.QuestionCircleOutlined, { style: { marginLeft: 6, color: "rgba(0,0,0,0.35)" } })
         )) : baseLabel;
         return {
           ...o,
@@ -152,7 +129,7 @@ const FlowContextSelectorComponent = /* @__PURE__ */ __name(({
         };
       });
     },
-    [flowCtx, token.colorTextDescription, token.colorTextDisabled, token.marginXXS]
+    [flowCtx]
   );
   const [updateFlag, setUpdateFlag] = (0, import_react.useState)(0);
   const [searchText, setSearchText] = (0, import_react.useState)("");
@@ -242,9 +219,9 @@ const FlowContextSelectorComponent = /* @__PURE__ */ __name(({
     (0, import_utils.preloadContextSelectorPath)(options, pathToPreload, triggerUpdate);
   }, [options, pathToPreload, triggerUpdate]);
   const defaultChildren = (0, import_react.useMemo)(() => {
-    const hasSelected = active ?? Boolean(currentPath && currentPath.length > 0);
-    return /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { type: hasSelected ? "primary" : "default", style: defaultButtonStyle, disabled: cascaderProps.disabled }, "x");
-  }, [active, cascaderProps.disabled, currentPath]);
+    const hasSelected = currentPath && currentPath.length > 0;
+    return /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { type: hasSelected ? "primary" : "default", style: defaultButtonStyle }, "x");
+  }, [currentPath]);
   const handleChange = (0, import_react.useCallback)(
     (selectedValues, selectedOptions) => {
       const lastOption = selectedOptions == null ? void 0 : selectedOptions[selectedOptions.length - 1];
@@ -312,32 +289,12 @@ const FlowContextSelectorComponent = /* @__PURE__ */ __name(({
     },
     [cascaderOnDropdownVisibleChange, open]
   );
-  const footerNode = (0, import_react.useMemo)(() => {
-    if (dropdownFooter !== void 0) {
-      return dropdownFooter;
-    }
-    if (onlyLeafSelectable) {
-      return null;
-    }
-    return /* @__PURE__ */ import_react.default.createElement(
-      "div",
-      {
-        className: import_css.css`
-          padding: 6px 12px;
-          color: ${token.colorTextDescription};
-          border-top: 1px solid ${token.colorSplit};
-          font-size: ${token.fontSizeSM}px;
-        `
-      },
-      flowCtx.t("Double click to choose entire object")
-    );
-  }, [dropdownFooter, onlyLeafSelectable, token, flowCtx]);
   const renderDropdown = (0, import_react.useCallback)(
     (menu) => {
       const cascaderMenuNode = cascaderDropdownRender ? cascaderDropdownRender(menu) : menu;
       const cascaderMenu = import_react.default.isValidElement(cascaderMenuNode) ? cascaderMenuNode : /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, cascaderMenuNode);
       if (!isSearchEnabled || children === null) {
-        return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, cascaderMenu, footerNode);
+        return cascaderMenu;
       }
       return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: cascaderSearchInputClassName }, /* @__PURE__ */ import_react.default.createElement(
         import_antd.Input,
@@ -349,9 +306,9 @@ const FlowContextSelectorComponent = /* @__PURE__ */ __name(({
           onChange: (e) => setSearchText(e.target.value),
           onKeyDown: (e) => e.stopPropagation()
         }
-      )), cascaderMenu, footerNode);
+      )), cascaderMenu);
     },
-    [cascaderDropdownRender, cascaderSearchInputClassName, children, flowCtx, isSearchEnabled, searchText, footerNode]
+    [cascaderDropdownRender, cascaderSearchInputClassName, children, flowCtx, isSearchEnabled, searchText]
   );
   const inlinePlaceholder = typeof restCascaderProps.placeholder === "string" ? restCascaderProps.placeholder : flowCtx.t("Search");
   const hasSelectedPath = Array.isArray(effectivePath) && effectivePath.length > 0;

package/lib/components/FormItem.js

@@ -77,18 +77,14 @@ const formItemPropKeys = [
   "required",
   "showLabel"
 ];
-const modelInternalPropKeys = ["globalSort"];
 const FormItem = /* @__PURE__ */ __name(({
   children,
   showLabel = true,
   labelWidth,
   ...rest
 }) => {
-  const forwardedRest = Object.fromEntries(
-    Object.entries(rest).filter(([key]) => !modelInternalPropKeys.includes(key))
-  );
   const childProps = Object.fromEntries(
-    Object.entries(forwardedRest).filter(([key]) => !formItemPropKeys.includes(key))
+    Object.entries(rest).filter(([key]) => !formItemPropKeys.includes(key))
   );
   const processedChildren = typeof children === "function" ? children : import_react.default.Children.map(children, (child) => {
     if (import_react.default.isValidElement(child)) {
@@ -96,7 +92,7 @@ const FormItem = /* @__PURE__ */ __name(({
     }
     return child;
   });
-  const { label, labelWrap, colon = true, layout } = forwardedRest;
+  const { label, labelWrap, colon = true, layout } = rest;
   const effectiveLabelWrap = !layout || layout === "vertical" ? true : labelWrap;
   const labelColStyle = layout === "vertical" ? { width: labelWidth, ...verticalFormItemLabelStyle } : { width: labelWidth };
   const renderLabel = /* @__PURE__ */ __name(() => {
@@ -140,15 +136,15 @@ const FormItem = /* @__PURE__ */ __name(({
   return /* @__PURE__ */ import_react.default.createElement(
     import_antd.Form.Item,
     {
-      ...forwardedRest,
-      style: { ...formItemStyle, ...forwardedRest.style },
+      ...rest,
+      style: { ...formItemStyle, ...rest.style },
       labelCol: { style: labelColStyle },
       layout,
       label: renderLabel(),
       colon: false,
-      extra: forwardedRest.extra && /* @__PURE__ */ import_react.default.createElement("span", { style: { whiteSpace: "pre-wrap" } }, forwardedRest.extra),
-      tooltip: forwardedRest.tooltip && {
-        title: forwardedRest.tooltip,
+      extra: rest.extra && /* @__PURE__ */ import_react.default.createElement("span", { style: { whiteSpace: "pre-wrap" } }, rest.extra),
+      tooltip: rest.tooltip && {
+        title: rest.tooltip,
         overlayInnerStyle: { whiteSpace: "pre-line" }
       }
     },

package/lib/components/variables/VariableHybridInput.d.ts

@@ -17,20 +17,11 @@ export interface VariableHybridInputProps {
     value?: string;
     onChange?: (value: string) => void;
     disabled?: boolean;
-    readOnly?: boolean;
     placeholder?: string;
     addonBefore?: React.ReactNode;
     metaTree?: MetaTreeNode[] | (() => MetaTreeNode[] | Promise<MetaTreeNode[]>);
     converters?: VariableHybridInputConverters;
     style?: React.CSSProperties;
     className?: string;
-    /**
-     * Validation status — turns the input border red (`error`) or amber
-     * (`warning`). Usually omitted: when rendered inside an antd `Form.Item`, the
-     * status is read automatically from `FormItemInputContext`, so dropping this
-     * into a `Form.Item` with failing rules colours the border with no extra
-     * wiring. An explicit prop wins over the inherited form status.
-     */
-    status?: 'error' | 'warning';
 }
 export declare const VariableHybridInput: React.NamedExoticComponent<VariableHybridInputProps>;

package/lib/components/variables/VariableHybridInput.js

@@ -42,7 +42,6 @@ __export(VariableHybridInput_exports, {
 module.exports = __toCommonJS(VariableHybridInput_exports);
 var import_css = require("@emotion/css");
 var import_antd = require("antd");
-var import_context = require("antd/es/form/context");
 var import_react = __toESM(require("react"));
 var import_FlowContextProvider = require("../../FlowContextProvider");
 var import_FlowContextSelector = require("../FlowContextSelector");
@@ -84,28 +83,14 @@ function normalizeVariableKey(value) {
   return value.replace(/^\{\{\s*/, "").replace(/\s*\}\}$/, "").trim();
 }
 __name(normalizeVariableKey, "normalizeVariableKey");
-function renderHTML(value, regExp, resolveLabel) {
+function renderHTML(value, labelMap, regExp) {
   const re = new RegExp(regExp.source, regExp.flags.includes("g") ? regExp.flags : `${regExp.flags}g`);
   return escapeHtml(value || "").replace(re, (matched) => {
-    const label = resolveLabel(matched) || matched;
+    const label = labelMap.get(normalizeVariableKey(matched)) || matched;
     return createTagHTML(matched, label);
   });
 }
 __name(renderHTML, "renderHTML");
-function resolveTitlesByPath(roots, path, ctxT) {
-  if (!roots || !path || !path.length) return void 0;
-  const titles = [];
-  let nodes = roots;
-  for (const segment of path) {
-    if (!nodes) return void 0;
-    const matched = nodes.find((node) => node.name === segment);
-    if (!matched) return void 0;
-    titles.push(reactNodeToPlainText(matched.title || matched.name));
-    nodes = Array.isArray(matched.children) ? matched.children : void 0;
-  }
-  return titles.map(ctxT).join("/");
-}
-__name(resolveTitlesByPath, "resolveTitlesByPath");
 function buildLabelMap(nodes, ctxT, converters) {
   const map = /* @__PURE__ */ new Map();
   function walk(items = [], parentTitles = []) {
@@ -127,34 +112,6 @@ function buildLabelMap(nodes, ctxT, converters) {
   return map;
 }
 __name(buildLabelMap, "buildLabelMap");
-function collectReferencePaths(value, regExp, parseValueToPath) {
-  const re = new RegExp(regExp.source, regExp.flags.includes("g") ? regExp.flags : `${regExp.flags}g`);
-  const paths = [];
-  for (const matched of value.match(re) ?? []) {
-    const path = parseValueToPath(matched);
-    if (path && path.length) {
-      paths.push(path);
-    }
-  }
-  return paths;
-}
-__name(collectReferencePaths, "collectReferencePaths");
-async function preloadReferencePath(path, roots) {
-  let nodes = roots;
-  let didLoad = false;
-  for (const segment of path) {
-    if (!nodes) break;
-    const matched = nodes.find((node) => node.name === segment);
-    if (!matched) break;
-    if (typeof matched.children === "function") {
-      matched.children = await (0, import_utils.loadMetaTreeChildren)(matched);
-      didLoad = true;
-    }
-    nodes = Array.isArray(matched.children) ? matched.children : void 0;
-  }
-  return didLoad;
-}
-__name(preloadReferencePath, "preloadReferencePath");
 function pasteHTML(container, html, indexes) {
   var _a;
   const selection = (_a = window.getSelection) == null ? void 0 : _a.call(window);
@@ -256,64 +213,21 @@ function getCurrentRange(element) {
 }
 __name(getCurrentRange, "getCurrentRange");
 const VariableHybridInputComponent = /* @__PURE__ */ __name((props) => {
-  var _a;
-  const { addonBefore, className, converters, disabled, metaTree, onChange, placeholder, readOnly, style } = props;
+  const { addonBefore, className, converters, disabled, metaTree, onChange, placeholder, style } = props;
   const { token } = import_antd.theme.useToken();
   const ctx = (0, import_FlowContextProvider.useFlowContext)();
   const { resolvedMetaTree } = (0, import_useResolvedMetaTree.useResolvedMetaTree)(metaTree);
-  const formItemStatus = (_a = (0, import_react.useContext)(import_context.FormItemInputContext)) == null ? void 0 : _a.status;
-  const effectiveStatus = props.status ?? formItemStatus;
   const inputRef = (0, import_react.useRef)(null);
   const [isComposing, setIsComposing] = (0, import_react.useState)(false);
   const [changed, setChanged] = (0, import_react.useState)(false);
   const [range, setRange] = (0, import_react.useState)([-1, 0, -1, 0]);
   const value = typeof props.value === "string" ? props.value : props.value == null ? "" : String(props.value);
   const variableRegExp = (converters == null ? void 0 : converters.variableRegExp) ?? DEFAULT_VARIABLE_REGEXP;
-  const parseValueToPath = (converters == null ? void 0 : converters.parseValueToPath) ?? import_utils.parseValueToPath;
-  const [loadedFlag, setLoadedFlag] = (0, import_react.useState)(0);
-  (0, import_react.useEffect)(() => {
-    if (!value || !Array.isArray(resolvedMetaTree) || !resolvedMetaTree.length) {
-      return;
-    }
-    const paths = collectReferencePaths(value, variableRegExp, parseValueToPath);
-    if (!paths.length) {
-      return;
-    }
-    let cancelled = false;
-    const run = /* @__PURE__ */ __name(async () => {
-      let didLoad = false;
-      for (const path of paths) {
-        const loaded = await preloadReferencePath(path, resolvedMetaTree);
-        if (cancelled) return;
-        didLoad = didLoad || loaded;
-      }
-      if (didLoad && !cancelled) {
-        setLoadedFlag((prev) => prev + 1);
-      }
-    }, "run");
-    run();
-    return () => {
-      cancelled = true;
-    };
-  }, [value, resolvedMetaTree, variableRegExp, parseValueToPath]);
   const labelMap = (0, import_react.useMemo)(
     () => buildLabelMap(resolvedMetaTree, ctx.t, converters),
-    // `loadedFlag` is read so the map recomputes after a lazy level resolves.
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [resolvedMetaTree, ctx, converters, loadedFlag]
+    [resolvedMetaTree, ctx, converters]
   );
-  const resolveLabel = (0, import_react.useCallback)(
-    (matched) => {
-      const mapped = labelMap.get(normalizeVariableKey(matched));
-      if (mapped) return mapped;
-      const path = parseValueToPath(matched);
-      return resolveTitlesByPath(resolvedMetaTree, path, ctx.t);
-    },
-    // `loadedFlag` is read so a resolved lazy level re-creates this callback and re-renders the tags. `ctx` carries the translation fn.
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [labelMap, parseValueToPath, resolvedMetaTree, ctx, loadedFlag]
-  );
-  const [html, setHtml] = (0, import_react.useState)(() => renderHTML(value, variableRegExp, resolveLabel));
+  const [html, setHtml] = (0, import_react.useState)(() => renderHTML(value, labelMap, variableRegExp));
   const emitChange = (0, import_react.useCallback)(
     (target) => {
       onChange == null ? void 0 : onChange(getDomValue(target).trim());
@@ -321,20 +235,20 @@ const VariableHybridInputComponent = /* @__PURE__ */ __name((props) => {
     [onChange]
   );
   (0, import_react.useEffect)(() => {
-    setHtml(renderHTML(value, variableRegExp, resolveLabel));
+    setHtml(renderHTML(value, labelMap, variableRegExp));
     if (!changed) {
       setRange([-1, 0, -1, 0]);
     }
-  }, [value, resolveLabel]);
+  }, [value, labelMap]);
   (0, import_react.useEffect)(() => {
-    var _a2;
+    var _a;
     const element = inputRef.current;
     if (!element) return;
     if (document.activeElement !== element) return;
     const nextRange = new Range();
     if (changed) {
       if (range.join() === "-1,0,-1,0") return;
-      const selection = (_a2 = window.getSelection) == null ? void 0 : _a2.call(window);
+      const selection = (_a = window.getSelection) == null ? void 0 : _a.call(window);
       if (!selection) return;
       try {
         const children = Array.from(element.childNodes);
@@ -390,13 +304,12 @@ const VariableHybridInputComponent = /* @__PURE__ */ __name((props) => {
   );
   const handleInput = (0, import_react.useCallback)(
     ({ currentTarget }) => {
-      if (readOnly) return;
       if (isComposing) return;
       setChanged(true);
       setRange(getCurrentRange(currentTarget));
       emitChange(currentTarget);
     },
-    [emitChange, isComposing, readOnly]
+    [emitChange, isComposing]
   );
   const handleBlur = (0, import_react.useCallback)(({ currentTarget }) => {
     setRange(getCurrentRange(currentTarget));
@@ -409,7 +322,6 @@ const VariableHybridInputComponent = /* @__PURE__ */ __name((props) => {
   const handlePaste = (0, import_react.useCallback)(
     (event) => {
       event.preventDefault();
-      if (readOnly) return;
       const text = event.clipboardData.getData("text/plain").replace(/\n/g, " ");
       if (!text) return;
       setChanged(true);
@@ -417,18 +329,17 @@ const VariableHybridInputComponent = /* @__PURE__ */ __name((props) => {
       setRange(getCurrentRange(event.currentTarget));
       emitChange(event.currentTarget);
     },
-    [emitChange, readOnly]
+    [emitChange]
   );
   const handleCompositionStart = (0, import_react.useCallback)(() => setIsComposing(true), []);
   const handleCompositionEnd = (0, import_react.useCallback)(
     ({ currentTarget }) => {
       setIsComposing(false);
-      if (readOnly) return;
       setChanged(true);
       setRange(getCurrentRange(currentTarget));
       emitChange(currentTarget);
     },
-    [emitChange, readOnly]
+    [emitChange]
   );
   const wrapperClassName = (0, import_react.useMemo)(
     () => import_css.css`
@@ -546,42 +457,6 @@ const VariableHybridInputComponent = /* @__PURE__ */ __name((props) => {
           border-color: ${token.colorBorder};
         }
       }
-
-      &.is-readonly {
-        cursor: default;
-
-        &:hover {
-          border-color: ${token.colorBorder};
-        }
-      }
-
-      &.is-error {
-        border-color: ${token.colorError};
-
-        &:hover {
-          border-color: ${token.colorErrorBorderHover};
-        }
-
-        &:focus,
-        &:focus-visible {
-          border-color: ${token.colorError};
-          box-shadow: 0 0 0 ${token.controlOutlineWidth}px ${token.colorErrorOutline};
-        }
-      }
-
-      &.is-warning {
-        border-color: ${token.colorWarning};
-
-        &:hover {
-          border-color: ${token.colorWarningBorderHover};
-        }
-
-        &:focus,
-        &:focus-visible {
-          border-color: ${token.colorWarning};
-          box-shadow: 0 0 0 ${token.controlOutlineWidth}px ${token.colorWarningOutline};
-        }
-      }
     `;
   }, [token, addonBefore]);
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(import_antd.Space.Compact, { className: (0, import_css.cx)("nb-variable-hybrid-input", wrapperClassName, className), style }, addonBefore != null && /* @__PURE__ */ import_react.default.createElement("span", { className: addonClassName }, addonBefore), /* @__PURE__ */ import_react.default.createElement(
@@ -591,13 +466,9 @@ const VariableHybridInputComponent = /* @__PURE__ */ __name((props) => {
       role: "textbox",
       "aria-label": "textbox",
       className: (0, import_css.cx)(editorClassName, {
-        "is-disabled": disabled,
-        "is-readonly": readOnly,
-        "is-error": effectiveStatus === "error",
-        "is-warning": effectiveStatus === "warning"
+        "is-disabled": disabled
       }),
-      contentEditable: !disabled && !readOnly,
-      "aria-readonly": readOnly,
+      contentEditable: !disabled,
       "data-placeholder": placeholder,
       onInput: handleInput,
       onBlur: handleBlur,
@@ -612,10 +483,10 @@ const VariableHybridInputComponent = /* @__PURE__ */ __name((props) => {
     {
       metaTree,
       disabled,
-      parseValueToPath,
+      parseValueToPath: (converters == null ? void 0 : converters.parseValueToPath) ?? import_utils.parseValueToPath,
       formatPathToValue: (item) => {
-        var _a2;
-        return ((_a2 = converters == null ? void 0 : converters.formatPathToValue) == null ? void 0 : _a2.call(converters, item)) || (0, import_utils.formatPathToValue)(item);
+        var _a;
+        return ((_a = converters == null ? void 0 : converters.formatPathToValue) == null ? void 0 : _a.call(converters, item)) || (0, import_utils.formatPathToValue)(item);
       },
       onChange: handleSelectorChange
     }

package/lib/components/variables/VariableInput.js

@@ -188,7 +188,7 @@ const VariableInputComponent = /* @__PURE__ */ __name(({
       }
     }, "restoreFromValue");
     restoreFromValue();
-  }, [resolvedMetaTree, innerValue, resolvePathFromValue, currentMetaTreeNode, value]);
+  }, [resolvedMetaTree, innerValue, resolvePathFromValue, currentMetaTreeNode]);
   const ValueComponent = (0, import_react.useMemo)(() => {
     const Component = renderInputComponent == null ? void 0 : renderInputComponent(resolvedMetaTreeNode);
     const CustomComponent = resolvedMetaTreeNode == null ? void 0 : resolvedMetaTreeNode.render;
@@ -325,8 +325,6 @@ const VariableInputComponent = /* @__PURE__ */ __name(({
     {
       metaTree: resolvedMetaTree,
       value: innerValue,
-      active: (0, import_utils.isVariableValue)(innerValue),
-      disabled,
       onChange: handleVariableSelect,
       parseValueToPath: resolvePathFromValue,
       formatPathToValue: resolveValueFromPath,

package/lib/components/variables/types.d.ts

@@ -13,30 +13,12 @@ export interface FlowContextSelectorProps extends Omit<CascaderProps<ContextSele
     value?: string;
     onChange?: (value: string, metaTreeNode?: MetaTreeNode) => void;
     children?: CascaderProps<ContextSelectorItem>['children'];
-    /**
-     * Controls whether the default `x` trigger button is rendered as active
-     * (`type="primary"`). When omitted, the selector falls back to its parsed
-     * `value` path (`true` iff a valid variable path is currently selected).
-     *
-     * Use this when callers intentionally feed synthetic paths such as
-     * `['constant']` / `['null']` into the cascader to keep menu state aligned,
-     * but only want real variable references to show the blue active button.
-     */
-    active?: boolean;
     metaTree?: MetaTreeNode[] | (() => MetaTreeNode[] | Promise<MetaTreeNode[]>);
     parseValueToPath?: (value: string) => string[] | undefined;
     formatPathToValue?: (item: MetaTreeNode) => string;
     open?: boolean;
     onlyLeafSelectable?: boolean;
     ignoreFieldNames?: string[];
-    /**
-     * Footer rendered at the bottom of the dropdown. Defaults to a muted
-     * "Double click to choose entire object" hint when non-leaf selection is
-     * allowed (`onlyLeafSelectable` is false) — since double-clicking a non-leaf
-     * node selects the whole object. Pass an explicit node to override, or `null`
-     * to hide it.
-     */
-    dropdownFooter?: React.ReactNode;
 }
 export interface ContextSelectorItem {
     label: React.ReactNode;

package/lib/flowI18n.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/flow-engine",
-  "version": "2.2.0-alpha.7",
+  "version": "2.2.0-beta.10",
   "private": false,
   "description": "A standalone flow engine for NocoBase, managing workflows, models, and actions.",
   "main": "lib/index.js",
@@ -8,8 +8,8 @@
   "dependencies": {
     "@formily/antd-v5": "1.x",
     "@formily/reactive": "2.x",
-    "@nocobase/sdk": "2.2.0-alpha.7",
-    "@nocobase/shared": "2.2.0-alpha.7",
+    "@nocobase/sdk": "2.2.0-beta.10",
+    "@nocobase/shared": "2.2.0-beta.10",
     "ahooks": "^3.7.2",
     "axios": "^1.7.0",
     "dayjs": "^1.11.9",
@@ -37,5 +37,5 @@
   ],
   "author": "NocoBase Team",
   "license": "Apache-2.0",
-  "gitHead": "34ba02960fca9ab0b6881d3db7040a8a64067bba"
+  "gitHead": "d572beec24de46df948f28db72b25303a63bf62d"
 }

package/src/__tests__/flowI18n.test.ts

@@ -17,17 +17,6 @@ describe('FlowI18n', () => {
     expect(i18n.translate("{{ t('Hello') }}")).toBe('你好');
   });
 
-  it('keeps embedded quotes of a different type inside the key', () => {
-    // A single-quoted key whose text contains double quotes (and vice versa) must not be truncated at the first inner
-    // quote.
-    const key = 'Unlike "Post-action event", it listens for data changes.';
-    const table: Record<string, string> = { [key]: '与“操作后事件”不同，它监听数据变动。' };
-    const i18n = new FlowI18n({ i18n: { t: (k: string) => table[k] ?? k } });
-
-    expect(i18n.translate(`{{t('${key}', { ns: "workflow" })}}`)).toBe(table[key]);
-    expect(i18n.translate(`{{t("It's here", { ns: "workflow" })}}`)).toBe("It's here");
-  });
-
   it('template compile ignores malformed options', () => {
     const spy = vi.spyOn(console, 'warn').mockImplementation(() => undefined);
     const i18n = new FlowI18n({ i18n: { t: (k: string) => k } });