From def3a0a388e0af9481dd7df76f1625b4738b036f Mon Sep 17 00:00:00 2001 From: Zeke Zhang <958414905@qq.com> Date: Sun, 6 Apr 2025 17:53:10 +0800 Subject: [PATCH] fix: add headers to API request in AssociationFieldProvider (#6619) * fix: add headers to API request in AssociationFieldProvider * fix: handle optional dataSource in headers for API request in AssociationFieldProvider --- .../antd/association-field/AssociationFieldProvider.tsx | 3 +++ packages/core/sdk/src/APIClient.ts | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/core/client/src/schema-component/antd/association-field/AssociationFieldProvider.tsx b/packages/core/client/src/schema-component/antd/association-field/AssociationFieldProvider.tsx index 190a5e6f23..740d66fd5f 100644 --- a/packages/core/client/src/schema-component/antd/association-field/AssociationFieldProvider.tsx +++ b/packages/core/client/src/schema-component/antd/association-field/AssociationFieldProvider.tsx @@ -14,6 +14,7 @@ import React, { useEffect, useMemo, useState } from 'react'; import { useAPIClient, useRequest } from '../../../api-client'; import { useCollectionManager } from '../../../data-source/collection'; import { markRecordAsNew } from '../../../data-source/collection-record/isNewRecord'; +import { getDataSourceHeaders } from '../../../data-source/utils'; import { useKeepAlive } from '../../../route-switch/antd/admin-layout/KeepAlive'; import { useSchemaComponentContext } from '../../hooks'; import { AssociationFieldContext } from './context'; @@ -67,9 +68,11 @@ export const AssociationFieldProvider = observer( if (_.isUndefined(ids) || _.isNil(ids) || _.isNaN(ids)) { return Promise.reject(null); } + return api.request({ resource: collectionField.target, action: Array.isArray(ids) ? 'list' : 'get', + headers: getDataSourceHeaders(cm?.dataSource?.key), params: { filter: { [targetKey]: ids, diff --git a/packages/core/sdk/src/APIClient.ts b/packages/core/sdk/src/APIClient.ts index 9cb8bc922e..2d360599d7 100644 --- a/packages/core/sdk/src/APIClient.ts +++ b/packages/core/sdk/src/APIClient.ts @@ -7,7 +7,7 @@ * For more information, please refer to: https://www.nocobase.com/agreement. */ -import axios, { AxiosError, AxiosInstance, AxiosRequestConfig, AxiosResponse, RawAxiosRequestHeaders } from 'axios'; +import axios, { AxiosInstance, AxiosRequestConfig, AxiosResponse, RawAxiosRequestHeaders } from 'axios'; import qs from 'qs'; export interface ActionParams {