From cb91ff9c60a0a16febe8d27950d0f050d435e183 Mon Sep 17 00:00:00 2001
From: Yann <Yann@fanruan.com>
Date: Thu, 7 Jul 2022 14:57:18 +0800
Subject: [PATCH 1/2] =?UTF-8?q?REPORT-74775=20=E3=80=90=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E5=99=A8=E3=80=91=E5=86=85=E7=BD=AE=E6=95=B0=E6=8D=AE=E9=9B=86?=
 =?UTF-8?q?=E9=A2=84=E8=A7=88=E6=95=B0=E6=8D=AE=EF=BC=8C=E5=A4=9A=E5=88=97?=
 =?UTF-8?q?=E6=83=85=E5=86=B5=EF=BC=8C=E6=98=BE=E7=A4=BA=E6=9C=89=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data/tabledata/tabledatapane/EmbeddedTableDataPane.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataPane.java
index 8b47b222d6..731816243e 100644
--- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataPane.java
+++ b/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);

From 8d441237c0a33e291fba097752e0a7e3cab9285e Mon Sep 17 00:00:00 2001
From: "Bruce.Deng" <bruce.deng@fanruan.com>
Date: Fri, 8 Jul 2022 10:10:17 +0800
Subject: [PATCH 2/2] =?UTF-8?q?REPORT-74118=20=E5=8D=95=E5=85=83=E6=A0=BC?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E8=80=81=E6=A8=A1=E6=9D=BF=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E5=88=B0=E6=95=B0=E6=8D=AE=E9=9B=86=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=B9=B6=E6=B7=BB=E5=8A=A0=E5=A4=9A=E5=88=86=E7=B1=BB=EF=BC=8C?=
 =?UTF-8?q?=E5=A4=9A=E5=88=86=E7=B1=BB=E4=B8=8D=E5=8F=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../designer/data/VanChartMoreCateTableDataContentPane.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/data/VanChartMoreCateTableDataContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/data/VanChartMoreCateTableDataContentPane.java
index dcf160aec1..4d9f0aa61f 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/data/VanChartMoreCateTableDataContentPane.java
+++ b/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);