From 7f72ebf63850f8ebc50098547917b6e7303dce5f Mon Sep 17 00:00:00 2001
From: Yvan <Yvan@fanruan.com>
Date: Tue, 27 Oct 2020 09:39:02 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-41855=20=E3=80=90=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E5=99=A8=E3=80=91=E4=BF=9D=E7=95=99=E5=B8=83=E5=B1=80=E4=B8=8B?=
 =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E4=BF=AE=E6=94=B9=E9=80=89=E4=B8=AD=E5=85=A8?=
 =?UTF-8?q?=E5=B1=8F=E8=AE=BE=E7=BD=AE=E6=95=88=E6=9E=9C=EF=BC=8C=E8=AE=BE?=
 =?UTF-8?q?=E8=AE=A1=E5=99=A8=E7=9A=84=E4=BF=9D=E5=AD=98=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E4=BE=9D=E7=84=B6=E7=BD=AE=E7=81=B0=20=E3=80=90=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E5=8E=9F=E5=9B=A0=E3=80=91=E5=9C=A8=E4=B8=8D=E5=8B=BE?=
 =?UTF-8?q?=E9=80=89body=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=B1=9E=E6=80=A7-?=
 =?UTF-8?q?=E6=89=8B=E6=9C=BA=E9=87=8D=E5=B8=83=E5=B1=80=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=A6=82=E6=9E=9C=E4=BF=AE=E6=94=B9body=E5=86=85=E7=9A=84?=
 =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E5=9D=97=E7=9A=84=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=EF=BC=8C=E4=BC=9A=E9=80=A0=E6=88=90=E8=BF=99?=
 =?UTF-8?q?=E8=BE=B9=E7=9A=84npe=EF=BC=8C=E4=BD=93=E7=8E=B0=E5=9C=A8?=
 =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E5=99=A8=E4=B8=AD=E5=B0=B1=E6=98=AF=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E6=8C=89=E9=92=AE=E4=B8=8D=E8=A2=AB=E8=A7=A6=E5=8F=91?=
 =?UTF-8?q?=20=E3=80=90=E6=94=B9=E5=8A=A8=E6=80=9D=E8=B7=AF=E3=80=91?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0npe=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/designer/mobile/ChartEditorDefinePane.java     | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ChartEditorDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ChartEditorDefinePane.java
index 69e438401..7e3795fb5 100644
--- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ChartEditorDefinePane.java
+++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ChartEditorDefinePane.java
@@ -228,10 +228,13 @@ public class ChartEditorDefinePane extends MobileWidgetDefinePane {
             mobileAttr.setAllowFullScreen(allowFullCheckBox.isSelected());
             mobileAttr.setFunctionalWhenUnactivated(!functionalWhenUnactivatedCheckBox.isSelected());
         }
-        MobileCollapsedStyle style = this.mobileCollapsedStyleEditor.getStyle();
-        if (style != null) {
-            ((ChartEditor) xCreator.toData()).setMobileCollapsedStyle(style);
-            style.setCollapsedWork(this.mobileCollapsedStyleEditor.isSelectedCustom() && !FormDesignerUtils.isInAbsoluteLayout(xCreator));
+        // 在不勾选body移动端属性-手机重布局时，如果修改body内的图表块的移动端属性，会造成这边的npe，因此加个判断
+        if (this.mobileCollapsedStyleEditor != null) {
+            MobileCollapsedStyle style = this.mobileCollapsedStyleEditor.getStyle();
+            if (style != null) {
+                ((ChartEditor) xCreator.toData()).setMobileCollapsedStyle(style);
+                style.setCollapsedWork(this.mobileCollapsedStyleEditor.isSelectedCustom() && !FormDesignerUtils.isInAbsoluteLayout(xCreator));
+            }
         }
         DesignerContext.getDesignerFrame().getSelectedJTemplate().fireTargetModified(); // 触发设计器保存按钮亮起来
     }