From eaa4de18931a875d2460e12ad073b1f12aa2d21f Mon Sep 17 00:00:00 2001
From: Hades <Hades@fanruan.com>
Date: Fri, 26 Jul 2019 14:00:45 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-19733=20=E6=9C=AA=E8=A3=85=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=9B=86=E6=8F=92=E4=BB=B6=E7=9A=84=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E5=99=A8=E8=BF=9C=E7=A8=8B=E8=AE=BE=E8=AE=A1=E6=97=B6=20?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=9C=8D=E5=8A=A1=E5=99=A8=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=9B=86=20=20=E7=82=B9=E5=87=BB=E7=A1=AE=E5=AE=9A=E4=BC=9A?=
 =?UTF-8?q?=E8=A6=86=E7=9B=96=E6=89=80=E6=9C=89=E6=9C=8D=E5=8A=A1=E5=99=A8?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E6=8F=92=E4=BB=B6=E6=95=B0=E6=8D=AE=E9=9B=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data/datapane/TableDataPaneListPane.java      | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataPaneListPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataPaneListPane.java
index 59880cc4ef..963238d228 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataPaneListPane.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataPaneListPane.java
@@ -22,7 +22,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -211,15 +210,19 @@ public class TableDataPaneListPane extends JListControlPane implements TableData
 
     @Override
     public void update(TableDataConfig tableDataConfig) {
-        tableDataConfig.removeAllTableData();
-        ProcedureConfig.getInstance().removeAllProcedure();
+        Iterator<String> tableDataNames =  tableDataConfig.getTableDatas().keySet().iterator();
+        while (tableDataNames.hasNext()) {
+            tableDataConfig.removeTableData(tableDataNames.next());
+        }
+        Iterator<String> procedureName = ProcedureConfig.getInstance().getProcedures().keySet().iterator();
+        while (procedureName.hasNext()) {
+            ProcedureConfig.getInstance().removeProcedure(procedureName.next());
+        }
         Nameable[] tableDataArray = this.update();
-        Map<String,TableData> tableDataMap = new LinkedHashMap<String,TableData>();
         for (int i = 0; i < tableDataArray.length; i++) {
             NameObject nameObject = (NameObject) tableDataArray[i];
-            tableDataMap.put(nameObject.getName(), (TableData) nameObject.getObject());
+            tableDataConfig.addTableData(nameObject.getName(), (TableData) nameObject.getObject());
         }
-        tableDataConfig.setTableDatas(tableDataMap);
     }
 
     @Override