Browse Source

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

* commit '6dc4f5b9475c2da0b3b1309763aed9358e352e00':
  REPORT-3837 [9.0一轮回归]新建单元格条件属性自动显示之前公式状态=>数据列问题
master
superman 7 years ago
parent
commit
7128132fa3
  1. 5
      designer_base/src/com/fr/design/condition/ObjectLiteConditionPane.java
  2. 5
      designer_base/src/com/fr/design/editor/editor/ColumnSelectedEditor.java

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

@ -36,6 +36,7 @@ public class ObjectLiteConditionPane extends LiteConditionPane<ObjectCondition>
@Override
protected void clearDefaultConditionPane() {
((ObjectConditionPane)defaultConditionPane).clearConditionValuePane();
defaultConditionPane.populateBean(new ObjectCondition(new Compare(Compare.EQUALS, StringUtils.EMPTY)));
}
@ -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

5
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);
}
}
Loading…
Cancel
Save