Merge branch 'main' into next

This commit is contained in:
nocobase[bot] 2024-12-13 06:04:14 +00:00
commit 93e8e535ad

View File

@ -80,7 +80,6 @@ export const FormItem: any = withDynamicSchemaProps(
[formItemLabelCss]: showTitle === false, [formItemLabelCss]: showTitle === false,
}); });
}, [showTitle]); }, [showTitle]);
return ( return (
<CollectionFieldProvider allowNull={true}> <CollectionFieldProvider allowNull={true}>
<BlockItem <BlockItem
@ -88,7 +87,9 @@ export const FormItem: any = withDynamicSchemaProps(
'nb-form-item', 'nb-form-item',
css` css`
.ant-formily-item-layout-horizontal .ant-formily-item-control { .ant-formily-item-layout-horizontal .ant-formily-item-control {
max-width: ${showTitle === false ? '100% !important' : null}; max-width: ${showTitle === false || schema['x-component'] !== 'CollectionField'
? '100% !important'
: null};
} }
`, `,
)} )}