From 60a4995b0fe2191c8156334e616358582a8a8cc0 Mon Sep 17 00:00:00 2001
From: Yvan <Yvan@fanruan.com>
Date: Mon, 12 Oct 2020 16:36:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=EF=BC=9A=E5=B0=86=E4=B8=A4?=
 =?UTF-8?q?=E4=B8=AASwingWorker=E5=90=88=E5=B9=B6=EF=BC=8C=E5=B0=86?=
 =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=8E=89=E7=9A=84=E4=BB=A3=E7=A0=81=E5=92=8C?=
 =?UTF-8?q?=E5=A4=9A=E4=BD=99=E7=9A=84=E9=80=BB=E8=BE=91=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wrapper/StoreProcedureDataWrapper.java        | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

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 495a814be..ff2265c8e 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
@@ -169,16 +169,6 @@ public final class StoreProcedureDataWrapper implements TableDataWrapper {
 	 */
     public void previewData(final int previewModel) {
         this.previewModel = previewModel;
-        new SwingWorker() {
-
-            protected Object doInBackground() throws Exception {
-                loadingBar.close();
-                PreviewTablePane.resetPreviewTable();
-                // REPORT-40822 这里的dialog是个空界面，这里设置成可见之后，后面又会设置成不可见，造成闪屏
-                //dialog.setVisible(true);
-                return null;
-            }
-        }.execute();
         connectionBar = new AutoProgressBar(dialog, Toolkit.i18nText("Fine-Design_Basic_Utils_Now_Create_Connection"), "", 0, 100) {
             public void doMonitorCanceled() {
                 connectionBar.close();
@@ -191,12 +181,12 @@ public final class StoreProcedureDataWrapper implements TableDataWrapper {
     private void setWorker() {
         worker = new SwingWorker<Void, Void>() {
             protected Void doInBackground() throws Exception {
+                loadingBar.close();
+                PreviewTablePane.resetPreviewTable();
                 connectionBar.start();
                 boolean status = DataOperator.getInstance().testConnection(((StoreProcedure) getTableData()).getDatabaseConnection());
                 if (!status) {
                     connectionBar.close();
-                    // bug 61345 预览失败时，关闭窗口
-                    dialog.setVisible(false);
                     throw new Exception(Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"));
                 }
                 connectionBar.close();
@@ -209,7 +199,6 @@ public final class StoreProcedureDataWrapper implements TableDataWrapper {
                 try {
                     get();
                     loadingBar.close();
-                    dialog.setVisible(false);
                     switch (previewModel) {
                         case StoreProcedureDataWrapper.PREVIEW_ALL:
                             PreviewTablePane.previewStoreDataWithAllDs(dataModels);