From 63790a64e6c22467ffa793eb362bc4079b592b76 Mon Sep 17 00:00:00 2001 From: plough Date: Mon, 18 Sep 2017 10:16:11 +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=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>=E6=95=B0=E6=8D=AE=E5=88=97=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/condition/ObjectLiteConditionPane.java | 11 ++++++++--- .../fr/design/editor/editor/ColumnSelectedEditor.java | 5 +++++ 2 files changed, 13 insertions(+), 3 deletions(-) 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