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

Merge branch 'main' into next
Some checks are pending
Build Docker Image / build-and-push (push) Waiting to run
Details
Build Pro Image / build-and-push (push) Waiting to run
Details
E2E / Build (push) Waiting to run
Details
E2E / Core and plugins (push) Blocked by required conditions
Details
E2E / plugin-workflow (push) Blocked by required conditions
Details
E2E / plugin-workflow-approval (push) Blocked by required conditions
Details
E2E / plugin-data-source-main (push) Blocked by required conditions
Details
E2E / Comment on PR (push) Blocked by required conditions
Details
NocoBase FrontEnd Test / frontend-test (18) (push) Waiting to run
Details

Browse Source
This commit is contained in:
GitHub Actions Bot 2024-09-09 16:02:27 +00:00
commit 50e6dc296e
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/plugins/@nocobase/plugin-data-visualization/src/client/configure/schemas/configure.ts
View File

@ -215,6 +215,7 @@ export const querySchema: ISchema = {
'x-component-props': { 'x-component-props': {
onChange: '{{ onCollectionChange }}', onChange: '{{ onCollectionChange }}',
placeholder: '{{t("Collection")}}', placeholder: '{{t("Collection")}}',
showSearch: true,
}, },
}, },
}, },

5
packages/plugins/@nocobase/plugin-data-visualization/src/client/hooks/query.ts
View File

@ -41,9 +41,10 @@ export type FieldOption = {
export const useChartDataSource = (dataSource?: string) => { export const useChartDataSource = (dataSource?: string) => {
const { current } = useContext(ChartConfigContext); 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 dm = useDataSourceManager();
const ds = dm.getDataSource(_dataSource); const ds = dm.getDataSource(dataSource);
const fim = dm.collectionFieldInterfaceManager; const fim = dm.collectionFieldInterfaceManager;
const cm = ds?.collectionManager; const cm = ds?.collectionManager;
return { cm, fim, collection }; return { cm, fim, collection };