Pull request #14438: REPORT-114392 FR-FBP版本本地设计适配 适配数据连接

Merge in DESIGN/design from ~DESTINY.LIN/design:fbp-1.0 to fbp-1.0

* commit '300e65e22e4f93afaaf30d31a6e11ef5aedc3cf9':
  REPORT-114392 FR-FBP版本本地设计适配 适配数据连接

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

@@ -334,7 +334,7 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh
     }
 
 
-    private void alterConnections(List<ConnectionInfoBean> addConnections, List<String> removedConnNames, List<ConnectionInfoBean> updateConnection) {
+    private void alterConnections(List<ConnectionInfoBean> addConnections, List<String> removedConnNames, List<ConnectionInfoBean> updateConnection) throws Exception {
 
         try {
             for (ConnectionInfoBean bean : addConnections) {
@@ -352,6 +352,7 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh
             }
         } catch (Exception e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
+            throw e;
         }
     }
 

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

@@ -451,8 +451,8 @@ public class JDBCDefPane extends JPanel {
         jdbcDatabase.setPassword(new String(this.passwordTextField.getPassword()).trim());
         jdbcDatabase.setOriginalCharsetName(this.originalCharSet);
         if (this.charSetComboBox.getSelectedIndex() == 0) {
-            jdbcDatabase.setNewCharsetName(StringUtils.EMPTY);
-            jdbcDatabase.setOriginalCharsetName(StringUtils.EMPTY);
+            jdbcDatabase.setNewCharsetName(null);
+            jdbcDatabase.setOriginalCharsetName(null);
         } else {
             jdbcDatabase.setNewCharsetName(EncodeConstants.ENCODING_GBK);
             jdbcDatabase.setOriginalCharsetName(((String) this.charSetComboBox.getSelectedItem()));