diff --git a/designer-form/src/main/java/com/fr/design/mainframe/JForm.java b/designer-form/src/main/java/com/fr/design/mainframe/JForm.java
index 9d03edbc07..0d4fc318b2 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/JForm.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/JForm.java
@@ -1203,10 +1203,20 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm<F
         formDesign.refreshRoot();
         // 刷新界面后恢复原来的尺寸
         formDesign.getArea().setAreaSize(areaSize, horizontalValue, verticalValue, widthValue, heightValue, slideValue);
-        FormHierarchyTreePane.getInstance().refreshRoot();
         if (this.index != FORM_TAB) {
             refreshToolArea();
+        } else {
+            // CHART-20568: 当图表块处于编辑状态时，任何界面内容的修改都会导致其进行截图操作，进而引起设计器界面再次重绘，导致死循环，因而需要停止编辑 恢复浮层展示
+            TreePath[] treePaths = FormHierarchyTreePane.getInstance(formDesign).getComponentTree().getSelectedTreePath();
+            if (treePaths != null) {
+                for (TreePath path : treePaths) {
+                    if (path != null) {
+                        formDesign.stopEditing(path);
+                    }
+                }
+            }
         }
+        FormHierarchyTreePane.getInstance().refreshRoot();
 
         super.setTemplateTheme(newTheme, compatible);
     }