From 940d684240e05d6638a1a42e1c95785397d2a67d Mon Sep 17 00:00:00 2001
From: lucian <author@corpmail.com>
Date: Wed, 20 Jan 2021 11:00:04 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-47258=20=E6=89=93=E5=BC=80=E5=A4=9A?=
 =?UTF-8?q?=E4=B8=AA=E6=A8=A1=E6=9D=BF=EF=BC=8C=E5=88=87=E6=8D=A2=E8=BF=9C?=
 =?UTF-8?q?=E7=A8=8B=E6=97=B6=E5=8F=B3=E4=BE=A7=E9=9D=A2=E6=9D=BF=E5=8F=AF?=
 =?UTF-8?q?=E8=83=BD=E5=87=BA=E7=8E=B0=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/mainframe/JTemplate.java    | 32 ++++++-------------
 1 file changed, 10 insertions(+), 22 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java b/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
index 2a1327920..483e74d9d 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
@@ -47,6 +47,7 @@ import com.fr.design.menu.MenuDef;
 import com.fr.design.menu.NameSeparator;
 import com.fr.design.menu.ShortCut;
 import com.fr.design.preview.PagePreview;
+import com.fr.design.ui.util.UIUtil;
 import com.fr.design.write.submit.DBManipulationInWidgetEventPane;
 import com.fr.design.write.submit.DBManipulationPane;
 import com.fr.event.EventDispatcher;
@@ -79,7 +80,6 @@ import javax.swing.BorderFactory;
 import javax.swing.Icon;
 import javax.swing.JComponent;
 import javax.swing.JOptionPane;
-import javax.swing.SwingWorker;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.undo.UndoManager;
 import java.util.ArrayList;
@@ -340,30 +340,18 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
 
     public void refreshResource(FILE file) {
 
-
-        new SwingWorker<Void, Void>() {
-
+        setTargetByFile(file);
+        UIUtil.invokeLaterIfNeeded(new Runnable() {
             @Override
-            protected Void doInBackground() throws Exception {
-                setTargetByFile(file);
-                return null;
-            }
+            public void run() {
+                // 先移除旧的。
+                removeCenterPane();
+                // 加入新的
+                addCenterPane();
 
-            @Override
-            public void done() {
-                try {
-                    get();
-                    // 先移除旧的。
-                    removeCenterPane();
-                    // 加入新的
-                    addCenterPane();
-
-                    refreshToolArea();
-                } catch (Exception e) {
-                    FineLoggerFactory.getLogger().error(e.getMessage(), e);
-                }
+                refreshToolArea();
             }
-        }.execute();
+        });
 
     }