Merge branch 'next' into develop

This commit is contained in:
nocobase[bot] 2025-02-11 03:00:02 +00:00
commit b1b521c4fd

View File

@ -119,7 +119,7 @@ export const useIsDetailBlock = () => {
export const FormBlockProvider = withDynamicSchemaProps((props) => { export const FormBlockProvider = withDynamicSchemaProps((props) => {
const parentRecordData = useCollectionParentRecordData(); const parentRecordData = useCollectionParentRecordData();
const { parentRecord } = props; const { parentRecord, action } = props;
const record = useCollectionRecordData(); const record = useCollectionRecordData();
const { association } = props; const { association } = props;
const cm = useCollectionManager(); const cm = useCollectionManager();
@ -129,12 +129,11 @@ export const FormBlockProvider = withDynamicSchemaProps((props) => {
const refresh = useUpdate(); const refresh = useUpdate();
if (!designable && __collection) { if (!designable && __collection && action) {
if (__collection !== collection) { if (__collection !== collection) {
return null; return null;
} }
} }
return ( return (
<TemplateBlockProvider onTemplateLoaded={refresh}> <TemplateBlockProvider onTemplateLoaded={refresh}>
<BlockProvider <BlockProvider