mirror of
https://gitee.com/nocobase/nocobase.git
synced 2025-07-02 03:02:19 +08:00
Merge branch 'next' into develop
This commit is contained in:
commit
b1b521c4fd
@ -119,7 +119,7 @@ export const useIsDetailBlock = () => {
|
||||
|
||||
export const FormBlockProvider = withDynamicSchemaProps((props) => {
|
||||
const parentRecordData = useCollectionParentRecordData();
|
||||
const { parentRecord } = props;
|
||||
const { parentRecord, action } = props;
|
||||
const record = useCollectionRecordData();
|
||||
const { association } = props;
|
||||
const cm = useCollectionManager();
|
||||
@ -129,12 +129,11 @@ export const FormBlockProvider = withDynamicSchemaProps((props) => {
|
||||
|
||||
const refresh = useUpdate();
|
||||
|
||||
if (!designable && __collection) {
|
||||
if (!designable && __collection && action) {
|
||||
if (__collection !== collection) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<TemplateBlockProvider onTemplateLoaded={refresh}>
|
||||
<BlockProvider
|
||||
|
Loading…
x
Reference in New Issue
Block a user