From 8398ef77a9db992a57f71ddf3017c7bf23800827 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Levy=2EXie-=E8=A7=A3=E5=AE=89=E6=A3=AE?= Date: Wed, 18 Dec 2024 19:44:59 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-143955=20fix:=E8=BF=9B=E5=BA=A6=E6=9D=A1?= =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/tabledata/wrapper/MultiResultTableDataWrapper.java | 3 ++- .../data/tabledata/wrapper/StoreProcedureDataWrapper.java | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/MultiResultTableDataWrapper.java b/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/MultiResultTableDataWrapper.java index 09d7882438..52a28be631 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/MultiResultTableDataWrapper.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/MultiResultTableDataWrapper.java @@ -14,6 +14,7 @@ import com.fr.design.gui.iprogressbar.AutoProgressBar; import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode; import com.fr.design.i18n.Toolkit; import com.fr.design.mainframe.DesignerContext; +import com.fr.design.ui.util.UIUtil; import com.fr.general.ComparatorUtils; import com.fr.log.FineLoggerFactory; import com.fr.workspace.server.repository.connection.ConnectionRepository; @@ -200,7 +201,7 @@ public final class MultiResultTableDataWrapper implements TableDataWrapper { FineLoggerFactory.getLogger().error(e.getMessage(), e); throw new Exception(Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed")); } finally { - connectionBar.close(); + UIUtil.invokeLaterIfNeeded(() -> connectionBar.close()); } } diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/StoreProcedureDataWrapper.java b/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/StoreProcedureDataWrapper.java index e6d93a3d43..57709259bc 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/StoreProcedureDataWrapper.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/StoreProcedureDataWrapper.java @@ -13,6 +13,7 @@ import com.fr.design.gui.iprogressbar.AutoProgressBar; import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode; import com.fr.design.i18n.Toolkit; import com.fr.design.mainframe.DesignerContext; +import com.fr.design.ui.util.UIUtil; import com.fr.general.ComparatorUtils; import com.fr.log.FineLoggerFactory; import com.fr.workspace.server.entity.connection.ConnectionBean; @@ -185,10 +186,10 @@ public final class StoreProcedureDataWrapper implements TableDataWrapper { ConnectionRepository.getInstance().testConnection(ConnectionInfoBeanHelper.createConnectionInfoBean(((StoreProcedure) getTableData()).getDatabaseConnection())); } catch (Exception e) { FineLoggerFactory.getLogger().error(e.getMessage(), e); - connectionBar.close(); throw new Exception(Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed")); + } finally { + UIUtil.invokeLaterIfNeeded(() -> connectionBar.close()); } - connectionBar.close(); storeProcedure.resetDataModelList(); createStore(true); return null;