diff --git a/designer_base/src/com/fr/design/condition/ObjectLiteConditionPane.java b/designer_base/src/com/fr/design/condition/ObjectLiteConditionPane.java index 9c6b248e0..859f280d7 100644 --- a/designer_base/src/com/fr/design/condition/ObjectLiteConditionPane.java +++ b/designer_base/src/com/fr/design/condition/ObjectLiteConditionPane.java @@ -36,10 +36,11 @@ public class ObjectLiteConditionPane extends LiteConditionPane @Override protected void clearDefaultConditionPane() { - defaultConditionPane.populateBean(new ObjectCondition(new Compare(Compare.EQUALS, StringUtils.EMPTY))); - } + ((ObjectConditionPane)defaultConditionPane).clearConditionValuePane(); + defaultConditionPane.populateBean(new ObjectCondition(new Compare(Compare.EQUALS, StringUtils.EMPTY))); + } - private class ObjectConditionPane extends BasicBeanPane { + private class ObjectConditionPane extends BasicBeanPane { private UIComboBox conditionOPComboBox; private ValueEditorPane conditionValuePane; @@ -48,6 +49,10 @@ public class ObjectLiteConditionPane extends LiteConditionPane this.initComponents(); } + private void clearConditionValuePane() { + conditionValuePane.clearComponentsData(); + } + protected void initComponents() { this.setLayout(FRGUIPaneFactory.createBorderLayout()); // condition operation diff --git a/designer_base/src/com/fr/design/editor/editor/ColumnSelectedEditor.java b/designer_base/src/com/fr/design/editor/editor/ColumnSelectedEditor.java index 7b5d76d2f..d5d66150a 100644 --- a/designer_base/src/com/fr/design/editor/editor/ColumnSelectedEditor.java +++ b/designer_base/src/com/fr/design/editor/editor/ColumnSelectedEditor.java @@ -102,4 +102,9 @@ public class ColumnSelectedEditor extends Editor { } } + @Override + public void clearData() { + tableDataComboBox.setSelectedItem(null); + columnNameComboBox.setSelectedItem(null); + } } \ No newline at end of file