From bd2e2eec65a75bfdde2f9c571412075b2d86a65b Mon Sep 17 00:00:00 2001
From: hades <hades@fanraun.com>
Date: Mon, 11 Jan 2021 20:42:46 +0800
Subject: [PATCH 1/2] =?UTF-8?q?CHART-17822=20=E8=AE=BE=E8=AE=A1=E5=99=A8?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=86=85=E7=9A=84=E5=9B=BE=E5=BD=A2=E4=B8=8D?=
 =?UTF-8?q?=E5=B0=8F=E5=BF=83=E5=88=87=E6=8D=A2=E5=88=B0=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?=E5=9B=BE=E5=BD=A2=E4=B8=94=E4=B8=8D=E4=BF=9D=E5=AD=98=EF=BC=8C?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=92=A4=E9=94=80=E9=94=AE=E6=B2=A1=E6=B3=95?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=88=B0=E5=88=87=E6=8D=A2=E5=89=8D=E7=9A=84?=
 =?UTF-8?q?=E5=9B=BE=E5=BD=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/fr/design/mainframe/JForm.java        | 6 ++++++
 1 file changed, 6 insertions(+)

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 b39dc91889..844649d40d 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
@@ -97,6 +97,7 @@ import java.awt.image.BufferedImage;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import javax.swing.tree.TreePath;
 
 public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm<Form> {
     private static final String FORM_CARD = "FORM";
@@ -623,6 +624,11 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm<F
                 this.formDesign.getSelectionModel().setSelectedCreators(FormSelectionUtils.rebuildSelection(formDesign.getRootComponent(),
                         formDesign.getRootComponent() == selectedBodyLayout() ? u.getSelectWidgets() : new Widget[]{selectedBodyLayout().toData()}));
                 refreshToolArea();
+                // 停止编辑 恢复浮层展示
+                TreePath[] treePaths = FormHierarchyTreePane.getInstance(formDesign).getComponentTree().getSelectedTreePath();
+                for (TreePath path : treePaths) {
+                    formDesign.stopEditing(path);
+                }
             } else {
                 // 只在报表块里撤销是不需要修改外部form对象的, 因为编辑的是当前报表块.
                 // 修改了JForm的Target需要同步修改formDesign的Target.

From e99e80634da5fca18139282df2d1aa3131525bfe Mon Sep 17 00:00:00 2001
From: hades <hades@fanraun.com>
Date: Tue, 12 Jan 2021 09:52:20 +0800
Subject: [PATCH 2/2] =?UTF-8?q?REPORT-45689=20=E5=8A=A0=E4=B8=8A=E5=88=A4?=
 =?UTF-8?q?=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/fr/design/mainframe/JForm.java      | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

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 844649d40d..d39de1d447 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
@@ -626,8 +626,12 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm<F
                 refreshToolArea();
                 // 停止编辑 恢复浮层展示
                 TreePath[] treePaths = FormHierarchyTreePane.getInstance(formDesign).getComponentTree().getSelectedTreePath();
-                for (TreePath path : treePaths) {
-                    formDesign.stopEditing(path);
+                if (treePaths != null) {
+                    for (TreePath path : treePaths) {
+                        if (path != null) {
+                            formDesign.stopEditing(path);
+                        }
+                    }
                 }
             } else {
                 // 只在报表块里撤销是不需要修改外部form对象的, 因为编辑的是当前报表块.