mirrors/nocobase
1
0
Fork 0
mirror of https://github.com/nocobase/nocobase synced 2024-11-15 12:26:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(sub-table): allows configuration of "Display association fields" (#2073)

Browse Source
This commit is contained in:
katherinehhh 2023-06-23 00:10:39 +08:00 committed by GitHub
parent ccfc9b8625
commit 87e37757b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/core/client/src/schema-initializer/buttons/TableColumnInitializers.tsx
View File

@ -8,12 +8,13 @@ import {
useInheritsTableColumnInitializerFields, useInheritsTableColumnInitializerFields,
} from '../utils'; } from '../utils';
import { useCompile } from '../../schema-component'; import { useCompile } from '../../schema-component';
import { useFieldSchema } from '@formily/react'; import { useField, useFieldSchema } from '@formily/react';
// 表格列配置 // 表格列配置
export const TableColumnInitializers = (props: any) => { export const TableColumnInitializers = (props: any) => {
const { items = [], action = true } = props; const { items = [], action = true } = props;
const { t } = useTranslation(); const { t } = useTranslation();
const field = useField();
const fieldSchema = useFieldSchema(); const fieldSchema = useFieldSchema();
const associatedFields = useAssociatedTableColumnInitializerFields(); const associatedFields = useAssociatedTableColumnInitializerFields();
const inheritFields = useInheritsTableColumnInitializerFields(); const inheritFields = useInheritsTableColumnInitializerFields();
@ -41,7 +42,7 @@ export const TableColumnInitializers = (props: any) => {
); );
}); });
} }
if (associatedFields?.length > 0 && !isSubTable) { if (associatedFields?.length > 0 && field.readPretty) {
fieldItems.push( fieldItems.push(
{ {
type: 'divider', type: 'divider',