From 8cedf366defe929499f651cd14bf12a95ce8fba1 Mon Sep 17 00:00:00 2001
From: plough <plough@finereport.com>
Date: Wed, 6 Sep 2017 09:38:34 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-3837=20[9.0=E4=B8=80=E8=BD=AE=E5=9B=9E?=
 =?UTF-8?q?=E5=BD=92]=E6=96=B0=E5=BB=BA=E5=8D=95=E5=85=83=20=E6=A0=BC?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=B1=9E=E6=80=A7=E8=87=AA=E5=8A=A8=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=B9=8B=E5=89=8D=E5=85=AC=E5=BC=8F=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=3D>=E4=BF=AE=E5=A4=8D=E5=BC=BA=E8=BD=AC=E7=BB=99=E5=85=B6?=
 =?UTF-8?q?=E4=BB=96=E5=9C=B0=E6=96=B9=E5=BC=95=E5=85=A5=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/com/fr/design/condition/LiteConditionPane.java      | 6 +++++-
 .../com/fr/design/condition/ObjectLiteConditionPane.java    | 6 ++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/designer_base/src/com/fr/design/condition/LiteConditionPane.java b/designer_base/src/com/fr/design/condition/LiteConditionPane.java
index 1ce56fb3a..674bd7d39 100644
--- a/designer_base/src/com/fr/design/condition/LiteConditionPane.java
+++ b/designer_base/src/com/fr/design/condition/LiteConditionPane.java
@@ -854,7 +854,7 @@ public abstract class LiteConditionPane<T extends Condition> extends BasicBeanPa
         rootTreeNode.removeAllChildren();
 
         // 清空编辑框
-        defaultConditionPane.populateBean((T)new ObjectCondition(new Compare(Compare.EQUALS, StringUtils.EMPTY)));
+        clearDefaultConditionPane();
         formulaTextArea.setText(StringUtils.EMPTY);
 
         // peter:需要构建成ListCondition,加入到里面.
@@ -892,6 +892,10 @@ public abstract class LiteConditionPane<T extends Condition> extends BasicBeanPa
         }
     }
 
+    // 有需要再重写，不用做成抽象方法
+    protected void clearDefaultConditionPane() {
+    }
+
     protected boolean needDoWithCondition(Condition liteCondition) {
         return true;
     }
diff --git a/designer_base/src/com/fr/design/condition/ObjectLiteConditionPane.java b/designer_base/src/com/fr/design/condition/ObjectLiteConditionPane.java
index 2ba959840..479e06fbf 100644
--- a/designer_base/src/com/fr/design/condition/ObjectLiteConditionPane.java
+++ b/designer_base/src/com/fr/design/condition/ObjectLiteConditionPane.java
@@ -20,6 +20,7 @@ import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.editor.ValueEditorPane;
 import com.fr.design.editor.ValueEditorPaneFactory;
 import com.fr.general.Inter;
+import com.fr.stable.StringUtils;
 
 public class ObjectLiteConditionPane extends LiteConditionPane<ObjectCondition> {
 	
@@ -33,6 +34,11 @@ public class ObjectLiteConditionPane extends LiteConditionPane<ObjectCondition>
 		return VariableResolver.DEFAULT;
 	}
 
+	@Override
+	protected void clearDefaultConditionPane() {
+		defaultConditionPane.populateBean(new ObjectCondition(new Compare(Compare.EQUALS, StringUtils.EMPTY)));
+	}
+
 	private  class ObjectConditionPane extends BasicBeanPane<ObjectCondition> {
 
 		private UIComboBox conditionOPComboBox;