Merge pull request #9399 in DESIGN/design from feature/10.0 to feature/big-screen

* commit '8db4df30a322b54c0f6c7324bb4e8ab49c5f6b7b':
  REPORT-74887 新建决策报表，拖入第三方插件图表无法编辑
  无JIRA任务 合final
  REPORT-74118 单元格数据源老模板切换到数据集数据并添加多分类，多分类不可修改
  REPORT-74118 单元格数据源老模板切换到数据集数据并添加多分类，多分类不可修改

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.design.ChartTypeInterfaceManager;
 import com.fr.design.beans.FurtherBasicBeanPane;
-import com.fr.design.data.DesignTableDataManager;
 import com.fr.design.data.tabledata.Prepare4DataSourceChange;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.chart.ChartEditPaneActionListener;
@@ -411,7 +410,7 @@ public class ChartEditPane extends BasicPane implements AttributeChange, Prepare
         this.addAncestorListener(new ManageDsListenerRegisterListener(new ChangeListener() {
             public void stateChanged(ChangeEvent e) {
                 AbstractChartAttrPane attrPane = paneList.get(tabsHeaderIconPane.getSelectedIndex());
-                if (attrPane.isShowing()) {
+                if (attrPane.isShowing() && collection != null) {
                     attrPane.refreshChartDataPane(collection);
                 }
             }

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);