ruiling/tachybase_todo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: tableoid should pointed to target collection in assciation field data scope config (#3053)

Browse Source
This commit is contained in:
katherinehhh 2023-11-16 18:15:10 +08:00 committed by GitHub
parent 54caf05ba4
commit cd76ae7e63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/client/src/schema-component/antd/collection-select/CollectionSelect.tsx
View File

@ -17,7 +17,7 @@ function useOptions({ filter, isTableOid }: CollectionSelectProps) {
const field: any = useField(); const field: any = useField();
const ctx: any = useContext(FilterContext); const ctx: any = useContext(FilterContext);
const collection = useCollection(); const collection = useCollection();
const targetCollection = isTableOid && (ctx?.field?.collectionName || collection.name); const targetCollection = isTableOid && (ctx?.field?.collectionName || ctx.collectionName || collection.name);
const inheritCollections = useSelfAndChildrenCollections(targetCollection); const inheritCollections = useSelfAndChildrenCollections(targetCollection);
const { collections = [] } = useCollectionManager(); const { collections = [] } = useCollectionManager();
const currentCollections = field?.dataSource const currentCollections = field?.dataSource