From 074d3b435a45bbe0a641feb2b770d8006248a103 Mon Sep 17 00:00:00 2001
From: Starryi <starryi@foxmail.com>
Date: Tue, 14 Sep 2021 16:16:58 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-57551=20=E8=AE=BE=E8=AE=A1=E5=99=A8?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=EF=BC=8C=E8=87=AA=E9=80=82=E5=BA=94=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80=E4=B8=8Bbody=E8=83=8C=E6=99=AF=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E4=BB=A5=E5=90=8E=EF=BC=8C=E7=94=BB=E5=B8=83=E4=B8=AD=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E5=AE=9E=E6=97=B6=E6=98=BE=E7=A4=BA=E8=83=8C=E6=99=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

【问题原因】
body布局切换时，除了要重新设置body widget样式数据模型，还要
刷新样式预览效果

【改动思路】
同标题
---
 .../layout/FRAbsoluteBodyLayoutDefinePane.java        |  1 +
 .../ui/designer/layout/FRFitLayoutDefinePane.java     | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRAbsoluteBodyLayoutDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRAbsoluteBodyLayoutDefinePane.java
index 442d872ebe..bc8dc9be03 100644
--- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRAbsoluteBodyLayoutDefinePane.java
+++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRAbsoluteBodyLayoutDefinePane.java
@@ -181,6 +181,7 @@ public class FRAbsoluteBodyLayoutDefinePane extends FRAbsoluteLayoutDefinePane {
                     wFitLayout.setBorderStyle(layout.getBorderStyle());
                 }
                 copyLayoutAttr(layout, xwFitLayout.toData());
+                xwFitLayout.refreshStylePreviewEffect();
             }
         }
         layout.setBorderStyleFollowingTheme(themePane.isFollowingTheme());
diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java
index 306b62246a..24cf56b18b 100644
--- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java
+++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java
@@ -42,6 +42,7 @@ import com.fr.log.FineLoggerFactory;
 import com.fr.report.core.ReportUtils;
 
 import javax.swing.*;
+import javax.swing.border.Border;
 import java.awt.*;
 
 /**
@@ -243,6 +244,16 @@ public class FRFitLayoutDefinePane extends AbstractFRLayoutDefinePane<WFitLayout
                 FormDesigner formDesigner = WidgetPropertyPane.getInstance().getEditingFormDesigner();
                 formDesigner.getSelectionModel().setSelectedCreators(
                         FormSelectionUtils.rebuildSelection(xWFitLayout, new Widget[]{wAbsoluteBodyLayout}));
+
+                if (xwAbsoluteBodyLayout.toData() != null) {
+                    xwAbsoluteBodyLayout.toData().setBorderStyleFollowingTheme(wAbsoluteBodyLayout.isBorderStyleFollowingTheme());
+                    xwAbsoluteBodyLayout.toData().setBorderStyle(wAbsoluteBodyLayout.getBorderStyle());
+                }
+                xwAbsoluteBodyLayout.refreshStylePreviewEffect();
+                if (xWFitLayout.toData() != null) {
+                    xWFitLayout.toData().resetStyle();
+                }
+                xWFitLayout.refreshStylePreviewEffect();
             }
         } catch (Exception e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);