Browse Source

Pull request #3924: REPORT-50096 数据填充时不需要触发监听

Merge in DESIGN/design from ~HADES/design:bugfix/10.0 to bugfix/10.0

* commit '2d4a7c8bcb1d6455048e3f9b7b182fac8e49e5f6':
  REPORT-50096 数据填充时不需要触发监听
bugfix/10.0
Hades 4 years ago
parent
commit
6500b45045
  1. 2
      designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java

2
designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java

@ -205,6 +205,7 @@ public class JDBCDefPane extends JPanel {
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");
@ -229,6 +230,7 @@ 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());

Loading…
Cancel
Save