From d9f483da7d23d9a976112b2c4aab5a227d71e09b Mon Sep 17 00:00:00 2001
From: hades <hades@fanraun.com>
Date: Thu, 26 Dec 2019 14:22:49 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-24604=20=E8=A1=A8=E5=8D=95=E6=8B=96?=
 =?UTF-8?q?=E5=8A=A8=E5=9B=BE=E8=A1=A8=E4=B8=8E=E7=94=BB=E5=B8=83=E5=9D=97?=
 =?UTF-8?q?=E4=BA=A4=E5=8F=89=E8=AE=BE=E8=AE=A1=E5=99=A8=E5=8D=A1=E6=AD=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/mainframe/FormDesignerUI.java   | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormDesignerUI.java b/designer-form/src/main/java/com/fr/design/mainframe/FormDesignerUI.java
index 6e8419f72..7c2b67352 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/FormDesignerUI.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/FormDesignerUI.java
@@ -23,8 +23,7 @@ import com.fr.page.WatermarkPainter;
 import com.fr.report.core.ReportUtils;
 import com.fr.stable.ArrayUtils;
 
-import javax.swing.JComponent;
-import javax.swing.SwingUtilities;
+import javax.swing.*;
 import javax.swing.plaf.ComponentUI;
 import java.awt.AlphaComposite;
 import java.awt.Component;
@@ -65,7 +64,7 @@ public class FormDesignerUI extends ComponentUI {
      * @param c 组件
      */
     @Override
-    public void paint(Graphics g, JComponent c) {
+    public void paint(final Graphics g, JComponent c) {
         XCreator rootComponent = designer.getRootComponent();
         this.time = (float)designer.getResolution()/ScreenResolution.getScreenResolution();
         if (rootComponent != null) {
@@ -101,8 +100,14 @@ public class FormDesignerUI extends ComponentUI {
         if (designer.getPainter() != null) {
             // ComponentAdapter和LayoutAdapter提供的额外的Painter，该Painter一般用于提示作用，
             // 相当于一个浮动层, 要考虑参数面板的高度
-            designer.getPainter().paint(g, designer.getArea().getHorizontalValue(),
-                    designer.getArea().getVerticalValue() + designer.getParaHeight());
+            new SwingWorker<Void, Void>() {
+                @Override
+                protected Void doInBackground() throws Exception {
+                    designer.getPainter().paint(g, designer.getArea().getHorizontalValue(),
+                                                designer.getArea().getVerticalValue() + designer.getParaHeight());
+                    return null;
+                }
+            }.execute();
         }
         AddingModel addingModel = designer.getAddingModel();