From 02b949608e628de3f0b05e7ea7ee4217b9a12e4b Mon Sep 17 00:00:00 2001
From: Starryi <starryi@foxmail.com>
Date: Fri, 3 Sep 2021 17:42:34 +0800
Subject: [PATCH] =?UTF-8?q?CHART-20568=20[=E4=BA=A7=E5=93=81=E9=AA=8C?=
 =?UTF-8?q?=E6=94=B6]=E8=AE=BE=E8=AE=A1=E5=99=A8=E9=A2=84=E8=A7=88?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=9B=BE=E8=A1=A8=E7=BB=84=E4=BB=B6=E9=AC=BC?=
 =?UTF-8?q?=E7=95=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

【问题原因】
刷新页面触发了进入编辑模式的图表不停截图重绘，目前修复方式是与撤销回退的
一样的处理方式，退出图表编辑状态

【改动思路】
同上
---
 .../src/main/java/com/fr/design/mainframe/JForm.java | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

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 9d03edbc0..0d4fc318b 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);
     }