diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/configure/schemas/configure.ts b/packages/plugins/@nocobase/plugin-data-visualization/src/client/configure/schemas/configure.ts
index 2be9467865..71343fc02d 100644
--- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/configure/schemas/configure.ts
+++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/configure/schemas/configure.ts
@@ -215,6 +215,7 @@ export const querySchema: ISchema = {
           'x-component-props': {
             onChange: '{{ onCollectionChange }}',
             placeholder: '{{t("Collection")}}',
+            showSearch: true,
           },
         },
       },
diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/hooks/query.ts b/packages/plugins/@nocobase/plugin-data-visualization/src/client/hooks/query.ts
index d66116e67a..1d906a39d9 100644
--- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/hooks/query.ts
+++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/hooks/query.ts
@@ -41,9 +41,10 @@ export type FieldOption = {
 
 export const useChartDataSource = (dataSource?: string) => {
   const { current } = useContext(ChartConfigContext);
-  const { dataSource: _dataSource = dataSource || DEFAULT_DATA_SOURCE_KEY, collection } = current || {};
+  const { dataSource: currentDataSource, collection } = current || {};
+  dataSource = dataSource || currentDataSource || DEFAULT_DATA_SOURCE_KEY;
   const dm = useDataSourceManager();
-  const ds = dm.getDataSource(_dataSource);
+  const ds = dm.getDataSource(dataSource);
   const fim = dm.collectionFieldInterfaceManager;
   const cm = ds?.collectionManager;
   return { cm, fim, collection };