Browse Source

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

master
plough 7 years ago
parent
commit
63790a64e6
  1. 11
      designer_base/src/com/fr/design/condition/ObjectLiteConditionPane.java
  2. 5
      designer_base/src/com/fr/design/editor/editor/ColumnSelectedEditor.java

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

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