diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterItemDesigner.tsx b/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterItemDesigner.tsx index a46a24b9ab..295bd5e3e2 100644 --- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterItemDesigner.tsx +++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterItemDesigner.tsx @@ -137,6 +137,9 @@ const EditOperator = () => { const operator = fieldSchema['x-component-props']?.['filter-operator']; const setOperatorComponent = (operator: any, component: any, props = {}) => { + if (component === 'DatePicker.FilterWithPicker') { + component = 'DatePicker'; + } const componentProps = field.componentProps || {}; field.component = component; field.componentProps = { @@ -150,6 +153,7 @@ const EditOperator = () => { 'filter-operator': operator, ...props, }; + fieldSchema['x-filter-operator'] = operator?.value; dn.emit('patch', { schema: { 'x-uid': fieldSchema['x-uid'], @@ -159,6 +163,7 @@ const EditOperator = () => { 'filter-operator': operator, ...props, }, + 'x-filter-operator': operator?.value, }, }); }; diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/hooks/filter.ts b/packages/plugins/@nocobase/plugin-data-visualization/src/client/hooks/filter.ts index 0946b0bc0e..25126d192f 100644 --- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/hooks/filter.ts +++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/hooks/filter.ts @@ -138,6 +138,7 @@ export const useChartFilter = () => { ...field.uiSchema?.['x-component-props'], 'filter-operator': defaultOperator, }, + 'x-filter-operators': defaultOperator?.value, }; if (field.interface === 'formula') { const component = getFormulaComponent(field.dataType) || 'Input'; @@ -195,6 +196,7 @@ export const useChartFilter = () => { 'x-component-props': { 'filter-operator': defaultOperator, }, + 'x-filter-operators': defaultOperator?.value, }; if (defaultOperator?.noValue) { schema = {