@nocobase/client-v2 2.1.0-beta.44 → 2.1.0-beta.46

package/src/flow/admin-shell/admin-layout/AppListRender.tsx

@@ -0,0 +1,139 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import type { AppListProps } from '@ant-design/pro-layout/es/components/AppsLogoComponents/types';
+import { css } from '@emotion/css';
+import { Card, Typography, theme } from 'antd';
+import React from 'react';
+
+function renderIcon(icon: React.ReactNode | (() => React.ReactNode)) {
+  return typeof icon === 'function' ? icon() : icon;
+}
+
+export function useAppListRender() {
+  const { token } = theme.useToken();
+
+  return React.useCallback(
+    (appList: AppListProps) => {
+      const columnCount = Math.min(Math.max(appList.length, 1), 2);
+
+      return (
+        <div
+          className={css`
+            max-width: calc(100vw - 48px);
+            max-height: calc(100vh - 48px);
+            overflow: auto;
+            padding: ${token.paddingXS}px;
+          `}
+        >
+          <ul
+            className={css`
+              display: grid;
+              grid-template-columns: repeat(${columnCount}, 260px);
+              gap: ${token.marginXXS}px;
+              margin: 0;
+              padding: 0;
+              list-style: none;
+            `}
+          >
+            {appList.map((app, index) => (
+              <li
+                key={`${app.url || ''}-${index}`}
+                className={css`
+                  width: 260px;
+                  height: 56px;
+                  list-style: none;
+                `}
+              >
+                <a
+                  href={app.url}
+                  target={app.target}
+                  rel="noreferrer"
+                  className={css`
+                    display: block;
+                    height: 100%;
+                    color: ${token.colorText};
+                    text-decoration: none;
+
+                    &:hover {
+                      color: ${token.colorText};
+                    }
+                  `}
+                >
+                  <Card
+                    bordered={false}
+                    style={{
+                      height: '100%',
+                      borderRadius: token.borderRadius,
+                      boxShadow: 'none',
+                    }}
+                    className={css`
+                      height: 100%;
+                      border-radius: ${token.borderRadius}px;
+                      box-shadow: none;
+
+                      &:hover {
+                        background: ${token.colorBgTextHover};
+                        box-shadow: none;
+                      }
+
+                      .ant-card-body {
+                        height: 100%;
+                        padding: ${token.paddingXS}px;
+                        display: flex;
+                        align-items: center;
+                        gap: ${token.marginXS}px;
+                      }
+                    `}
+                    styles={{
+                      body: {
+                        background: 'transparent',
+                      },
+                    }}
+                  >
+                    <span
+                      className={css`
+                        display: inline-flex;
+                        flex: 0 0 auto;
+                        width: 32px;
+                        height: 32px;
+                        align-items: center;
+                        justify-content: center;
+
+                        img {
+                          max-width: 32px;
+                          max-height: 32px;
+                        }
+                      `}
+                    >
+                      {renderIcon(app.icon)}
+                    </span>
+                    <Typography.Text
+                      ellipsis
+                      title={typeof app.title === 'string' ? app.title : undefined}
+                      className={css`
+                        min-width: 0;
+                        color: ${token.colorText};
+                        font-size: ${token.fontSize}px;
+                        line-height: ${token.lineHeight};
+                      `}
+                    >
+                      {app.title}
+                    </Typography.Text>
+                  </Card>
+                </a>
+              </li>
+            ))}
+          </ul>
+        </div>
+      );
+    },
+    [token],
+  );
+}

package/src/flow/admin-shell/admin-layout/__tests__/AdminLayoutMenuModels.test.ts

@@ -9,7 +9,7 @@
 
 import React from 'react';
 import { act, fireEvent, render, screen, waitFor } from '@testing-library/react';
-import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import { FlowEngine, FlowEngineProvider } from '@nocobase/flow-engine';
 import { observer } from '@nocobase/flow-engine';
 import { MemoryRouter } from 'react-router-dom';
