@nocobase/flow-engine 2.2.0-alpha.8 → 2.2.0-alpha.9

package/lib/components/variables/VariableInput.js

@@ -194,12 +194,12 @@ const VariableInputComponent = /* @__PURE__ */ __name(({
   const ValueComponent = (0, import_react.useMemo)(() => {
     const Component = renderInputComponent == null ? void 0 : renderInputComponent(resolvedMetaTreeNode);
     const CustomComponent = resolvedMetaTreeNode == null ? void 0 : resolvedMetaTreeNode.render;
-    const shouldRenderVariableTag = (0, import_utils.isVariableValue)(innerValue) || Boolean(resolvedMetaTreeNode) && Array.isArray(resolvedPath) && resolvedPath.length > 0 && !Component && !CustomComponent;
+    const shouldRenderVariableTag = (0, import_utils.isVariableValue)(innerValue) || Array.isArray(resolvedPath) && resolvedPath.length > 0 && !Component && !CustomComponent;
     const finalComponent = shouldRenderVariableTag ? import_VariableTag.VariableTag : Component || CustomComponent || import_antd.Input;
     return finalComponent;
   }, [renderInputComponent, resolvedMetaTreeNode, innerValue, resolvedPath]);
   const isVariableActive = (0, import_react.useMemo)(() => {
-    return (0, import_utils.isVariableValue)(innerValue) || Boolean(resolvedMetaTreeNode) && Array.isArray(resolvedPath) && resolvedPath.length > 0 && !(renderInputComponent == null ? void 0 : renderInputComponent(resolvedMetaTreeNode)) && !(resolvedMetaTreeNode == null ? void 0 : resolvedMetaTreeNode.render);
+    return (0, import_utils.isVariableValue)(innerValue) || Array.isArray(resolvedPath) && resolvedPath.length > 0 && !(renderInputComponent == null ? void 0 : renderInputComponent(resolvedMetaTreeNode)) && !(resolvedMetaTreeNode == null ? void 0 : resolvedMetaTreeNode.render);
   }, [innerValue, renderInputComponent, resolvedMetaTreeNode, resolvedPath]);
   (0, import_react.useEffect)(() => {
     if (!resolvedMetaTreeNode) return;
@@ -288,6 +288,7 @@ const VariableInputComponent = /* @__PURE__ */ __name(({
         allowCustomTagInput: false,
         metaTreeNode: resolvedMetaTreeNode,
         metaTree,
+        resolvedPath,
         style: stableProps.style
       };
     }
@@ -308,6 +309,7 @@ const VariableInputComponent = /* @__PURE__ */ __name(({
     disabled,
     handleClear,
     resolvedMetaTreeNode,
+    resolvedPath,
     metaTree,
     ValueComponent,
     stableProps

package/lib/components/variables/VariableTag.js

@@ -56,7 +56,8 @@ const VariableTagComponent = /* @__PURE__ */ __name(({
   className,
   style,
   metaTreeNode,
-  metaTree
+  metaTree,
+  resolvedPath
 }) => {
   const { resolvedMetaTree } = (0, import_useResolvedMetaTree.useResolvedMetaTree)(metaTree);
   const ctx = (0, import_FlowContextProvider.useFlowContext)();
@@ -102,7 +103,7 @@ const VariableTagComponent = /* @__PURE__ */ __name(({
         };
       }
       if (metaTreeNode) {
-        const rawPath2 = (0, import_utils.parseValueToPath)(value) || metaTreeNode.paths;
+        const rawPath2 = resolvedPath || (0, import_utils.parseValueToPath)(value) || metaTreeNode.paths;
         const result2 = await resolveLabelFromPath(rawPath2);
         if (result2.resolved && result2.label != null) {
           return { text: result2.label, invalid: false };
@@ -113,7 +114,7 @@ const VariableTagComponent = /* @__PURE__ */ __name(({
         return { text: ctx.t(metaTreeNode.title) ?? "", invalid: false };
       }
       if (!value) return { text: String(value), invalid: false };
-      const rawPath = (0, import_utils.parseValueToPath)(value);
+      const rawPath = resolvedPath || (0, import_utils.parseValueToPath)(value);
       const result = await resolveLabelFromPath(rawPath);
       if (result.resolved && result.label != null) {
         return { text: result.label, invalid: false };
@@ -123,7 +124,7 @@ const VariableTagComponent = /* @__PURE__ */ __name(({
       }
       return { text: Array.isArray(rawPath) ? rawPath.join("/") : String(value), invalid: false };
     },
-    { refreshDeps: [resolvedMetaTree, value, metaTreeNode] }
+    { refreshDeps: [resolvedMetaTree, resolvedPath, value, metaTreeNode] }
   );
   const { token } = import_antd.theme.useToken();
   const shrinkableOverflowItem = import_css.css`

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

@@ -86,6 +86,7 @@ export interface VariableInputProps {
 }
 export interface VariableTagProps {
     value?: string;
+    resolvedPath?: Array<string | number>;
     onClear?: () => void;
     disabled?: boolean;
     allowCustomTagInput?: boolean;

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/flow-engine",
-  "version": "2.2.0-alpha.8",
+  "version": "2.2.0-alpha.9",
   "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.8",
-    "@nocobase/shared": "2.2.0-alpha.8",
+    "@nocobase/sdk": "2.2.0-alpha.9",
+    "@nocobase/shared": "2.2.0-alpha.9",
     "ahooks": "^3.7.2",
     "axios": "^1.7.0",
     "dayjs": "^1.11.9",
@@ -37,5 +37,5 @@
   ],
   "author": "NocoBase Team",
   "license": "Apache-2.0",
-  "gitHead": "810c81e5963966bda7ec03b6453a3a80fe60e027"
+  "gitHead": "4949bf5ebcd92d77a3a0a718ed578c270e4bd570"
 }

package/src/components/variables/VariableInput.tsx

@@ -201,16 +201,11 @@ const VariableInputComponent: React.FC<VariableInputProps> = ({
     const Component = renderInputComponent?.(resolvedMetaTreeNode);
     const CustomComponent = resolvedMetaTreeNode?.render;
     // Some domains (workflow) persist variables as `{{$context...}}` rather than the core `{{ ctx... }}` form.
-    // Those values are not recognized by `isVariableValue`, but if the active converters can resolve them back to a
-    // real meta-tree path and that path maps to a plain variable node (not Constant / Null / RunJS), they should still
-    // render as the labelled pill instead of falling back to the raw input text.
+    // When a custom converter recognizes such a value as a variable path, render VariableTag even if the path no longer
+    // exists in the current meta tree. VariableTag will then show either the resolved label or the parsing-failed state.
     const shouldRenderVariableTag =
       isVariableValue(innerValue) ||
-      (Boolean(resolvedMetaTreeNode) &&
-        Array.isArray(resolvedPath) &&
-        resolvedPath.length > 0 &&
-        !Component &&
-        !CustomComponent);
+      (Array.isArray(resolvedPath) && resolvedPath.length > 0 && !Component && !CustomComponent);
     const finalComponent = shouldRenderVariableTag ? VariableTag : Component || CustomComponent || Input;
     return finalComponent;
   }, [renderInputComponent, resolvedMetaTreeNode, innerValue, resolvedPath]);
@@ -218,8 +213,7 @@ const VariableInputComponent: React.FC<VariableInputProps> = ({
   const isVariableActive = useMemo(() => {
     return (
       isVariableValue(innerValue) ||
-      (Boolean(resolvedMetaTreeNode) &&
-        Array.isArray(resolvedPath) &&
+      (Array.isArray(resolvedPath) &&
         resolvedPath.length > 0 &&
         !renderInputComponent?.(resolvedMetaTreeNode) &&
         !resolvedMetaTreeNode?.render)
@@ -332,6 +326,7 @@ const VariableInputComponent: React.FC<VariableInputProps> = ({
         allowCustomTagInput: false,
         metaTreeNode: resolvedMetaTreeNode,
         metaTree,
+        resolvedPath,
         style: stableProps.style,
       };
     }
@@ -354,6 +349,7 @@ const VariableInputComponent: React.FC<VariableInputProps> = ({
     disabled,
     handleClear,
     resolvedMetaTreeNode,
+    resolvedPath,
     metaTree,
     ValueComponent,
     stableProps,

package/src/components/variables/VariableTag.tsx

@@ -28,6 +28,7 @@ const VariableTagComponent: React.FC<VariableTagProps> = ({
   style,
   metaTreeNode,
   metaTree,
+  resolvedPath,
 }) => {
   const { resolvedMetaTree } = useResolvedMetaTree(metaTree);
   const ctx = useFlowContext();
@@ -87,7 +88,7 @@ const VariableTagComponent: React.FC<VariableTagProps> = ({
 
       // 2) metaTreeNode 存在但缺少 parentTitles：尝试根据 value/metaTreeNode.paths 从 metaTree 还原完整路径
       if (metaTreeNode) {
-        const rawPath = parseValueToPath(value) || metaTreeNode.paths;
+        const rawPath = resolvedPath || parseValueToPath(value) || metaTreeNode.paths;
         const result = await resolveLabelFromPath(rawPath as any);
         if (result.resolved && result.label != null) {
           return { text: result.label, invalid: false };
@@ -100,7 +101,7 @@ const VariableTagComponent: React.FC<VariableTagProps> = ({
 
       // 3) 无 metaTreeNode：从 value 还原路径并拼接标题链；若找不到任何前缀则回退原始路径字符串
       if (!value) return { text: String(value), invalid: false };
-      const rawPath = parseValueToPath(value);
+      const rawPath = resolvedPath || parseValueToPath(value);
       const result = await resolveLabelFromPath(rawPath as any);
       if (result.resolved && result.label != null) {
         return { text: result.label, invalid: false };
@@ -110,7 +111,7 @@ const VariableTagComponent: React.FC<VariableTagProps> = ({
       }
       return { text: Array.isArray(rawPath) ? rawPath.join('/') : String(value), invalid: false };
     },
-    { refreshDeps: [resolvedMetaTree, value, metaTreeNode] },
+    { refreshDeps: [resolvedMetaTree, resolvedPath, value, metaTreeNode] },
   );
 
   const { token } = theme.useToken();

package/src/components/variables/__tests__/VariableInput.test.tsx

@@ -155,6 +155,52 @@ describe('VariableInput', () => {
     expect(selectorButton.className).toContain('ant-btn-primary');
   });
 
+  it('renders a parsing failure tag when a custom variable path is missing from the meta tree', async () => {
+    const flowContext = createTestFlowContext();
+    const workflowMetaTree = [
+      {
+        name: '$context',
+        title: 'Trigger variables',
+        type: 'object',
+        paths: ['$context'],
+        children: [
+          {
+            name: 'data',
+            title: 'Trigger data',
+            type: 'object',
+            paths: ['$context', 'data'],
+          },
+        ],
+      },
+    ];
+
+    render(
+      <TestFlowContextWrapper context={flowContext}>
+        <VariableInput
+          value="{{$context.data.id}}"
+          metaTree={workflowMetaTree}
+          converters={{
+            resolvePathFromValue: (currentValue) =>
+              currentValue === '{{$context.data.id}}' ? ['$context', 'data', 'id'] : undefined,
+            resolveValueFromPath: () => undefined,
+          }}
+        />
+      </TestFlowContextWrapper>,
+    );
+
+    await waitFor(
+      () => {
+        const variableTag = screen.getByText('Variable parsing failed');
+        expect(variableTag).toBeInTheDocument();
+        expect(variableTag.closest('.ant-tag')).toHaveClass('ant-tag-error');
+      },
+      { timeout: 3000 },
+    );
+
+    expect(screen.queryByDisplayValue('{{$context.data.id}}')).not.toBeInTheDocument();
+    expect(screen.getByRole('button').className).toContain('ant-btn-primary');
+  });
+
   it('disables custom tag input when rendering a selected variable', async () => {
     const flowContext = createTestFlowContext();
     const { container } = render(

package/src/components/variables/types.ts

@@ -94,6 +94,7 @@ export interface VariableInputProps {
 
 export interface VariableTagProps {
   value?: string;
+  resolvedPath?: Array<string | number>;
   onClear?: () => void;
   disabled?: boolean;
   allowCustomTagInput?: boolean;

package/src/types.ts

@@ -147,6 +147,8 @@ export enum ActionScene {
   DYNAMIC_EVENT_FLOW,
   /** 菜单项联动规则可用 */
   MENU_LINKAGE_RULES,
+  /** 标签页联动规则可用 */
+  TAB_LINKAGE_RULES,
 }
 
 /**