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

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

View File

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