From ceb1fbc6ab55b80dad9e0cb17b5a3908664744b2 Mon Sep 17 00:00:00 2001
From: Yvan <Yvan@fanruan.com>
Date: Wed, 7 Sep 2022 11:49:02 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-79111=20=E6=95=B0=E6=8D=AE=E9=9B=86?=
 =?UTF-8?q?=E5=88=86=E7=BB=84=E6=8F=92=E4=BB=B6-=E5=AE=89=E8=A3=85?=
 =?UTF-8?q?=E4=B9=8B=E5=90=8E=EF=BC=8C=E5=A4=8D=E5=88=B6=E5=86=B3=E7=AD=96?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E7=9A=84=E6=8A=A5=E8=A1=A8=E5=9D=97=EF=BC=8C?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2=E6=97=A0=E6=B3=95=E4=B8=80?=
 =?UTF-8?q?=E8=B5=B7=E5=A4=8D=E5=88=B6=20=E3=80=90=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E5=8E=9F=E5=9B=A0=E3=80=91=E7=B2=98=E8=B4=B4=E7=9A=84=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E9=87=8C=E5=B0=86BasicTableDataTreePane=E5=BC=BA?=
 =?UTF-8?q?=E8=BD=AC=E6=88=90=E4=BA=86TableDataTreePane=EF=BC=8C=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E6=8F=92=E4=BB=B6=E9=87=8C=E5=AE=9E=E7=8E=B0=E7=9A=84?=
 =?UTF-8?q?BasicTableDataTreePane=E7=9A=84=E5=AD=90=E7=B1=BB=E5=AF=B9?=
 =?UTF-8?q?=E8=B1=A1=E5=BC=BA=E8=BD=AC=E5=A4=B1=E8=B4=A5=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=20=E3=80=90=E6=94=B9=E5=8A=A8=E6=80=9D=E8=B7=AF=E3=80=91?=
 =?UTF-8?q?=E5=88=A0=E6=8E=89=E5=BC=BA=E8=BD=AC=E7=9A=84=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=EF=BC=8C=E5=90=8E=E7=BB=AD=E7=9A=84=E8=B0=83=E7=94=A8=E4=B9=9F?=
 =?UTF-8?q?=E5=9D=87=E4=B8=BA=E6=8A=BD=E8=B1=A1=E7=B1=BB=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E6=8A=BD=E8=B1=A1=E6=96=B9=E6=B3=95=EF=BC=8C=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E4=BF=9D=E8=AF=81=E4=B8=8D=E5=BD=B1=E5=93=8D=E6=8F=92=E4=BB=B6?=
 =?UTF-8?q?=20=E3=80=90review=E5=BB=BA=E8=AE=AE=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data/tabledata/paste/TableDataFollowingPasteUtils.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/paste/TableDataFollowingPasteUtils.java b/designer-base/src/main/java/com/fr/design/data/tabledata/paste/TableDataFollowingPasteUtils.java
index 4c39e2854..b82423fe7 100644
--- a/designer-base/src/main/java/com/fr/design/data/tabledata/paste/TableDataFollowingPasteUtils.java
+++ b/designer-base/src/main/java/com/fr/design/data/tabledata/paste/TableDataFollowingPasteUtils.java
@@ -5,6 +5,7 @@ import com.fr.base.chart.BaseChartCollection;
 import com.fr.data.TableDataSource;
 import com.fr.data.impl.storeproc.StoreProcedure;
 import com.fr.design.DesignModelAdapter;
+import com.fr.design.data.BasicTableDataTreePane;
 import com.fr.design.data.DesignTableDataManager;
 import com.fr.design.data.datapane.TableDataTreePane;
 import com.fr.design.data.tabledata.tabledatapane.AbstractTableDataPane;
@@ -22,7 +23,6 @@ import com.fr.form.ui.DictionaryContainer;
 import com.fr.form.ui.ElementCaseEditor;
 import com.fr.form.ui.Widget;
 import com.fr.form.ui.concept.data.ValueInitializer;
-import com.fr.general.ComparatorUtils;
 import com.fr.log.FineLoggerFactory;
 import com.fr.report.cell.FloatElement;
 import com.fr.report.cell.tabledata.ElementUsedTableDataProvider;
@@ -57,7 +57,7 @@ public class TableDataFollowingPasteUtils {
         }
         // 获取当前的TableDataTreePane
         DesignModelAdapter<?, ?> currentModelAdapter = DesignModelAdapter.getCurrentModelAdapter();
-        TableDataTreePane tableDataTreePane = (TableDataTreePane) TableDataTreePane.getInstanceWithoutRefreshEverytime(currentModelAdapter);
+        BasicTableDataTreePane tableDataTreePane = TableDataTreePane.getInstanceWithoutRefreshEverytime(currentModelAdapter);
         // 粘贴（添加）数据集
         for (Map.Entry<String, TableData> dataWrapperEntry : tableDataWrapperMap.entrySet()) {
             String dsName = dataWrapperEntry.getKey();