Browse Source

Merge pull request #1289 in DESIGN/design from ~WIM.ZHAI/xdesign:feature/10.0 to feature/10.0

* commit 'c34b063a3e3a3f9fcc1b6f52e4a7f2af7d98806a':
  CHART-11322 refactor 散点图值字段用size表示
research/11.0
Wim.Zhai 5 years ago
parent
commit
6d0dbef6a8
  1. 4
      designer-chart/src/main/java/com/fr/design/chartx/component/CellDataSeriesXYValueCorrelationPane.java
  2. 12
      designer-chart/src/main/java/com/fr/design/chartx/fields/diff/ScatterDataSetFieldsPane.java

4
designer-chart/src/main/java/com/fr/design/chartx/component/CellDataSeriesXYValueCorrelationPane.java

@ -37,7 +37,7 @@ public class CellDataSeriesXYValueCorrelationPane extends AbstractCorrelationPan
field.getSeriesName().getFieldName(),
field.getXField().getFieldName(),
field.getYField().getFieldName(),
field.getValueField().getFieldName()
field.getSizeField().getFieldName()
};
result.add(array);
}
@ -57,7 +57,7 @@ public class CellDataSeriesXYValueCorrelationPane extends AbstractCorrelationPan
bubbleColumnField.setSeriesName(series);
bubbleColumnField.setXField(xField);
bubbleColumnField.setYField(yField);
bubbleColumnField.setValueField(value);
bubbleColumnField.setSizeField(value);
bubbleColumnFieldList.add(bubbleColumnField);
}

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

@ -22,7 +22,7 @@ public class ScatterDataSetFieldsPane extends AbstractDataSetFieldsPane<BubbleCo
private UIComboBoxWithNone series;
private UIComboBox xField;
private UIComboBox yField;
private UIComboBoxWithNone value;
private UIComboBoxWithNone size;
//todo 数据筛选
private AbstractSingleFilterPane filterPane;
@ -34,7 +34,7 @@ public class ScatterDataSetFieldsPane extends AbstractDataSetFieldsPane<BubbleCo
series = new UIComboBoxWithNone();
xField = new UIComboBox();
yField = new UIComboBox();
value = new UIComboBoxWithNone();
size = new UIComboBoxWithNone();
filterPane = new AbstractSingleFilterPane() {
@Override
@ -59,7 +59,7 @@ public class ScatterDataSetFieldsPane extends AbstractDataSetFieldsPane<BubbleCo
@Override
protected UIComboBox[] filedComboBoxes() {
return new UIComboBox[]{
series, xField, yField, value
series, xField, yField, size
};
}
@ -80,7 +80,8 @@ public class ScatterDataSetFieldsPane extends AbstractDataSetFieldsPane<BubbleCo
updateField(series, field.getSeriesName());
updateField(xField, field.getXField());
updateField(yField, field.getYField());
updateField(value, field.getValueField());
updateField(size, field.getSizeField());
filterPane.updateBean(field.getSeriesName().getFilterProperties());
return collection;
}
@ -90,6 +91,7 @@ public class ScatterDataSetFieldsPane extends AbstractDataSetFieldsPane<BubbleCo
populateField(series, field.getSeriesName());
populateField(xField, field.getXField());
populateField(yField, field.getYField());
populateField(value, field.getValueField());
populateField(size, field.getSizeField());
filterPane.populateBean(field.getSeriesName().getFilterProperties());
}
}

Loading…
Cancel
Save