From 0ec9b2839174743d3a1f1e8cd526af4371707652 Mon Sep 17 00:00:00 2001
From: Starryi <starryi@foxmail.com>
Date: Thu, 1 Jul 2021 11:00:22 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-54123=20=E8=AE=BE=E8=AE=A1=E5=99=A8?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=9D=97=E7=BB=84=E4=BB=B6=E8=BF=9B=E5=85=A5?=
 =?UTF-8?q?=E5=92=8C=E9=80=80=E5=87=BA=E7=BC=96=E8=BE=91=E6=97=B6=E5=8D=95?=
 =?UTF-8?q?=E5=85=83=E6=A0=BC=E9=80=89=E4=B8=AD=E7=8A=B6=E6=80=81=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

表单报表块进入编辑状态后选中某单元格, 单元格边框高亮，
之后报表块退出编辑，对报表块截图以显示在布局面板上，但
此时因为单元格未退出选中状态，导致截图中出现边框高亮的单元格。
当布局面板中出现多个这样的报表块时，产生了很混乱的效果，因此需要进行
优化。
报表块退出编辑状态后，取消单元格选中
---
 .../com/fr/design/mainframe/form/FormECDesignerProvider.java   | 2 ++
 designer-form/src/main/java/com/fr/design/mainframe/JForm.java | 3 +++
 .../com/fr/design/mainframe/form/FormElementCaseDesigner.java  | 3 +++
 3 files changed, 8 insertions(+)

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/form/FormECDesignerProvider.java b/designer-base/src/main/java/com/fr/design/mainframe/form/FormECDesignerProvider.java
index 27b4a249aa..88a4623071 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/form/FormECDesignerProvider.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/form/FormECDesignerProvider.java
@@ -90,4 +90,6 @@ public interface FormECDesignerProvider {
     BufferedImage getElementCaseImage(Dimension elementCaseContainerSize);
 
     void refreshPropertyPane();
+
+    void removeSelection();
 }
\ No newline at end of file
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 eee57c99f4..856494401b 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
@@ -917,6 +917,9 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm<F
             ecTabAction();
         } else {
             formDesign.setReportBlockEditing(false);
+            if (elementCaseDesign != null) {
+                elementCaseDesign.removeSelection();
+            }
             formTabAction();
         }
         refreshToolArea();
diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/form/FormElementCaseDesigner.java b/designer-realize/src/main/java/com/fr/design/mainframe/form/FormElementCaseDesigner.java
index 45c2fea619..14895e90b3 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/form/FormElementCaseDesigner.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/form/FormElementCaseDesigner.java
@@ -293,10 +293,13 @@ public class FormElementCaseDesigner
     /**
      * 移除选择
      */
+    @Override
     public void removeSelection() {
         TemplateElementCase templateElementCase = this.elementCasePane.getEditingElementCase();
         if (templateElementCase instanceof WorkSheet) {
             ((WorkSheet) templateElementCase).setPaintSelection(false);
+        } else if (templateElementCase instanceof FormElementCase) {
+            this.elementCasePane.setSelection(new CellSelection(0, 0, 0, 0));
         }
         elementCasePane.repaint();
     }