From 414415bcf1a367dad750fee72ca39b9dc703f127 Mon Sep 17 00:00:00 2001
From: "Henry.Wang" <Henry.Wang@fanruan.com>
Date: Mon, 13 Sep 2021 10:54:24 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-58626=20=E6=96=B0=E8=87=AA=E9=80=82?=
 =?UTF-8?q?=E5=BA=94-=E6=8A=A5=E8=A1=A8=E5=9D=97-=E6=97=A7=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E8=AE=BE=E4=B8=BA=E6=A8=AA=E5=90=91=E8=87=AA=E9=80=82?=
 =?UTF-8?q?=E5=BA=94=EF=BC=8C=E5=88=87=E6=8D=A2=E6=88=90=E6=96=B0=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E5=90=8E=E5=9B=BE=E7=89=87=E8=83=8C=E6=99=AF=E4=B8=8D?=
 =?UTF-8?q?=E8=A7=81=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/designer/creator/XElementCase.java |  8 ++++++-
 .../fr/design/mainframe/FormSelection.java    | 21 -------------------
 2 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XElementCase.java b/designer-form/src/main/java/com/fr/design/designer/creator/XElementCase.java
index 220fddff5..8df20d405 100644
--- a/designer-form/src/main/java/com/fr/design/designer/creator/XElementCase.java
+++ b/designer-form/src/main/java/com/fr/design/designer/creator/XElementCase.java
@@ -33,7 +33,7 @@ import java.beans.IntrospectionException;
 import java.beans.PropertyDescriptor;
 import java.util.Set;
 
-public class XElementCase extends XBorderStyleWidgetCreator implements FormElementCaseContainerProvider , Releasable {
+public class XElementCase extends XBorderStyleWidgetCreator implements FormElementCaseContainerProvider, Releasable {
     private UILabel imageLable;
     private FormDesigner designer;
     private static BufferedImage DEFAULT_BACKGROUND;
@@ -269,6 +269,12 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
         return toData().getElementCase();
     }
 
+    @Override
+    public void doLayout() {
+        super.doLayout();
+        this.updateECImage();
+    }
+
     public String getElementCaseContainerName() {
         return toData().getWidgetName();
     }
diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormSelection.java b/designer-form/src/main/java/com/fr/design/mainframe/FormSelection.java
index c25d99b1a..308eba774 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/FormSelection.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/FormSelection.java
@@ -294,7 +294,6 @@ public class FormSelection {
                     creator.setBackupBound(backupBounds);
                 }
                 layoutAdapter.fix(creator);
-                resetElementCaseImage(creator);
             }
             i++;
         }
@@ -322,26 +321,6 @@ public class FormSelection {
         return false;
     }
 
-    /**
-     * @Description 重置报表块缩略图
-     * @param: creator
-     * @return void
-     * @Author Henry.Wang
-     * @Date 2021/5/21 14:59
-     **/
-    public void resetElementCaseImage(XCreator creator) {
-        if (creator instanceof XWTitleLayout) {
-            XWTitleLayout xwTitleLayout = (XWTitleLayout) creator;
-            for (int i = 0; i < xwTitleLayout.getComponentCount(); i++) {
-                Component component = xwTitleLayout.getComponent(i);
-                if (component instanceof XElementCase) {
-                    XElementCase xElementCase = (XElementCase) component;
-                    xElementCase.updateECImage();
-                }
-            }
-        }
-    }
-
     /**
      * 检查下有没有参数面板，如果存在，处理下参数面板造成的偏移量
      * @param rectangle