diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartRichEditorPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartRichEditorPane.java
index 408b730b2..622d2a0ee 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartRichEditorPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartRichEditorPane.java
@@ -38,6 +38,7 @@ public class VanChartRichEditorPane {
                 .prepare(new ScriptContextAdapter() {
                     public void onScriptContextCreated(ScriptContextEvent event) {
                         browser = event.getBrowser();
+                        browser.getCacheStorage().clearCache();
 
                         JSValue ns = browser.executeJavaScriptAndReturnValue("window." + namespace);
                         ns.asObject().setProperty(variable, model);
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 6d8d16679..371fcde7a 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(); // 触发设计器保存按钮亮起来
     }