Browse Source

Merge pull request #1340 in DESIGN/design from ~BJORN/design:feature/10.0 to feature/10.0

* commit '362829e230ccaaab782285d8cbf07fa52535cc58':
  CHART-11424 气泡图,散点图的数据筛选设置 && CHART-11278 图例界面布局名称
persist/11.0
Bjorn 5 years ago
parent
commit
0b7f9b3d78
  1. 4
      designer-chart/src/main/java/com/fr/design/chartx/fields/diff/ScatterDataSetFieldsPane.java
  2. 2
      designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartPlotLegendPane.java

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

@ -80,7 +80,7 @@ public class ScatterDataSetFieldsPane extends AbstractDataSetFieldsPane<BubbleCo
updateField(xField, field.getXField());
updateField(yField, field.getYField());
updateField(size, field.getSizeField());
field.getSeriesName().setFilterProperties(filterPane.updateBean());
collection.setFilterProperties(filterPane.updateBean());
collection.add(field);
return collection;
}
@ -95,6 +95,6 @@ public class ScatterDataSetFieldsPane extends AbstractDataSetFieldsPane<BubbleCo
populateField(xField, field.getXField());
populateField(yField, field.getYField());
populateField(size, field.getSizeField());
filterPane.populateBean(field.getSeriesName().getFilterProperties());
filterPane.populateBean(ob.getFilterProperties());
}
}

2
designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartPlotLegendPane.java

@ -176,7 +176,7 @@ public class VanChartPlotLegendPane extends BasicPane {
initPositionListener();
JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components,row,col);
return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout_Position"), panel);
return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Form_Layout"), panel);
}
private void initPositionListener(){

Loading…
Cancel
Save