Merge branch 'main' into next

This commit is contained in:
GitHub Actions Bot 2024-09-20 06:54:39 +00:00
commit c83b578905

View File

@ -156,7 +156,9 @@ export const tableColumnSettings = new SchemaSettings({
const { currentMode } = useAssociationFieldContext(); const { currentMode } = useAssociationFieldContext();
return ( return (
interfaceCfg?.sortable === true && !currentMode && collection?.name === collectionField?.collectionName interfaceCfg?.sortable === true &&
!currentMode &&
(collection?.name === collectionField?.collectionName || !collectionField?.collectionName)
); );
}, },
useComponentProps() { useComponentProps() {