test/nocobase2
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2024-12-02 04:07:50 +08:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

fix(FixedBlock): using both association filters and FixedBlock does not show the complete table (#1405)

Browse Source
This commit is contained in:
Dunqing 2023-02-01 12:55:57 +08:00 committed by GitHub
parent 65a579384a
commit 4e3a276202
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
packages/core/client/src/block-provider/BlockProvider.tsx
View File

@ -13,7 +13,7 @@ import {
useAPIClient,
useDesignable,
useRecord,
WithoutTableFieldResource
WithoutTableFieldResource,
} from '../';
import { CollectionProvider, useCollection, useCollectionManager } from '../collection-manager';
import { useRecordIndex } from '../record-provider';
@ -179,7 +179,13 @@ export const RenderChildrenWithAssociationFilter: React.FC<any> = (props) => {
if (associationFilterSchema) {
return (
<Component {...field.componentProps}>
<Row gutter={16} wrap={false}>
<Row
className={css`
height: 100%;
`}
gutter={16}
wrap={false}
>
<Col
className={css`
width: 200px;
@ -198,11 +204,19 @@ export const RenderChildrenWithAssociationFilter: React.FC<any> = (props) => {
min-width: 0;
`}
>
<RecursionField
schema={fieldSchema}
onlyRenderProperties
filterProperties={(s) => s['x-component'] !== 'AssociationFilter'}
/>
<div
className={css`
display: flex;
flex-direction: column;
height: 100%;
`}
>
<RecursionField
schema={fieldSchema}
onlyRenderProperties
filterProperties={(s) => s['x-component'] !== 'AssociationFilter'}
/>
</div>
</Col>
</Row>
</Component>