Browse Source

Pull request #10147: REPORT-80922 远程设计下存储过程测试连接的弹窗没有关闭

Merge in DESIGN/design from ~RINOUX/design:final/11.0 to final/11.0

* commit '24a86f5afe090da1ae199732d7a4d7963b47dd54':
  REPORT-80922 远程设计下存储过程结果加载状态NPE
new-design
rinoux-杨锐 2 years ago
parent
commit
35e3d28c7a
  1. 12
      designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/MultiResultTableDataWrapper.java

12
designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/MultiResultTableDataWrapper.java

@ -187,18 +187,20 @@ public final class MultiResultTableDataWrapper implements TableDataWrapper {
protected Void doInBackground() throws Exception { protected Void doInBackground() throws Exception {
loadingBar.close(); loadingBar.close();
PreviewTablePane.resetPreviewTable(); PreviewTablePane.resetPreviewTable();
connectionBar.start();
// 存储过程需要先测试一下连接 // 存储过程需要先测试一下连接
if (tableData instanceof StoreProcedure) { if (tableData instanceof StoreProcedure) {
boolean status = DataOperator.getInstance().testConnection(((StoreProcedure) getTableData()).getDatabaseConnection()); try {
if (!status) { connectionBar.start();
connectionBar.close(); boolean success = DataOperator.getInstance().testConnection(((StoreProcedure) getTableData()).getDatabaseConnection());
if (!success) {
throw new Exception(Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed")); throw new Exception(Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"));
} }
} finally {
connectionBar.close();
}
} }
connectionBar.close();
tableData.resetDataModelList(); tableData.resetDataModelList();
// 获取结果 // 获取结果

Loading…
Cancel
Save