From 9dcb81b4a8317cd69139b5ec234411ab741a04da Mon Sep 17 00:00:00 2001
From: hades <hades@fanraun.com>
Date: Wed, 14 Apr 2021 17:10:18 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-50096=20=E5=A4=84=E7=90=86=E4=B8=8B?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E6=95=B0=E6=8D=AE=E8=BF=9E=E6=8E=A5=E5=9C=BA?=
 =?UTF-8?q?=E6=99=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 94a612b66..c47a0d75c 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
@@ -100,6 +100,7 @@ public class JDBCDefPane extends JPanel {
     private IntegerEditor DBCP_MINEVICTABLEIDLETIMEMILLIS = new IntegerEditor();
 
     private JDBCDatabaseConnection jdbcDatabase;
+    private boolean needRefresh = true;
 
     public JDBCDefPane() {
         this.setBorder(UITitledBorder.createBorderWithTitle("JDBC" + ":"));
@@ -201,11 +202,11 @@ public class JDBCDefPane extends JPanel {
     }
 
     public void populate(JDBCDatabaseConnection jdbcDatabase) {
+        needRefresh = false;
         if (jdbcDatabase == null) {
             jdbcDatabase = new JDBCDatabaseConnection();
         }
         this.jdbcDatabase = jdbcDatabase;
-        this.dbtypeComboBox.removeActionListener(dbtypeActionListener);
         if (ComparatorUtils.equals(jdbcDatabase.getDriver(), "sun.jdbc.odbc.JdbcOdbcDriver")
                 && jdbcDatabase.getURL().startsWith("jdbc:odbc:Driver={Microsoft")) {
             this.dbtypeComboBox.setSelectedItem("Access");
@@ -230,7 +231,6 @@ public class JDBCDefPane extends JPanel {
                 this.dbtypeComboBox.setSelectedItem(OTHER_DB);
             }
         }
-        this.dbtypeComboBox.addActionListener(dbtypeActionListener);
         this.driverComboBox.setSelectedItem(jdbcDatabase.getDriver());
         this.urlTextField.setText(jdbcDatabase.getURL());
         this.userNameTextField.setText(jdbcDatabase.getUser());
@@ -254,6 +254,7 @@ public class JDBCDefPane extends JPanel {
         this.DBCP_MINEVICTABLEIDLETIMEMILLIS.setValue(dbcpAttr.getMinEvictableIdleTimeMillis() / TIME_MULTIPLE);
         this.DBCP_NUMTESTSPEREVICTIONRUN.setValue(dbcpAttr.getNumTestsPerEvictionRun());
         this.DBCP_TIMEBETWEENEVICTIONRUNSMILLS.setValue(dbcpAttr.getTimeBetweenEvictionRunsMillis());
+        needRefresh = true;
     }
 
     public JDBCDatabaseConnection update() {
@@ -306,7 +307,9 @@ public class JDBCDefPane extends JPanel {
                 }
             }
             // 更改数据库类型后 数据库名称置空和之前逻辑保持一致
-            jdbcDatabase.setDatabase(StringUtils.EMPTY);
+            if (needRefresh) {
+                jdbcDatabase.setDatabase(StringUtils.EMPTY);
+            }
         }
     };