|
|
@@ -102,16 +102,12 @@ class AggregateTableConfigForm extends React.Component {
|
|
|
message.warning('最多支持选择2个分组');
|
|
|
return false;
|
|
|
}
|
|
|
- let statisticsArr = chartDesigner.aggregateTableConfig.statistics;
|
|
|
- if(values.length > 0) {
|
|
|
- statisticsArr = statisticsArr.filter(s => s !== 'dictinctCount');
|
|
|
- }
|
|
|
+ let statisticsArr = chartDesigner.aggregateTableConfig.statistics.filter(s => s.name !== 'dictinctCount');
|
|
|
values.forEach(value => {
|
|
|
const column = value.key ? columns.find(c => c.name === value.key) : null;
|
|
|
const g = column ? { ...value, type: column.type } : undefined;
|
|
|
groupBy.push(g);
|
|
|
});
|
|
|
-
|
|
|
dispatch({ type: 'chartDesigner/changeField', name: 'aggregateTableConfig', value: { ...props.chartDesigner.aggregateTableConfig, groupBy, statistics: statisticsArr }, autoRefresh });
|
|
|
}}
|
|
|
value={chartDesigner.aggregateTableConfig.groupBy}
|