Browse Source

Merge pull request #9456 in DESIGN/design from release/10.0 to final/10.0

* commit 'c56f51a73ac7f6269b3d86c35e1941dd3be8d2ce':
  REPORT-74118 单元格数据源老模板切换到数据集数据并添加多分类,多分类不可修改
  REPORT-74118 单元格数据源老模板切换到数据集数据并添加多分类,多分类不可修改
  REPORT-74603 嵌入式数据库的限制访问
superman 2 years ago
parent
commit
97b89e58d8
  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

@ -7,7 +7,6 @@ import com.fr.chartx.attr.ChartProvider;
import com.fr.common.listener.ManageDsListenerRegisterListener; import com.fr.common.listener.ManageDsListenerRegisterListener;
import com.fr.design.ChartTypeInterfaceManager; import com.fr.design.ChartTypeInterfaceManager;
import com.fr.design.beans.FurtherBasicBeanPane; import com.fr.design.beans.FurtherBasicBeanPane;
import com.fr.design.data.DesignTableDataManager;
import com.fr.design.data.tabledata.Prepare4DataSourceChange; import com.fr.design.data.tabledata.Prepare4DataSourceChange;
import com.fr.design.dialog.BasicPane; import com.fr.design.dialog.BasicPane;
import com.fr.design.gui.chart.ChartEditPaneActionListener; import com.fr.design.gui.chart.ChartEditPaneActionListener;

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

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

Loading…
Cancel
Save