From 82fa6142d1235ef52dd8d0b9c6abc3e695caa81b Mon Sep 17 00:00:00 2001
From: hades <hades@fanraun.com>
Date: Wed, 7 Apr 2021 17:36:21 +0800
Subject: [PATCH 1/3] =?UTF-8?q?REPORT-50096=20=E5=9C=A8=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E5=99=A8=E4=B8=AD=E6=9B=B4=E6=94=B9=E6=95=B0=E6=8D=AE=E5=BA=93?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=90=8E=20=E6=95=B0=E6=8D=AE=E5=BA=93?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=AD=97=E6=AE=B5=E6=93=8D=E4=BD=9C=E5=92=8C?=
 =?UTF-8?q?=E4=B9=8B=E5=89=8D=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/fr/design/data/datapane/connect/JDBCDefPane.java   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java
index 4d2003144..20187bd50 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java
@@ -303,6 +303,8 @@ public class JDBCDefPane extends JPanel {
                     urlTextField.setText(dus[i].getURL());
                 }
             }
+            // 更改数据库类型后 数据库名称置空和之前逻辑保持一致
+            jdbcDatabase.setDatabase(StringUtils.EMPTY);
         }
     };
 

From 5fb883b5a2aa2b73f00fbc23a453dabcd3b59b80 Mon Sep 17 00:00:00 2001
From: hades <hades@fanraun.com>
Date: Thu, 8 Apr 2021 11:06:47 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=20REPORT-50788=20=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E6=9B=B4=E6=96=B0=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/fr/design/DesignModelAdapter.java | 18 ++++++++++++++++++
 .../design/actions/TableDataSourceAction.java  |  1 +
 2 files changed, 19 insertions(+)

diff --git a/designer-base/src/main/java/com/fr/design/DesignModelAdapter.java b/designer-base/src/main/java/com/fr/design/DesignModelAdapter.java
index 73d82f862..7a237ffb5 100644
--- a/designer-base/src/main/java/com/fr/design/DesignModelAdapter.java
+++ b/designer-base/src/main/java/com/fr/design/DesignModelAdapter.java
@@ -21,6 +21,8 @@ import com.fr.stable.StringUtils;
 import com.fr.stable.js.WidgetName;
 
 import com.fr.util.ParameterApplyHelper;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -338,6 +340,22 @@ public abstract class DesignModelAdapter<T extends BaseBook, S extends JTemplate
         }
     }
 
+    public void removeTableDataParameters(String tdName) {
+        ParameterProvider[] tableDataParameters =  tableDataParametersMap.remove(tdName);
+        List<Parameter> allParameterList = new ArrayList<>(Arrays.asList(parameters));
+        List<Parameter> tableDataParameterList = new ArrayList<>();
+        for (ParameterProvider parameterProvider : tableDataParameters) {
+            tableDataParameterList.add((Parameter) parameterProvider);
+        }
+        allParameterList.removeAll(tableDataParameterList);
+        parameters = allParameterList.toArray(new Parameter[0]);
+    }
+
+
+    public void updateAllParameters() {
+        parameters = getLatestParameters();
+    }
+
     protected void addGlobalParameters(Map<String, ParameterProvider> map) {
         // 添加全局参数
         Parameter[] glbParas = ParameterConfig.getInstance().getGlobalParameters();
diff --git a/designer-base/src/main/java/com/fr/design/actions/TableDataSourceAction.java b/designer-base/src/main/java/com/fr/design/actions/TableDataSourceAction.java
index 2903b12a1..8a6e7a7df 100644
--- a/designer-base/src/main/java/com/fr/design/actions/TableDataSourceAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/TableDataSourceAction.java
@@ -60,6 +60,7 @@ public class TableDataSourceAction extends TemplateComponentAction<JTemplate<?,
                 TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter());
                 TableDataSourceAction.this.getEditingComponent().fireTargetModified();
                 fireDSChanged(tableDataPane.getDsNameChangedMap());
+                DesignModelAdapter.getCurrentModelAdapter().updateAllParameters();
             }
         });
         reportTableDataDialog.setVisible(true);

From 413279dd3acfbf9ea12161ce8b2948fb3279686d Mon Sep 17 00:00:00 2001
From: hades <hades@fanraun.com>
Date: Thu, 8 Apr 2021 11:34:54 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=20REPORT-50788=20=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E6=9B=B4=E6=96=B0=E7=BC=93=E5=AD=98?=
 =?UTF-8?q?=20=E6=BC=8F=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/fr/design/data/datapane/TableDataTreePane.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java
index 2356de6d4..230bf8a47 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java
@@ -288,6 +288,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {
                 fireDSChanged();
                 checkButtonEnabled();
                 DesignTableDataManager.removeSelectedColumnNames(selectedNO.getName());
+                DesignModelAdapter.getCurrentModelAdapter().removeTableDataParameters(selectedNO.getName());
             }
         }
     }