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 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 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 { @@ -33,6 +34,11 @@ public class ObjectLiteConditionPane extends LiteConditionPane return VariableResolver.DEFAULT; } + @Override + protected void clearDefaultConditionPane() { + defaultConditionPane.populateBean(new ObjectCondition(new Compare(Compare.EQUALS, StringUtils.EMPTY))); + } + private class ObjectConditionPane extends BasicBeanPane { private UIComboBox conditionOPComboBox;