From 988689ad4e60a06feccbf26294a8084232549c2e Mon Sep 17 00:00:00 2001
From: MoMeak <fr123456>
Date: Tue, 28 Nov 2017 13:57:13 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-5840=20=E6=8E=A7=E4=BB=B6=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=92=8C=E4=BD=BF=E7=94=A8=E5=A1=AB=E6=8A=A5=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/present/ConditionAttributesGroupPane.java    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/designer/src/com/fr/design/present/ConditionAttributesGroupPane.java b/designer/src/com/fr/design/present/ConditionAttributesGroupPane.java
index 6eac1c5710..5aafd01edb 100644
--- a/designer/src/com/fr/design/present/ConditionAttributesGroupPane.java
+++ b/designer/src/com/fr/design/present/ConditionAttributesGroupPane.java
@@ -16,6 +16,7 @@ import com.fr.design.gui.controlpane.NameObjectCreator;
 import com.fr.design.gui.controlpane.NameableCreator;
 import com.fr.general.Inter;
 import com.fr.grid.selection.CellSelection;
+import com.fr.grid.selection.Selection;
 import com.fr.report.cell.CellElement;
 import com.fr.report.cell.DefaultTemplateCellElement;
 import com.fr.report.cell.TemplateCellElement;
@@ -29,6 +30,7 @@ import com.fr.stable.Nameable;
 public class ConditionAttributesGroupPane extends UIListControlPane {
     private static ConditionAttributesGroupPane singleton;
     private TemplateCellElement editCellElement;  // 当前单元格对象
+    private Selection editSelection;  // 当前编辑对象
 	private ElementCasePane ePane;
 
 	private ConditionAttributesGroupPane() {
@@ -52,10 +54,8 @@ public class ConditionAttributesGroupPane extends UIListControlPane {
         if (isPopulating) {
             return;
         }
-		final CellSelection finalCS = (CellSelection) ePane.getSelection();
 		final TemplateElementCase tplEC = ePane.getEditingElementCase();
-
-        ReportActionUtils.actionIterateWithCellSelection(finalCS, tplEC, new ReportActionUtils.IterAction() {
+        ReportActionUtils.actionIterateWithCellSelection((CellSelection) editSelection, tplEC, new ReportActionUtils.IterAction() {
             public void dealWith(CellElement editCellElement) {
                 ((TemplateCellElement)editCellElement).setHighlightGroup(updateHighlightGroup());
             }
@@ -75,6 +75,7 @@ public class ConditionAttributesGroupPane extends UIListControlPane {
 
     public void populate(ElementCasePane ePane) {
 		this.ePane = ePane;
+		this.editSelection = ePane.getSelection();
         CellSelection cs = (CellSelection) ePane.getSelection();
         final TemplateElementCase tplEC = ePane.getEditingElementCase();
         editCellElement = tplEC.getTemplateCellElement(cs.getColumn(), cs.getRow());