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

fix: data-block parent request with data-source (#3605)

Browse Source
This commit is contained in:
jack zhang 2024-03-05 13:00:50 +08:00 committed by GitHub
parent b1a49f0d06
commit 3b30070f2d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/core/client/src/data-source/data-block/DataBlockRequestProvider.tsx
View File

@ -5,6 +5,7 @@ import { UseRequestResult, useAPIClient, useRequest } from '../../api-client';
import { CollectionRecordProvider, CollectionRecord } from '../collection-record'; import { CollectionRecordProvider, CollectionRecord } from '../collection-record';
import { AllDataBlockProps, useDataBlockProps } from './DataBlockProvider'; import { AllDataBlockProps, useDataBlockProps } from './DataBlockProvider';
import { useDataBlockResource } from './DataBlockResourceProvider'; import { useDataBlockResource } from './DataBlockResourceProvider';
import { useDataSourceHeaders } from '../utils';
export const BlockRequestContext = createContext<UseRequestResult<any>>(null); export const BlockRequestContext = createContext<UseRequestResult<any>>(null);
BlockRequestContext.displayName = 'BlockRequestContext'; BlockRequestContext.displayName = 'BlockRequestContext';
@ -52,6 +53,8 @@ function useCurrentRequest<T>(options: Omit<AllDataBlockProps, 'type'>) {
function useParentRequest<T>(options: Omit<AllDataBlockProps, 'type'>) { function useParentRequest<T>(options: Omit<AllDataBlockProps, 'type'>) {
const { sourceId, association, parentRecord } = options; const { sourceId, association, parentRecord } = options;
const api = useAPIClient(); const api = useAPIClient();
const dataBlockProps = useDataBlockProps();
const headers = useDataSourceHeaders(dataBlockProps.dataSource);
return useRequest<T>( return useRequest<T>(
async () => { async () => {
if (parentRecord) return Promise.resolve({ data: parentRecord }); if (parentRecord) return Promise.resolve({ data: parentRecord });
@ -60,7 +63,7 @@ function useParentRequest<T>(options: Omit<AllDataBlockProps, 'type'>) {
const arr = association.split('.'); const arr = association.split('.');
// <collection>:get/<filterByTk> // <collection>:get/<filterByTk>
const url = `${arr[0]}:get/${sourceId}`; const url = `${arr[0]}:get/${sourceId}`;
const res = await api.request({ url }); const res = await api.request({ url, headers });
return res.data; return res.data;
}, },
{ {