Browse Source

Pull request #9387: REPORT-74118 单元格数据源老模板切换到数据集数据并添加多分类,多分类不可修改

Merge in DESIGN/design from ~BRUCE.DENG/design:release/10.0 to release/10.0

* commit 'fba37ec2417865498ddec122a09cbd587eef1014':
  REPORT-74118 单元格数据源老模板切换到数据集数据并添加多分类,多分类不可修改
security/10.0
Bruce.Deng 2 years ago
parent
commit
2648899817
  1. 1
      designer-chart/src/main/java/com/fr/design/mainframe/chart/ChartEditPane.java
  2. 3
      designer-chart/src/main/java/com/fr/van/chart/designer/data/VanChartMoreCateTableDataContentPane.java

1
designer-chart/src/main/java/com/fr/design/mainframe/chart/ChartEditPane.java

@ -148,7 +148,6 @@ public class ChartEditPane extends BasicPane implements AttributeChange, Prepare
ChartInfoCollector.getInstance().updateChartPropertyTime(collection.getSelectedChartProvider(ChartProvider.class));
selectedPane.update(collection);
selectedPane.populate(collection);
if (!ComparatorUtils.equals(collection, lastCollection)) {
VanChart vanChart = collection.getSelectedChartProvider(VanChart.class);

3
designer-chart/src/main/java/com/fr/van/chart/designer/data/VanChartMoreCateTableDataContentPane.java

@ -22,13 +22,14 @@ public class VanChartMoreCateTableDataContentPane extends CategoryPlotMoreCateTa
@Override
public void populateBean(ChartCollection collection) {
super.populateBean(collection);
VanChartRectanglePlot plot = (VanChartRectanglePlot) collection.getSelectedChart().getPlot();
VanChartRectanglePlot plot = collection.getSelectedChart().getPlot();
isSupportMultiCategory = plot.isSupportMultiCategory();
checkBoxList(isSupportMultiCategory);
}
protected void updateMoreCate(NormalTableDataDefinition normal, Plot plot) {
super.updateMoreCate(normal, plot);
isSupportMultiCategory = ((VanChartRectanglePlot) plot).isSupportMultiCategory();
((VanChartPlot) plot).setCategoryNum(getBoxList().size() + 1);
if (!getBoxList().isEmpty()) {
plot.getDataSheet().setVisible(false);

Loading…
Cancel
Save