Merge pull request #1250 in BA/design from ~PLOUGH/design:release/9.0 to release/9.0

* commit '6dc4f5b9475c2da0b3b1309763aed9358e352e00':
  REPORT-3837 [9.0一轮回归]新建单元格条件属性自动显示之前公式状态=>数据列问题

designer_base/src/com/fr/design/condition/ObjectLiteConditionPane.java

@@ -36,10 +36,11 @@ public class ObjectLiteConditionPane extends LiteConditionPane<ObjectCondition>
 
 	@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<ObjectCondition> {
+	private class ObjectConditionPane extends BasicBeanPane<ObjectCondition> {
 
 		private UIComboBox conditionOPComboBox;
 		private ValueEditorPane conditionValuePane;
@@ -48,6 +49,10 @@ public class ObjectLiteConditionPane extends LiteConditionPane<ObjectCondition>
 			this.initComponents();
 		}
 
+		private void clearConditionValuePane() {
+			conditionValuePane.clearComponentsData();
+		}
+
 		protected void initComponents() {
 			this.setLayout(FRGUIPaneFactory.createBorderLayout());
 			// condition operation

designer_base/src/com/fr/design/editor/editor/ColumnSelectedEditor.java

@@ -102,4 +102,9 @@ public class ColumnSelectedEditor extends Editor<SimpleDSColumn> {
 		}
 	}
 
+	@Override
+	public void clearData() {
+        tableDataComboBox.setSelectedItem(null);
+        columnNameComboBox.setSelectedItem(null);
+    }
 }