Merge remote-tracking branch 'origin/release/11.0' into release/11.0

designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataPane.java

@@ -65,6 +65,9 @@ public class EmbeddedTableDataPane extends AbstractTableDataPane<EmbeddedTableDa
 		dataJTable.setDefaultEditor(Date.class, new DateEditor(new UIDatePicker(UIDatePicker.STYLE_CN_DATE1)));
 		tableStructureChanged();
 
+		// 当前版本已经不会出现Float, 这里兜底一下防止报错
+		dataJTable.setDefaultRenderer(Float.class, new DoubleRenderer());
+
 		// 单击即可编辑
 		editbysingleclick(dataJTable, String.class);
 		editbysingleclick(dataJTable, Date.class);

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