fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-07-01 18:52:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into next

Browse Source
This commit is contained in:
nocobase[bot] 2025-02-17 05:35:07 +00:00
commit f9cbc01bd9
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterForm.tsx
View File

@ -52,6 +52,8 @@ export const ChartFilterForm: React.FC = memo((props) => {
setField(name, { setField(name, {
title: field.title, title: field.title,
operator: field.componentProps['filter-operator'], operator: field.componentProps['filter-operator'],
dataSource: field.componentProps['data-source'],
collectionField: field.componentProps['collection-field'],
}); });
// parse field title // parse field title

2
packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterProvider.tsx
View File

@ -16,6 +16,8 @@ type FilterField = {
value: string; value: string;
noValue?: boolean; noValue?: boolean;
}; };
dataSource?: string;
collectionField?: string;
}; };
export const ChartFilterContext = createContext<{ export const ChartFilterContext = createContext<{

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

@ -137,6 +137,8 @@ export const useChartFilter = () => {
'x-component-props': { 'x-component-props': {
...field.uiSchema?.['x-component-props'], ...field.uiSchema?.['x-component-props'],
'filter-operator': defaultOperator, 'filter-operator': defaultOperator,
'data-source': dataSource,
'collection-field': `${fieldName}.${field.name}`,
}, },
'x-filter-operators': defaultOperator?.value, 'x-filter-operators': defaultOperator?.value,
}; };
@ -195,6 +197,8 @@ export const useChartFilter = () => {
title, title,
'x-component-props': { 'x-component-props': {
'filter-operator': defaultOperator, 'filter-operator': defaultOperator,
'data-source': dataSource,
'collection-field': `${fieldName}.${child.name}`,
}, },
'x-filter-operators': defaultOperator?.value, 'x-filter-operators': defaultOperator?.value,
}; };
@ -319,8 +323,12 @@ export const useChartFilter = () => {
.filter(([_, props]) => props) .filter(([_, props]) => props)
.forEach(([name, props]) => { .forEach(([name, props]) => {
const { operator } = props || {}; const { operator } = props || {};
const { dataSource, fieldName: _fieldName } = parseFilterFieldName(name); let { dataSource, collectionField: fieldName } = props || {};
let fieldName = _fieldName; if (!fieldName) {
const parsed = parseFilterFieldName(name);
dataSource = parsed.dataSource;
fieldName = parsed.fieldName;
}
const ds = dm.getDataSource(dataSource); const ds = dm.getDataSource(dataSource);
const cm = ds.collectionManager; const cm = ds.collectionManager;
const field = cm.getCollectionField(fieldName); const field = cm.getCollectionField(fieldName);