From 60c054210aec979ba2b816a2973582e1806519d1 Mon Sep 17 00:00:00 2001
From: "Bruce.Deng" <bruce.deng@fanruan.com>
Date: Fri, 24 Jun 2022 17:11:50 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-73491=20=E8=81=9A=E5=90=88=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E6=9D=A1=E4=BB=B6=E5=B1=9E=E6=80=A7=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=9D=A2=E6=9D=BF=EF=BC=8C=E5=9C=A8=E8=AE=BE=E8=AE=A1=E5=99=A8?=
 =?UTF-8?q?=E9=87=8D=E5=90=AF=E5=90=8E=E8=AF=A5=E9=9D=A2=E6=9D=BF=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E6=AD=A3=E7=A1=AE=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/fr/poly/creator/ECBlockEditor.java | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/designer-realize/src/main/java/com/fr/poly/creator/ECBlockEditor.java b/designer-realize/src/main/java/com/fr/poly/creator/ECBlockEditor.java
index a387e0f3a9..1d69726df7 100644
--- a/designer-realize/src/main/java/com/fr/poly/creator/ECBlockEditor.java
+++ b/designer-realize/src/main/java/com/fr/poly/creator/ECBlockEditor.java
@@ -3,7 +3,6 @@
  */
 package com.fr.poly.creator;
 
-import com.fr.base.BaseUtils;
 import com.fr.base.ScreenResolution;
 import com.fr.base.vcs.DesignerMode;
 import com.fr.design.constants.UIConstants;
@@ -11,7 +10,15 @@ import com.fr.design.event.TargetModifiedEvent;
 import com.fr.design.event.TargetModifiedListener;
 import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.gui.frpane.HyperlinkGroupPane;
-import com.fr.design.mainframe.*;
+import com.fr.design.mainframe.CellElementPropertyPane;
+import com.fr.design.mainframe.CellWidgetPropertyPane;
+import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.mainframe.EastRegionContainerPane;
+import com.fr.design.mainframe.ElementCasePane;
+import com.fr.design.mainframe.HyperlinkGroupPaneActionImpl;
+import com.fr.design.mainframe.JTemplate;
+import com.fr.design.mainframe.JWorkBook;
+import com.fr.design.mainframe.ReportFloatPane;
 import com.fr.design.mainframe.cell.QuickEditorRegion;
 import com.fr.design.present.ConditionAttributesGroupPane;
 import com.fr.grid.GridUtils;
@@ -26,8 +33,9 @@ import com.fr.report.poly.PolyECBlock;
 import com.fr.stable.unit.UNITConstants;
 import com.fr.stable.unit.UnitRectangle;
 
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
 
 /**
  * @author richer
@@ -166,6 +174,7 @@ public class ECBlockEditor extends BlockEditor<ECBlockPane, PolyECBlock> {
             // 条件属性
             ConditionAttributesGroupPane conditionAttributesGroupPane = ConditionAttributesGroupPane.getInstance();
             conditionAttributesGroupPane.populate(editComponent);
+            EastRegionContainerPane.getInstance().replaceConditionAttrPane(conditionAttributesGroupPane);
 
             EastRegionContainerPane.getInstance().updateCellElementState(isSelectedOneCell());
             if (chooseBlock) {