Browse Source

CHART-11424 fix 补充几种图表单元格数据面板 数据筛选组件

persist/11.0
Wim.Zhai 5 years ago
parent
commit
59cc56f41d
  1. 2
      designer-chart/src/main/java/com/fr/design/chartx/fields/diff/FunnelCellDataFieldsPane.java
  2. 2
      designer-chart/src/main/java/com/fr/design/chartx/fields/diff/GaugeCellDataFieldsPane.java
  3. 2
      designer-chart/src/main/java/com/fr/design/chartx/fields/diff/ScatterCellDataFieldsPane.java
  4. 6
      designer-chart/src/main/java/com/fr/design/chartx/fields/diff/ScatterDataSetFieldsPane.java

2
designer-chart/src/main/java/com/fr/design/chartx/fields/diff/FunnelCellDataFieldsPane.java

@ -54,7 +54,7 @@ public class FunnelCellDataFieldsPane extends AbstractCellDataFieldsWithSeriesVa
ColumnFieldCollectionWithSeriesValue fieldCollection = new ColumnFieldCollectionWithSeriesValue(); ColumnFieldCollectionWithSeriesValue fieldCollection = new ColumnFieldCollectionWithSeriesValue();
updateSeriesValuePane(fieldCollection); updateSeriesValuePane(fieldCollection);
SeriesValueCorrelationDefinition seriesValueCorrelationDefinition = fieldCollection.getSeriesValueCorrelationDefinition(); SeriesValueCorrelationDefinition seriesValueCorrelationDefinition = fieldCollection.getSeriesValueCorrelationDefinition();
filterPane.updateBean(seriesValueCorrelationDefinition.getFilterProperties()); seriesValueCorrelationDefinition.setFilterProperties(filterPane.updateBean());
return fieldCollection; return fieldCollection;
} }

2
designer-chart/src/main/java/com/fr/design/chartx/fields/diff/GaugeCellDataFieldsPane.java

@ -69,7 +69,7 @@ public class GaugeCellDataFieldsPane extends AbstractCellDataFieldsPane<GaugeCol
GaugeColumnFieldCollection gauge = new GaugeColumnFieldCollection(); GaugeColumnFieldCollection gauge = new GaugeColumnFieldCollection();
updateField(category, gauge.getCategory()); updateField(category, gauge.getCategory());
updateField(value, gauge.getValue()); updateField(value, gauge.getValue());
filterPane.updateBean(gauge.getCategory().getFilterProperties()); gauge.getCategory().setFilterProperties(filterPane.updateBean());
return gauge; return gauge;
} }

2
designer-chart/src/main/java/com/fr/design/chartx/fields/diff/ScatterCellDataFieldsPane.java

@ -76,11 +76,13 @@ public class ScatterCellDataFieldsPane extends AbstractCellDataFieldsPane<Bubble
public BubbleColumnFieldCollection updateBean() { public BubbleColumnFieldCollection updateBean() {
BubbleColumnFieldCollection collection = new BubbleColumnFieldCollection(); BubbleColumnFieldCollection collection = new BubbleColumnFieldCollection();
seriesXYValueCorrelationPane.updateBean(collection); seriesXYValueCorrelationPane.updateBean(collection);
collection.setFilterProperties(filterPane.updateBean());
return collection; return collection;
} }
@Override @Override
public void populateBean(BubbleColumnFieldCollection ob) { public void populateBean(BubbleColumnFieldCollection ob) {
seriesXYValueCorrelationPane.populateBean(ob); seriesXYValueCorrelationPane.populateBean(ob);
filterPane.populateBean(ob.getFilterProperties());
} }
} }

6
designer-chart/src/main/java/com/fr/design/chartx/fields/diff/ScatterDataSetFieldsPane.java

@ -75,17 +75,21 @@ public class ScatterDataSetFieldsPane extends AbstractDataSetFieldsPane<BubbleCo
@Override @Override
public BubbleColumnFieldCollection updateBean() { public BubbleColumnFieldCollection updateBean() {
BubbleColumnFieldCollection collection = new BubbleColumnFieldCollection(); BubbleColumnFieldCollection collection = new BubbleColumnFieldCollection();
BubbleColumnField field = collection.getBubbleColumnField(0); BubbleColumnField field = new BubbleColumnField();
updateField(series, field.getSeriesName()); updateField(series, field.getSeriesName());
updateField(xField, field.getXField()); updateField(xField, field.getXField());
updateField(yField, field.getYField()); updateField(yField, field.getYField());
updateField(size, field.getSizeField()); updateField(size, field.getSizeField());
field.getSeriesName().setFilterProperties(filterPane.updateBean()); field.getSeriesName().setFilterProperties(filterPane.updateBean());
collection.add(field);
return collection; return collection;
} }
@Override @Override
public void populateBean(BubbleColumnFieldCollection ob) { public void populateBean(BubbleColumnFieldCollection ob) {
if (ob.getList().isEmpty()){
return;
}
BubbleColumnField field = ob.getBubbleColumnField(0); BubbleColumnField field = ob.getBubbleColumnField(0);
populateField(series, field.getSeriesName()); populateField(series, field.getSeriesName());
populateField(xField, field.getXField()); populateField(xField, field.getXField());

Loading…
Cancel
Save