@@ -45,6 +45,9 @@ describe('AdminLayoutModel menu items', () => {
   let modalConfirmMock: ReturnType<typeof vi.fn>;
 
   beforeEach(() => {
+    // Fixtures mount the modern client under the `v2` segment; tell the
+    // runtime-prefix helper so v2-runtime detection matches.
+    (globalThis.window as any).__nocobase_modern_client_prefix__ = 'v2';
     engine = new FlowEngine();
     modalConfirmMock = vi.fn().mockResolvedValue(true);
     engine.registerModels({
@@ -104,6 +107,10 @@ describe('AdminLayoutModel menu items', () => {
     vi.spyOn(window, 'open').mockImplementation(() => null);
   });
 
+  afterEach(() => {
+    delete (globalThis.window as any).__nocobase_modern_client_prefix__;
+  });
+
   const createRoute = (options?: Partial<import('../../../../flow-compat').NocoBaseDesktopRoute>) => ({
     id: 1,
     title: 'Page 1',

package/src/flow/admin-shell/admin-layout/index.ts

@@ -18,5 +18,6 @@ export * from './resolveAdminRouteRuntimeTarget';
 export * from './constants';
 export * from './ResetThemeTokenAndKeepAlgorithm';
 export * from './useApplications';
+export * from './AppListRender';
 export * from './PinnedPluginListLite';
 export * from './mobile-layout';

package/src/flow/admin-shell/admin-layout/resolveAdminRouteRuntimeTarget.test.ts

@@ -23,6 +23,17 @@ const app = {
   },
 } as any;
 
+// These fixtures mount the modern client under the `v2` segment; tell the
+// runtime-prefix helper so `isV2AdminRuntime` detects it (the server injects
+// this in production).
+beforeAll(() => {
+  (window as any).__nocobase_modern_client_prefix__ = 'v2';
+});
+
+afterAll(() => {
+  delete (window as any).__nocobase_modern_client_prefix__;
+});
+
 describe('resolveAdminRouteRuntimeTarget', () => {
   it('should resolve flowPage to v2 spa runtime target', () => {
     expect(

package/src/flow/admin-shell/admin-layout/resolveAdminRouteRuntimeTarget.ts

@@ -7,7 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { getV2EffectiveBasePath } from '../../../authRedirect';
+import { getModernClientPrefix, getV2EffectiveBasePath } from '../../../authRedirect';
 import type { BaseApplication } from '../../../BaseApplication';
 import { NocoBaseDesktopRouteType, type NocoBaseDesktopRoute } from '../../../flow-compat';
 
@@ -26,8 +26,6 @@ export type AdminRouteRuntimeTarget = {
   reason: AdminRouteRuntimeTargetReason;
 };
 
-const V2_PUBLIC_PATH_SUFFIX = '/v2/';
-
 type LocationLike = {
   pathname: string;
   search?: string;
@@ -69,7 +67,7 @@ function normalizePublicPath(value = '/') {
 }
 
 export function isV2AdminRuntime(app?: ResolveAdminRouteRuntimeTargetOptions['app']) {
-  return !!app?.getPublicPath && normalizePublicPath(app.getPublicPath()).endsWith(V2_PUBLIC_PATH_SUFFIX);
+  return !!app?.getPublicPath && normalizePublicPath(app.getPublicPath()).endsWith(`/${getModernClientPrefix()}/`);
 }
 
 export function toRouterNavigationPath(pathname: string, basename?: string) {

package/src/flow/admin-shell/admin-layout/useApplications.tsx

@@ -8,8 +8,41 @@
  */
 
 import { useApp } from '../../../flow-compat';
+import React from 'react';
 
 export const useApplications = () => {
   const app = useApp();
-  return { Component: app.apps.Component };
+  const loadAppList = app.apps.loadAppList;
+  const [appList, setAppList] = React.useState([]);
+
+  React.useEffect(() => {
+    let canceled = false;
+
+    if (!loadAppList) {
+      setAppList([]);
+      return;
+    }
+
+    void Promise.resolve(loadAppList(app))
+      .then((list) => {
+        if (!canceled) {
+          setAppList(Array.isArray(list) ? list : []);
+        }
+      })
+      .catch((error) => {
+        console.error('[NocoBase] Failed to load application switcher list.', error);
+        if (!canceled) {
+          setAppList([]);
+        }
+      });
+
+    return () => {
+      canceled = true;
+    };
+  }, [app, loadAppList]);
+
+  return {
+    Component: app.apps.Component,
+    appList,
+  };
 };

package/src/flow/common/Markdown/Edit.tsx

@@ -34,13 +34,41 @@ const defaultToolbar = [
   'code',
   'inline-code',
   'upload',
-  'fullscreen',
 ];
 
 const NAMESPACE = 'block-markdown';
 
 const locales = ['en_US', 'fr_FR', 'pt_BR', 'ja_JP', 'ko_KR', 'ru_RU', 'sv_SE', 'zh_CN', 'zh_TW'];
 
+type MarkdownToolbarItem =
+  | string
+  | {
+      name: string;
+      tipPosition?: string;
+      toolbar?: MarkdownToolbarItem[];
+      [key: string]: unknown;
+    };
+
+function placeToolbarTooltipsBelow(toolbar: MarkdownToolbarItem[]) {
+  return toolbar.map((item) => {
+    if (typeof item === 'string') {
+      if (item === '|' || item === 'br') {
+        return item;
+      }
+      return {
+        name: item,
+        tipPosition: 's',
+      };
+    }
+
+    return {
+      ...item,
+      tipPosition: 's',
+      toolbar: item.toolbar ? placeToolbarTooltipsBelow(item.toolbar) : item.toolbar,
+    };
+  });
+}
+
 const Edit = (props) => {
   const { disabled, onChange, value, fileCollection, toolbar, vditorRef } = props;
   const flowCtx = useFlowContext();
@@ -73,7 +101,7 @@ const Edit = (props) => {
   useEffect(() => {
     if (!containerRef.current) return;
 
-    const toolbarConfig = toolbar ?? defaultToolbar;
+    const toolbarConfig = placeToolbarTooltipsBelow(toolbar ?? defaultToolbar);
     const vditor = new Vditor(containerRef.current, {
       value: value ?? '',
       lang,
@@ -321,7 +349,7 @@ export const MarkdownWithContextSelector: React.FC<MarkdownWithContextSelectorPr
     if (quoteFlag !== false) {
       setInnerValue(value);
     }
-  }, [value]);
+  }, [quoteFlag, value]);
   const handleTextChange = useCallback(
     (e) => {
       const val = e ?? '';
@@ -375,7 +403,7 @@ export const MarkdownWithContextSelector: React.FC<MarkdownWithContextSelectorPr
         editor.focus();
       });
     },
-    [innerValue, onChange],
+    [onChange],
   );
 
   const handleVariableSelected = useCallback(

package/src/flow/components/ConditionBuilder.tsx

@@ -13,14 +13,24 @@ import { FilterGroup, LinkageFilterItem } from './filter';
 import { evaluateConditions, FilterGroupType, removeInvalidFilterItems } from '@nocobase/utils/client';
 
 export const ConditionBuilder = observer(
-  (props: { value: FilterGroupType; onChange: (value: FilterGroupType) => void; extraMetaTree?: MetaTreeNode[] }) => {
+  (props: {
+    value: FilterGroupType;
+    onChange: (value: FilterGroupType) => void;
+    extraMetaTree?: MetaTreeNode[];
+    maxAssociationFieldDepth?: number;
+  }) => {
     const ctx = useFlowContext();
 
     return (
       <FilterGroup
         value={props.value || { logic: '$and', items: [] }}
         FilterItem={(itemProps) => (
-          <LinkageFilterItem model={ctx.model} value={itemProps.value} extraMetaTree={props.extraMetaTree} />
+          <LinkageFilterItem
+            model={ctx.model}
+            value={itemProps.value}
+            extraMetaTree={props.extraMetaTree}
+            maxAssociationFieldDepth={props.maxAssociationFieldDepth}
+          />
         )}
         onChange={props.onChange}
       />

package/src/flow/components/DefaultValue.tsx

@@ -31,7 +31,7 @@ import { FieldModel } from '../models';
 import { RecordSelectFieldModel } from '../models/fields/AssociationFieldModel';
 import { InputFieldModel } from '../models/fields/InputFieldModel';
 import { ensureOptionsFromUiSchemaEnumIfAbsent } from '../internal/utils/enumOptionsUtils';
-import { resolveOperatorComponent } from '../internal/utils/operatorSchemaHelper';
+import { pickOperatorStyle as pickStyle, resolveOperatorComponent } from '../internal/utils/operatorSchemaHelper';
 import { RunJSValueEditor } from './RunJSValueEditor';
 import { buildDynamicNamePath } from '../models/blocks/form/dynamicNamePath';
 
@@ -592,7 +592,7 @@ export const DefaultValue = connect((props: Props) => {
             }
           }
         }
-      }, [inputProps, value]);
+      }, [inputProps]);
       return (
         <div style={{ flexGrow: 1 }}>
           <FlowModelRenderer model={tempRoot} showFlowSettings={false} />
@@ -600,11 +600,13 @@ export const DefaultValue = connect((props: Props) => {
       );
     };
     return ConstantValueEditor;
-  }, [tempRoot]);
+  }, [tempRoot, value]);
+
+  const modelOperator = (model as { operator?: string })?.operator;
 
   // 文本类多关键词：根据已注册的 operator schema 渲染（用于默认值配置）
   React.useEffect(() => {
-    const operator = (model as any)?.operator;
+    const operator = modelOperator;
     const fieldModel = tempRoot?.subModels?.fields?.[0];
     if (!operator || !fieldModel) return;
     const originalRender = fieldModel['__originalRender'] || fieldModel.render;
@@ -622,17 +624,21 @@ export const DefaultValue = connect((props: Props) => {
         <Comp
           {...fieldModel.props}
           {...xProps}
-          style={{ width: '100%', ...(fieldModel.props as any)?.style, ...xProps?.style }}
+          style={{
+            width: '100%',
+            ...pickStyle((fieldModel.props as Record<string, unknown>)?.style),
+            ...pickStyle(xProps?.style),
+          }}
         />
       );
     } else if (typeof originalRender === 'function') {
       fieldModel.render = originalRender;
     }
-  }, [model, tempRoot, (model as any)?.operator]);
+  }, [model, tempRoot, modelOperator]);
 
   // 根据操作符 schema 的 x-component-props 补全临时字段的输入属性（如多选）
   React.useEffect(() => {
-    const operator = (model as any)?.operator;
+    const operator = modelOperator;
     const fieldModel = tempRoot?.subModels?.fields?.[0];
     if (!fieldModel || !operator) return;
     const ops = model.collectionField?.filterable?.operators || [];
@@ -641,7 +647,7 @@ export const DefaultValue = connect((props: Props) => {
     if (xComponentProps) {
       fieldModel.setProps(xComponentProps);
     }
-  }, [model, tempRoot, (model as any)?.operator]);
+  }, [model, tempRoot, modelOperator]);
 
   const NullComponent = useMemo(() => {
     function NullValuePlaceholder() {

package/src/flow/components/FieldAssignRulesEditor.tsx

@@ -24,7 +24,7 @@ import type { CascaderProps, CollapseProps } from 'antd';
 import React from 'react';
 import { ConditionBuilder } from './ConditionBuilder';
 import { FieldAssignValueInput } from './FieldAssignValueInput';
-import type { FieldAssignCascaderOption } from './fieldAssignOptions';
+import { buildFieldAssignCascaderOptionsFromCollection, type FieldAssignCascaderOption } from './fieldAssignOptions';
 import { isRunJSValue, isVariableExpression, type MetaTreeNode } from '@nocobase/flow-engine';
 import { isToManyAssociationField } from '../internal/utils/modelUtils';
 
@@ -36,6 +36,7 @@ type CollectionFieldLike = {
   type?: unknown;
   interface?: unknown;
   uiSchema?: unknown;
+  target?: unknown;
   targetKey?: unknown;
   targetCollectionTitleFieldName?: unknown;
   targetCollection?: any;
@@ -105,6 +106,7 @@ export interface FieldAssignRulesEditorProps {
   onSyncAssociationTitleField?: (params: SyncAssociationTitleFieldParams) => Promise<void> | void;
   /** 在日期字段下启用“日期变量替换 Constant 位”。 */
   enableDateVariableAsConstant?: boolean;
+  maxAssociationFieldDepth?: number;
 }
 
 export const FieldAssignRulesEditor: React.FC<FieldAssignRulesEditorProps> = (props) => {
@@ -123,9 +125,10 @@ export const FieldAssignRulesEditor: React.FC<FieldAssignRulesEditorProps> = (pr
     isTitleFieldCandidate,
     onSyncAssociationTitleField,
     enableDateVariableAsConstant = false,
+    maxAssociationFieldDepth = 2,
   } = props;
 
-  const value = Array.isArray(rawValue) ? rawValue : [];
+  const value = React.useMemo(() => (Array.isArray(rawValue) ? rawValue : []), [rawValue]);
   const [cascaderOptions, setCascaderOptions] = React.useState<FieldAssignCascaderOption[]>(() =>
     Array.isArray(fieldOptions) ? (fieldOptions as FieldAssignCascaderOption[]) : [],
   );
@@ -171,6 +174,19 @@ export const FieldAssignRulesEditor: React.FC<FieldAssignRulesEditorProps> = (pr
     }
   }, [getRuleKey, syncingRuleKey, value]);
 
+  const parseTargetPathToSegments = React.useCallback((targetPath?: string): string[] => {
+    const raw = String(targetPath || '');
+    if (!raw) return [];
+    return raw
+      .split('.')
+      .map((s) => s.trim())
+      .filter(Boolean);
+  }, []);
+
+  const isAssociationFieldLike = React.useCallback((field?: CollectionFieldLike | null) => {
+    return !!(field?.isAssociationField?.() || field?.target || field?.targetCollection);
+  }, []);
+
   const buildCollectionMetaTreeNodes = React.useCallback(
     (collection: any, basePaths: string[], visited: Set<any>): MetaTreeNode[] => {
       if (!collection?.getFields) return [];
@@ -199,7 +215,7 @@ export const FieldAssignRulesEditor: React.FC<FieldAssignRulesEditorProps> = (pr
           paths: [...basePaths, name],
         };
 
-        const isAssoc = !!f.isAssociationField?.();
+        const isAssoc = isAssociationFieldLike(f);
         const isToMany = isToManyAssociationField(f);
         if (isAssoc && !isToMany && f.targetCollection) {
           node.children = async () =>
@@ -211,7 +227,7 @@ export const FieldAssignRulesEditor: React.FC<FieldAssignRulesEditorProps> = (pr
 
       return nodes;
     },
-    [t],
+    [isAssociationFieldLike, t],
   );
 
   const buildItemMetaTree = React.useCallback(
@@ -226,7 +242,7 @@ export const FieldAssignRulesEditor: React.FC<FieldAssignRulesEditorProps> = (pr
       for (let i = 0; i < segs.length; i++) {
         const seg = segs[i] as string;
         const field = current?.getField?.(seg);
-        if (!field?.isAssociationField?.()) break;
+        if (!isAssociationFieldLike(field)) break;
         const toMany = isToManyAssociationField(field);
         const nextCollection = field?.targetCollection;
         if (!nextCollection) break;
@@ -291,7 +307,7 @@ export const FieldAssignRulesEditor: React.FC<FieldAssignRulesEditorProps> = (pr
 
       return [buildObjectNode(levels.length - 1, ['item'], 'item', 'Current item')];
     },
-    [buildCollectionMetaTreeNodes, rootCollection, t],
+    [buildCollectionMetaTreeNodes, isAssociationFieldLike, parseTargetPathToSegments, rootCollection, t],
   );
 
   const patchItem = (index: number, patch: Partial<FieldAssignRuleItem>) => {
@@ -381,15 +397,6 @@ export const FieldAssignRulesEditor: React.FC<FieldAssignRulesEditorProps> = (pr
     [t],
   );
 
-  const parseTargetPathToSegments = React.useCallback((targetPath?: string): string[] => {
-    const raw = String(targetPath || '');
-    if (!raw) return [];
-    return raw
-      .split('.')
-      .map((s) => s.trim())
-      .filter(Boolean);
-  }, []);
-
   const getFieldLabel = (targetPath?: string) => {
     const segs = parseTargetPathToSegments(targetPath);
     if (!segs.length) return undefined;
@@ -413,7 +420,7 @@ export const FieldAssignRulesEditor: React.FC<FieldAssignRulesEditorProps> = (pr
             : seg,
         ),
       );
-      if (field?.isAssociationField?.() && field?.targetCollection) {
+      if (isAssociationFieldLike(field as CollectionFieldLike) && field?.targetCollection) {
         collection = field.targetCollection;
       }
     }
@@ -435,7 +442,7 @@ export const FieldAssignRulesEditor: React.FC<FieldAssignRulesEditorProps> = (pr
 
         const isLast = i === segs.length - 1;
         if (isLast) {
-          if (!field?.isAssociationField?.() || !field?.targetCollection) return null;
+          if (!isAssociationFieldLike(field) || !field?.targetCollection) return null;
 
           const targetCollection = field.targetCollection;
           const targetFields =
@@ -502,7 +509,7 @@ export const FieldAssignRulesEditor: React.FC<FieldAssignRulesEditorProps> = (pr
           };
         }
 
-        if (!field?.isAssociationField?.() || !field?.targetCollection) {
+        if (!isAssociationFieldLike(field) || !field?.targetCollection) {
           return null;
         }
         collection = field.targetCollection;
@@ -510,7 +517,7 @@ export const FieldAssignRulesEditor: React.FC<FieldAssignRulesEditorProps> = (pr
 
       return null;
     },
-    [isTitleFieldCandidate, parseTargetPathToSegments, rootCollection, t],
+    [isAssociationFieldLike, isTitleFieldCandidate, parseTargetPathToSegments, rootCollection, t],
   );
 
   const resolveTargetCollectionBySegments = React.useCallback(
@@ -519,42 +526,24 @@ export const FieldAssignRulesEditor: React.FC<FieldAssignRulesEditorProps> = (pr
       let collection = rootCollection;
       for (const seg of segments) {
         const field = collection?.getField?.(seg);
-        if (!field?.isAssociationField?.() || !field?.targetCollection) {
+        if (!isAssociationFieldLike(field) || !field?.targetCollection) {
           return null;
         }
         collection = field.targetCollection;
       }
       return collection || null;
     },
-    [rootCollection],
+    [isAssociationFieldLike, rootCollection],
   );
 
   const buildChildrenFromCollection = React.useCallback(
-    (collection: any): FieldAssignCascaderOption[] => {
-      const fields = typeof collection?.getFields === 'function' ? collection.getFields() || [] : [];
-      const out: FieldAssignCascaderOption[] = [];
-      for (const rawField of fields) {
-        if (!rawField) continue;
-        const f = rawField as CollectionFieldLike;
-        const fieldInterface = typeof f.interface === 'string' ? f.interface : undefined;
-        if (!fieldInterface) continue;
-        if (fieldInterface === 'formula') continue;
-
-        const name = String(f.name || '');
-        if (!name) continue;
-
-        const title = t(typeof f.title === 'string' ? f.title : name);
-        const isAssoc = !!f.isAssociationField?.();
-        const hasTarget = !!f.targetCollection;
-        out.push({
-          label: title,
-          value: name,
-          isLeaf: !(isAssoc && hasTarget),
-        });
-      }
-      return out;
+    (collection: any, associationDepth: number): FieldAssignCascaderOption[] => {
+      return buildFieldAssignCascaderOptionsFromCollection(collection, t, {
+        associationDepth,
+        maxAssociationFieldDepth,
+      });
     },
-    [t],
+    [maxAssociationFieldDepth, t],
   );
 
   const loadCascaderData = React.useCallback<NonNullable<CascaderProps<FieldAssignCascaderOption>['loadData']>>(
@@ -573,7 +562,7 @@ export const FieldAssignRulesEditor: React.FC<FieldAssignRulesEditorProps> = (pr
         return;
       }
 
-      const children = buildChildrenFromCollection(targetCollection);
+      const children = buildChildrenFromCollection(targetCollection, segments.length);
       if (!children.length) {
         target.isLeaf = true;
       } else {
@@ -889,6 +878,7 @@ export const FieldAssignRulesEditor: React.FC<FieldAssignRulesEditorProps> = (pr
                 value={item.value}
                 onChange={(v) => patchItem(index, { value: v })}
                 extraMetaTree={extraMetaTree}
+                maxAssociationFieldDepth={maxAssociationFieldDepth}
                 {...(getValueInputProps?.(item, index) || {})}
                 enableDateVariableAsConstant={enableDateVariableAsConstant}
                 associationFieldNamesOverride={
@@ -959,6 +949,7 @@ export const FieldAssignRulesEditor: React.FC<FieldAssignRulesEditorProps> = (pr
                 value={item.condition || { logic: '$and', items: [] }}
                 onChange={(condition) => patchItem(index, { condition })}
                 extraMetaTree={extraMetaTree}
+                maxAssociationFieldDepth={2}
               />
             </div>
           )}