mirrors/nocobase
1
0
Fork 0
mirror of https://github.com/nocobase/nocobase synced 2024-11-16 03:25:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: block resource

Browse Source
This commit is contained in:
dream2023 2024-01-23 11:09:29 +08:00
parent 819b38fe28
commit b3ced4c7e1
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/core/client/src/application/collection/Collection.tsx
View File

@ -93,6 +93,10 @@ export class CollectionV2 {
return this.options?.fields || []; return this.options?.fields || [];
} }
get sourceKey() {
return this.options.sourceKey;
}
get name() { get name() {
return this.options.name; return this.options.name;
} }

22
packages/core/client/src/application/data-block/DataBlockResourceProvider.tsx
View File

@ -3,26 +3,40 @@ import { IResource } from '@nocobase/sdk';
import { useAPIClient } from '../../api-client'; import { useAPIClient } from '../../api-client';
import { useDataBlockPropsV2 } from './DataBlockProvider'; import { useDataBlockPropsV2 } from './DataBlockProvider';
import { DEFAULT_DATA_SOURCE_NAME } from '../collection'; import { DEFAULT_DATA_SOURCE_NAME, useCollectionManagerV2 } from '../collection';
export const DataBlockResourceContextV2 = createContext<IResource>(null); export const DataBlockResourceContextV2 = createContext<IResource>(null);
DataBlockResourceContextV2.displayName = 'DataBlockResourceContextV2'; DataBlockResourceContextV2.displayName = 'DataBlockResourceContextV2';
export const DataBlockResourceProviderV2: FC<{ children?: ReactNode }> = ({ children }) => { export const DataBlockResourceProviderV2: FC<{ children?: ReactNode }> = ({ children }) => {
const dataBlockProps = useDataBlockPropsV2(); const dataBlockProps = useDataBlockPropsV2();
const { association, collection, dataSource, sourceId } = dataBlockProps; const cm = useCollectionManagerV2();
const { association, collection, dataSource, sourceId, parentRecord } = dataBlockProps;
const api = useAPIClient(); const api = useAPIClient();
const headers = useMemo(() => { const headers = useMemo(() => {
if (dataSource && dataSource !== DEFAULT_DATA_SOURCE_NAME) { if (dataSource && dataSource !== DEFAULT_DATA_SOURCE_NAME) {
return { 'x-connection': dataSource }; return { 'x-connection': dataSource };
} }
}, [dataSource]); }, [dataSource]);
const sourceIdValue = useMemo(() => {
if (sourceId) {
return sourceId;
}
if (association && parentRecord) {
const associationCollection = cm.getCollection(association);
if (associationCollection) {
return parentRecord.data[associationCollection.sourceKey || 'id'];
}
}
}, [sourceId, parentRecord]);
const resource = useMemo(() => { const resource = useMemo(() => {
if (association) { if (association) {
return api.resource(association, sourceId, headers); return api.resource(association, sourceIdValue, headers);
} }
return api.resource(collection, undefined, headers); return api.resource(collection, undefined, headers);
}, [api, association, collection, sourceId, headers]); }, [api, association, collection, sourceIdValue, headers]);
return <DataBlockResourceContextV2.Provider value={resource}>{children}</DataBlockResourceContextV2.Provider>; return <DataBlockResourceContextV2.Provider value={resource}>{children}</DataBlockResourceContextV2.Provider>;
}; };