mirror of
https://gitee.com/nocobase/nocobase.git
synced 2025-05-09 15:39:24 +08:00
Merge branch 'next' into develop
This commit is contained in:
commit
733246467f
@ -103,14 +103,14 @@ const useCompatDetailsBlockParams = (props) => {
|
|||||||
export const DetailsBlockProvider = withDynamicSchemaProps((props) => {
|
export const DetailsBlockProvider = withDynamicSchemaProps((props) => {
|
||||||
const { params, parseVariableLoading } = useCompatDetailsBlockParams(props);
|
const { params, parseVariableLoading } = useCompatDetailsBlockParams(props);
|
||||||
const record = useCollectionRecordData();
|
const record = useCollectionRecordData();
|
||||||
const { association, dataSource } = props;
|
const { association, dataSource, action } = props;
|
||||||
const { getCollection } = useCollectionManager_deprecated(dataSource);
|
const { getCollection } = useCollectionManager_deprecated(dataSource);
|
||||||
const { __collection } = record || {};
|
const { __collection } = record || {};
|
||||||
const { designable } = useDesignable();
|
const { designable } = useDesignable();
|
||||||
const collection = props.collection || getCollection(association, dataSource).name;
|
const collectionName = props.collection;
|
||||||
let detailFlag = true;
|
let detailFlag = true;
|
||||||
if (!designable && __collection) {
|
if (!designable && __collection && action === 'get' && !association) {
|
||||||
detailFlag = __collection === collection;
|
detailFlag = __collection === collectionName;
|
||||||
}
|
}
|
||||||
|
|
||||||
const refresh = useUpdate();
|
const refresh = useUpdate();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user