@nocobase/client-v2 2.3.0-beta.11 → 2.3.0-beta.13

package/src/flow/models/blocks/form/QuickEditFormModel.tsx

@@ -23,6 +23,7 @@ import {
 } from '@nocobase/flow-engine';
 import { Button, Form, Skeleton, Space } from 'antd';
 import React from 'react';
+import { findDataScopeStep, getQuickEditDataScopeFilter } from '../../../internal/utils/quickEditDataScope';
 import { FieldModel } from '../../base/FieldModel';
 import { FormComponent } from './FormBlockModel';
 import { FormItemModel } from './FormItemModel';
@@ -36,6 +37,14 @@ const QUICK_EDIT_MOBILE_CONTENT_PADDING = '8px var(--nb-mobile-page-tabs-content
 const QUICK_EDIT_MOBILE_ACTIONS_PADDING =
   '8px var(--nb-mobile-page-tabs-content-padding, 12px) calc(80px + env(safe-area-inset-bottom, 0px))';
 const QUICK_EDIT_MOBILE_MEDIA_QUERY = '(max-width: 768px)';
+// Dropdown-style editors open upwards inside the desktop popover so the option list does not cover the Submit and
+// Cancel buttons rendered right below the field. antd still flips the list downwards when there is no room above.
+const QUICK_EDIT_DROPDOWN_UP_MODELS = [
+  'SelectFieldModel',
+  'RecordSelectFieldModel',
+  'CascadeSelectFieldModel',
+  'CascadeSelectListFieldModel',
+];
 
 type QuickEditViewBeforeClosePayload = {
   result?: unknown;
@@ -159,6 +168,7 @@ export class QuickEditFormModel extends FlowModel {
   __onSubmitSuccess;
   _fieldProps: any;
   _onOk: any;
+  _dataScopeFilter: Record<string, any> | undefined;
 
   get form() {
     return this.context.form;
@@ -212,6 +222,7 @@ export class QuickEditFormModel extends FlowModel {
       },
       sourceFieldModel ? { delegate: sourceFieldModel.context } : undefined,
     ) as QuickEditFormModel;
+    model._dataScopeFilter = getQuickEditDataScopeFilter(sourceFieldModel);
 
     const bodyStyles = {
       maxHeight: QUICK_EDIT_POPOVER_MAX_HEIGHT,
@@ -410,6 +421,13 @@ QuickEditFormModel.registerFlow({
         resource.setDataSourceKey(dataSourceKey);
         resource.setResourceName(collectionName);
         ctx.model.resource = resource;
+        // Seed the edited row before dispatching the field model's flows. An association data scope resolves
+        // `ctx.record` while the field renders, and so does the foreign key filter that one-to-one and one-to-many
+        // editors build, so the record has to be in place first.
+        if (ctx.inputArgs.filterByTk || ctx.inputArgs.record) {
+          resource.setFilterByTk(ctx.inputArgs.filterByTk);
+          resource.setData(ctx.inputArgs.record);
+        }
         const collectionField = ctx.model.collection.getField(fieldPath) as CollectionField;
         if (collectionField) {
           const binding = FormItemModel.getDefaultBindingByField(ctx, collectionField);
@@ -417,24 +435,42 @@ QuickEditFormModel.registerFlow({
             return;
           }
           const use = binding.modelName;
+          const stepParams: Record<string, Record<string, Record<string, unknown>>> = {
+            fieldSettings: {
+              init: {
+                dataSourceKey,
+                collectionName,
+                fieldPath,
+              },
+            },
+          };
+          const dataScopeFilter = ctx.model._dataScopeFilter;
+          if (dataScopeFilter) {
+            const dataScopeStep = findDataScopeStep(ctx.engine.getModelClass(use));
+            if (dataScopeStep) {
+              stepParams[dataScopeStep.flowKey] = {
+                ...stepParams[dataScopeStep.flowKey],
+                [dataScopeStep.stepKey]: { filter: dataScopeFilter },
+              };
+            }
+          }
           const fieldModel = ctx.model.addSubModel<FieldModel>('fields', {
             use,
             props:
               typeof binding.defaultProps === 'function'
                 ? binding.defaultProps(ctx, collectionField)
                 : binding.defaultProps,
-            stepParams: {
-              fieldSettings: {
-                init: {
-                  dataSourceKey,
-                  collectionName,
-                  fieldPath,
-                },
-              },
-            },
+            stepParams,
           });
           fieldModel.setProps(getQuickEditFieldProps(collectionField, ctx.model._fieldProps));
           fieldModel.setProps({ sourceFieldModelUid: ctx.inputArgs.sourceFieldModelUid });
+          if (
+            !ctx.model.context.isMobileLayout &&
+            QUICK_EDIT_DROPDOWN_UP_MODELS.includes(use) &&
+            fieldModel.props.placement == null
+          ) {
+            fieldModel.setProps({ placement: 'topLeft' });
+          }
           ctx.model.context.defineProperty('collectionField', {
             get: () => collectionField,
           });
@@ -442,8 +478,6 @@ QuickEditFormModel.registerFlow({
           await fieldModel.dispatchEvent('beforeRender');
         }
         if (ctx.inputArgs.filterByTk || ctx.inputArgs.record) {
-          resource.setFilterByTk(ctx.inputArgs.filterByTk);
-          resource.setData(ctx.inputArgs.record);
           ctx.model.form?.setFieldsValue(resource.getData());
         }
       },

package/src/flow/models/blocks/form/__tests__/QuickEditFormModel.quickEdit.test.ts

@@ -9,7 +9,11 @@
 
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import { FlowEngine, FlowModel, SingleRecordResource } from '@nocobase/flow-engine';
+import '../../../index';
 import { QuickEditFormModel } from '../QuickEditFormModel';
+import { dataScope } from '../../../../actions/dataScope';
+import { RecordSelectFieldModel } from '../../../fields/AssociationFieldModel/RecordSelectFieldModel';
+import { SelectFieldModel } from '../../../fields/SelectFieldModel';
 
 describe('QuickEditFormModel - quick edit save triggers API (regression)', () => {
   let engine: FlowEngine;
@@ -55,6 +59,54 @@ describe('QuickEditFormModel - quick edit save triggers API (regression)', () =>
     });
   };
 
+  const addMemberCollections = () => {
+    const ds = engine.context.dataSourceManager.getDataSource('main');
+    ds.addCollection({
+      name: 'departments',
+      filterTargetKey: 'id',
+      titleField: 'name',
+      fields: [
+        { name: 'id', type: 'integer', interface: 'number' },
+        { name: 'name', type: 'string', interface: 'input', uiSchema: { title: 'Name' } },
+        { name: 'level', type: 'string', interface: 'input', uiSchema: { title: 'Level' } },
+      ],
+    });
+    ds.addCollection({
+      name: 'members',
+      filterTargetKey: 'id',
+      fields: [
+        { name: 'id', type: 'integer', interface: 'number' },
+        { name: 'level', type: 'string', interface: 'input', uiSchema: { title: 'Level' } },
+        {
+          name: 'department',
+          type: 'belongsTo',
+          interface: 'm2o',
+          target: 'departments',
+          targetKey: 'id',
+          uiSchema: { title: 'Department' },
+        },
+      ],
+    });
+  };
+
+  const openQuickEditForAssociation = async (dataScopeFilter?: Record<string, unknown>) => {
+    engine.registerModels({ QuickEditFormModel, RecordSelectFieldModel });
+    engine.registerActions({ dataScope });
+    addMemberCollections();
+    const model = engine.createModel<QuickEditFormModel>({
+      use: QuickEditFormModel,
+      uid: `qe-association-${dataScopeFilter ? 'scoped' : 'plain'}`,
+      stepParams: {
+        quickEditFormSettings: {
+          init: { dataSourceKey: 'main', collectionName: 'members', fieldPath: 'department' },
+        },
+      },
+    });
+    model._dataScopeFilter = dataScopeFilter;
+    await model.applyFlow('quickEditFormSettings', { filterByTk: 7, record: { id: 7, level: 'senior' } });
+    return model;
+  };
+
   it('uses source field context when opening quick edit', async () => {
     engine.registerModels({ QuickEditFormModel });
     engine.context.defineProperty('pageActive', { value: { value: false } });
@@ -414,4 +466,72 @@ describe('QuickEditFormModel - quick edit save triggers API (regression)', () =>
 
     expect(api.request).toHaveBeenCalledTimes(1);
   });
+
+  it('opens dropdown editors upwards in the desktop popover so they do not cover the actions', async () => {
+    engine.registerModels({ QuickEditFormModel, SelectFieldModel });
+    const ds = engine.context.dataSourceManager.getDataSource('main');
+    ds.addCollection({
+      name: 'users',
+      fields: [
+        {
+          name: 'tags',
+          type: 'array',
+          interface: 'multipleSelect',
+          uiSchema: { title: 'Tags', enum: [{ label: 'A', value: 'a' }] },
+        },
+      ],
+    });
+
+    const desktopModel = engine.createModel<QuickEditFormModel>({
+      use: QuickEditFormModel,
+      uid: 'qe-desktop',
+      stepParams: {
+        quickEditFormSettings: {
+          init: { dataSourceKey: 'main', collectionName: 'users', fieldPath: 'tags' },
+        },
+      },
+    });
+    await desktopModel.applyFlow('quickEditFormSettings', { record: {} });
+    const desktopField = desktopModel.subModels.fields[0];
+    expect(desktopField.use).toBe('SelectFieldModel');
+    expect(desktopField.props.placement).toBe('topLeft');
+
+    const mobileModel = engine.createModel<QuickEditFormModel>({
+      use: QuickEditFormModel,
+      uid: 'qe-mobile',
+      stepParams: {
+        quickEditFormSettings: {
+          init: { dataSourceKey: 'main', collectionName: 'users', fieldPath: 'tags' },
+        },
+      },
+    });
+    mobileModel.context.defineProperty('isMobileLayout', { value: true });
+    await mobileModel.applyFlow('quickEditFormSettings', { record: {} });
+    expect(mobileModel.subModels.fields[0].props.placement).toBeUndefined();
+  });
+
+  it('hands the column data scope to the association editor built for the popover', async () => {
+    const filter = { logic: '$and', items: [{ path: 'level', operator: 'eq', value: '{{ctx.record.level}}' }] };
+
+    const model = await openQuickEditForAssociation(filter);
+
+    const fieldModel = model.subModels.fields[0];
+    expect(fieldModel.use).toBe('RecordSelectFieldModel');
+    expect(fieldModel.getStepParams('selectSettings', 'dataScope')).toEqual({ filter });
+  });
+
+  it('leaves the association editor unscoped when the column has no data scope', async () => {
+    const model = await openQuickEditForAssociation();
+
+    expect(model.subModels.fields[0].getStepParams('selectSettings', 'dataScope')).toBeUndefined();
+  });
+
+  it('seeds the edited row before the editor flows run so record variables resolve', async () => {
+    const filter = { logic: '$and', items: [{ path: 'level', operator: 'eq', value: '{{ctx.record.level}}' }] };
+
+    const model = await openQuickEditForAssociation(filter);
+
+    expect(model.resource.getData()).toMatchObject({ id: 7, level: 'senior' });
+    expect(JSON.stringify(model.subModels.fields[0].resource.getFilter() ?? null)).toContain('senior');
+  });
 });

package/src/flow/models/blocks/table/TableColumnModel.tsx

@@ -37,6 +37,7 @@ import { getRowKey } from './utils';
 import { getSavedAssociationTitleField, getTableColumnSortField } from './sortUtils';
 import { getFieldBindingUse, rebuildFieldSubModel } from '../../../internal/utils/rebuildFieldSubModel';
 import { getSavedDateTimeFormatParams, resolveDateTimeDisplayProps } from '../../../utils/dateTimeDisplayProps';
+import { QuickEditDataScopeInput, resolveQuickEditDataScopeStep } from '../../../internal/utils/quickEditDataScope';
 
 export function FieldDeletePlaceholder(props: any) {
   const { t } = useTranslation();
@@ -542,6 +543,36 @@ TableColumnModel.registerFlow({
         ctx.model.setProps('editable', ctx.model.associationPathName ? false : params.editable);
       },
     },
+    quickEditDataScope: {
+      title: tExpr('Data scope'),
+      uiMode: {
+        type: 'dialog',
+        props: {
+          width: 800,
+        },
+      },
+      uiSchema: {
+        filter: {
+          type: 'object',
+          'x-decorator': 'FormItem',
+          'x-component': QuickEditDataScopeInput,
+        },
+      },
+      useRawParams: true,
+      defaultParams: {
+        filter: { logic: '$and', items: [] },
+      },
+      hideInSettings(ctx) {
+        if (ctx.model.associationPathName || !ctx.model.props.editable) {
+          return true;
+        }
+        return !resolveQuickEditDataScopeStep(ctx, ctx.collectionField);
+      },
+      handler() {
+        // Settings-only step. The filter is kept raw on the column and handed to the editor model that
+        // QuickEditFormModel builds when the popover opens, so there is nothing to apply to the column itself.
+      },
+    },
     model: {
       title: tExpr('Field component'),
       use: 'displayFieldComponent',

package/src/flow/models/blocks/table/__tests__/TableColumnModel.test.tsx

@@ -9,8 +9,36 @@
 
 import { FlowEngine } from '@nocobase/flow-engine';
 import { describe, expect, it, vi } from 'vitest';
+// Prime the model module graph so the editable field bindings used by the quick edit data scope setting are registered.
+import '../../../index';
+import { RecordSelectFieldModel } from '../../../fields/AssociationFieldModel/RecordSelectFieldModel';
 import { TableColumnModel } from '../TableColumnModel';
 
+const createQuickEditDataScopeCtx = (
+  overrides: { associationPathName?: string; editable?: boolean; isAssociation?: boolean } = {},
+) => {
+  const engine = new FlowEngine();
+  engine.registerModels({ RecordSelectFieldModel });
+  const { associationPathName, editable = true, isAssociation = true } = overrides;
+  return {
+    engine,
+    model: {
+      associationPathName,
+      props: { editable },
+    },
+    collectionField: {
+      interface: isAssociation ? 'm2o' : 'input',
+      isAssociationField: () => isAssociation,
+      targetCollection: isAssociation ? { template: 'general' } : undefined,
+    },
+  };
+};
+
+const getQuickEditDataScopeStep = (engine: FlowEngine) => {
+  const model = new TableColumnModel({ uid: 'table-column-quick-edit-data-scope', flowEngine: engine } as any);
+  return model.getFlow('tableColumnSettings')?.steps?.quickEditDataScope as any;
+};
+
 describe('TableColumnModel sorter settings', () => {
   it('clamps custom column width to the minimum value', () => {
     const engine = new FlowEngine();
@@ -30,6 +58,42 @@ describe('TableColumnModel sorter settings', () => {
     expect(setProps).toHaveBeenCalledWith('width', 10);
   });
 
+  it('offers the quick edit data scope on an editable association column', async () => {
+    const engine = new FlowEngine();
+    const step = getQuickEditDataScopeStep(engine);
+
+    const hidden = await step.hideInSettings(createQuickEditDataScopeCtx());
+
+    expect(hidden).toBe(false);
+  });
+
+  it('hides the quick edit data scope when quick edit is off', async () => {
+    const engine = new FlowEngine();
+    const step = getQuickEditDataScopeStep(engine);
+
+    const hidden = await step.hideInSettings(createQuickEditDataScopeCtx({ editable: false }));
+
+    expect(hidden).toBe(true);
+  });
+
+  it('hides the quick edit data scope for non-association columns', async () => {
+    const engine = new FlowEngine();
+    const step = getQuickEditDataScopeStep(engine);
+
+    const hidden = await step.hideInSettings(createQuickEditDataScopeCtx({ isAssociation: false }));
+
+    expect(hidden).toBe(true);
+  });
+
+  it('hides the quick edit data scope for relation path columns', async () => {
+    const engine = new FlowEngine();
+    const step = getQuickEditDataScopeStep(engine);
+
+    const hidden = await step.hideInSettings(createQuickEditDataScopeCtx({ associationPathName: 'department' }));
+
+    expect(hidden).toBe(true);
+  });
+
   it('hides quick edit setting for relation path columns added from association groups', async () => {
     const engine = new FlowEngine();
     const model = new TableColumnModel({ uid: 'table-column-relation-path-quick-edit', flowEngine: engine } as any);

package/src/flow/models/fields/AssociationFieldModel/CascadeSelectFieldModel.tsx

@@ -25,6 +25,7 @@ import { arrayMove, SortableContext, verticalListSortingStrategy, useSortable }
 import { CSS } from '@dnd-kit/utilities';
 import { AssociationFieldModel } from './AssociationFieldModel';
 import { transformNestedData } from '../ClickableFieldModel';
+import { syncQuickEditPreventClose } from '../../../internal/utils/quickEditViewContainer';
 
 type CascadeHydrateStatus = 'pending' | 'done';
 
@@ -373,7 +374,12 @@ export class CascadeSelectInnerFieldModel extends AssociationFieldModel {
     this.setProps({ onPopupScroll: fn });
   }
   set onDropdownVisibleChange(fn) {
-    this.setProps({ onDropdownVisibleChange: fn });
+    this.setProps({
+      onDropdownVisibleChange: (visible: boolean) => {
+        syncQuickEditPreventClose(this, visible);
+        fn(visible);
+      },
+    });
   }
   set onSearch(fn) {
     this.setProps({ onSearch: fn });

package/src/flow/models/fields/AssociationFieldModel/RecordSelectFieldModel.tsx

@@ -41,6 +41,7 @@ import { BlockSceneEnum } from '../../base/BlockModel';
 import { ActionWithoutPermission } from '../../base/ActionModel';
 import { EditFormModel } from '../../blocks';
 import { hasAncestorModel } from './recordSelectSettingsUtils';
+import { syncQuickEditPreventClose } from '../../../internal/utils/quickEditViewContainer';
 
 function RemoteModelRenderer({ options }) {
   const ctx = useFlowViewContext();
@@ -65,6 +66,11 @@ function RemoteModelRenderer({ options }) {
 
 export function CreateContent({ model, toOne = false }) {
   const ctx = useFlowContext();
+  // Quick-create popups isolate business context but must retain the field's configuration mode.
+  ctx.defineProperty('flowSettingsEnabled', {
+    get: () => model.context.flowSettingsEnabled,
+    cache: false,
+  });
   const { Header, type } = ctx.view;
   model._closeView = ctx.view.close;
   return (
@@ -308,6 +314,7 @@ const LazySelect = (props: Readonly<LazySelectProps>) => {
             }
             setKeepOpenRuntime({ preventCloseOnSelect: false, open });
           }
+          syncQuickEditPreventClose(model, open);
           others.onDropdownVisibleChange?.(open);
         }}
         optionRender={({ data }) => {
@@ -874,6 +881,8 @@ RecordSelectFieldModel.registerFlow({
             dataSourceKey: ctx.collection.dataSourceKey,
             collectionName: ctx.collectionField?.target,
             ...(associationName && sourceId != null ? { associationName, sourceId } : {}),
+            // 上级记录暂无主键（如审批配置态表单）时不能传 associationName，否则弹窗内新建的区块会绑定到关联资源；改传 sourceAssociationName，仅用于展示“当前弹窗上级记录”变量
+            ...(associationName && sourceId == null ? { sourceAssociationName: associationName } : {}),
             collectionField: ctx.collectionField,
             openerUids,
             onChange: (e) => {

package/src/flow/models/fields/AssociationFieldModel/SubTableFieldModel/SubTableColumnModel.tsx

@@ -209,7 +209,7 @@ function hasFormValueDrivenDataScopeField(fieldModel: any) {
 }
 
 const MemoFieldRenderer = React.memo(FieldModelRenderer, (prev, next) => {
-  return prev.value === next.value && prev.model === next.model;
+  return prev.value === next.value && prev.model === next.model && prev.disabled === next.disabled;
 });
 
 export function buildRowPathFromFieldIndex(fieldIndex: unknown): Array<string | number> | null {
@@ -345,11 +345,14 @@ interface CellProps {
   memoKey?: string;
   width?: number;
   commitOnChange?: boolean;
+  disabled?: boolean;
 }
 
 const MemoCell: React.FC<CellProps> = React.memo(
-  ({ value, record, rowIdx, id, parent, parentFieldIndex, rowFork, width, commitOnChange }) => {
+  ({ value, record, rowIdx, id, parent, parentFieldIndex, rowFork, width, commitOnChange, disabled }) => {
     const isNew = record?.__is_new__;
+    // 子表格整体被禁用时，列上的显示模式可能仍是“可编辑”，这里需要把父级的禁用状态一并合并进来，否则单元格仍可编辑。
+    const columnDisabled = disabled || parent.props.disabled;
     return (
       <div
         style={{
@@ -442,9 +445,7 @@ const MemoCell: React.FC<CellProps> = React.memo(
               style={{ marginBottom: 0 }}
               showLabel={false}
               disabled={
-                parent.props.disabled ||
-                (!isNew && parent.props.aclDisabled) ||
-                (isNew && parent.props.aclCreateDisabled)
+                columnDisabled || (!isNew && parent.props.aclDisabled) || (isNew && parent.props.aclCreateDisabled)
               }
             >
               {fork.constructor.isLargeField ? (
@@ -456,9 +457,7 @@ const MemoCell: React.FC<CellProps> = React.memo(
                   }}
                   defaultValue={value}
                   disabled={
-                    parent.props.disabled ||
-                    (!isNew && parent.props.aclDisabled) ||
-                    (isNew && parent.props.aclCreateDisabled)
+                    columnDisabled || (!isNew && parent.props.aclDisabled) || (isNew && parent.props.aclCreateDisabled)
                   }
                 />
               ) : (
@@ -481,7 +480,8 @@ const MemoCell: React.FC<CellProps> = React.memo(
       prev.memoKey === next.memoKey &&
       prev.width === next.width &&
       prev.commitOnChange === next.commitOnChange &&
-      prev.rowIdx === next.rowIdx
+      prev.rowIdx === next.rowIdx &&
+      prev.disabled === next.disabled
     );
   },
 );
@@ -620,6 +620,11 @@ export class SubTableColumnModel<
 
   onInit(options: any): void {
     super.onInit(options);
+    const resource = this.context.blockModel?.context?.resource;
+    const fieldPath = this.context.fieldPath;
+    if (resource?.addUpdateAssociationValues && fieldPath && this.collectionField?.isAssociationField?.()) {
+      resource.addUpdateAssociationValues(fieldPath);
+    }
     this.context.defineProperty('resourceName', {
       get: () => {
         return this.context.collectionField.collection.name;
@@ -740,7 +745,7 @@ export class SubTableColumnModel<
   }
   renderItem(): any {
     return (props) => {
-      const { value, id, rowIdx, record, parentFieldIndex, parentItem } = props || {};
+      const { value, id, rowIdx, record, parentFieldIndex, parentItem, disabled: subTableDisabled } = props || {};
       // 子表格列模型本身没有行级 fieldIndex，上下文中无法把 `roles.name` 解析成 `roles[0].name`，
       // 导致“默认值/赋值规则”在对多关系字段下无法生效。
       // 这里为每一行创建一个 column fork，并注入 fieldIndex，让规则引擎能够按行解析与写入。
@@ -754,6 +759,7 @@ export class SubTableColumnModel<
       const fieldModel: any = this.subModels.field;
       const cellModeKey = [
         rowForkKey,
+        subTableDisabled ? 'disabled' : 'enabled',
         this.props.pattern,
         this.props.readPretty,
         this.props.titleField,
@@ -828,6 +834,7 @@ export class SubTableColumnModel<
           parentItem={parentItem}
           rowFork={rowFork}
           memoKey={cellModeKey}
+          disabled={subTableDisabled}
           width={this.props.width}
           commitOnChange={this.hasFormulaColumn || this.hasFormValueDrivenDataScopeColumn}
         />

package/src/flow/models/fields/AssociationFieldModel/SubTableFieldModel/SubTableField.tsx

@@ -192,6 +192,7 @@ export function SubTableField(props) {
           rowIdx: pageRowIdx,
           id: `field-${String(columnKey)}-${rowBindingKey}`,
           value: text,
+          disabled,
           parentFieldIndex,
           parentItem,
           onChange: (value) => {

package/src/flow/models/fields/AssociationFieldModel/SubTableFieldModel/__tests__/SubTableField.disabled.test.tsx

@@ -0,0 +1,90 @@
+/**
+ * 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 React from 'react';
+import { describe, expect, it, vi } from 'vitest';
+import { render, screen } from '@nocobase/test/client';
+import { SubTableField } from '../SubTableField';
+
+vi.mock('react-i18next', async (importOriginal) => ({
+  ...(await importOriginal<any>()),
+  useTranslation: () => ({
+    t: (value: string) => value,
+  }),
+}));
+
+vi.mock('antd', async () => {
+  const actual = await vi.importActual<any>('antd');
+  return {
+    ...actual,
+    Table: ({ dataSource = [], columns = [] }: any) => (
+      <div data-testid="subtable">
+        <div data-testid="column-keys">{columns.map((column: any) => String(column.key)).join(',')}</div>
+        {dataSource.map((record: any, rowIdx: number) => (
+          <div data-testid={`row-${rowIdx}`} key={record.__index__ || rowIdx}>
+            {columns.map((column: any) => (
+              <div data-testid={`cell-${rowIdx}-${String(column.dataIndex || column.key)}`} key={column.key}>
+                {column.render?.(record[column.dataIndex], record, rowIdx)}
+              </div>
+            ))}
+          </div>
+        ))}
+      </div>
+    ),
+  };
+});
+
+function renderSubTableField(disabled?: boolean) {
+  const renderArgs: any[] = [];
+  const columns = [
+    {
+      key: 'name',
+      dataIndex: 'name',
+      render: (args: any) => {
+        renderArgs.push(args);
+        return <span>{args.value || 'empty'}</span>;
+      },
+    },
+  ];
+
+  render(
+    <SubTableField
+      columns={columns}
+      disabled={disabled}
+      pageSize={10}
+      filterTargetKey="id"
+      fieldPathArray={['roles']}
+      getCurrentValue={() => [{ __index__: 'row-1', id: 1, name: 'admin' }]}
+    />,
+  );
+
+  return renderArgs;
+}
+
+describe('SubTableField disabled', () => {
+  it('passes the disabled state down to every column cell', () => {
+    const renderArgs = renderSubTableField(true);
+
+    expect(renderArgs).toHaveLength(1);
+    expect(renderArgs[0].disabled).toBe(true);
+  });
+
+  it('keeps cells editable when the sub-table is not disabled', () => {
+    const renderArgs = renderSubTableField(false);
+
+    expect(renderArgs).toHaveLength(1);
+    expect(renderArgs[0].disabled).toBe(false);
+  });
+
+  it('hides the remove column when the sub-table is disabled', () => {
+    renderSubTableField(true);
+
+    expect(screen.getByTestId('column-keys')).not.toHaveTextContent('delete');
+  });
+});