Browse Source

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

* commit '13f59af6f5f3396b463e9661764e6440f529a376':
  REPORT-3837 [9.0一轮回归]新建单元格条件属性自动显示之前公式状态
master
superman 7 years ago
parent
commit
8f4bdda3bc
  1. 7
      designer_base/src/com/fr/design/condition/LiteConditionPane.java

7
designer_base/src/com/fr/design/condition/LiteConditionPane.java

@ -167,9 +167,6 @@ public abstract class LiteConditionPane<T extends Condition> extends BasicBeanPa
TreePath selectedTreePath = conditionsTree.getSelectionPath(); TreePath selectedTreePath = conditionsTree.getSelectionPath();
if (selectedTreePath == null) { if (selectedTreePath == null) {
// 清空编辑框
defaultConditionPane.populateBean((T)new ObjectCondition(new Compare(Compare.EQUALS, StringUtils.EMPTY)));
formulaTextArea.setText(StringUtils.EMPTY);
return; return;
} }
@ -856,6 +853,10 @@ public abstract class LiteConditionPane<T extends Condition> extends BasicBeanPa
rootTreeNode.setUserObject(new JoinCondition(DataConstants.AND, new ListCondition())); rootTreeNode.setUserObject(new JoinCondition(DataConstants.AND, new ListCondition()));
rootTreeNode.removeAllChildren(); rootTreeNode.removeAllChildren();
// 清空编辑框
defaultConditionPane.populateBean((T)new ObjectCondition(new Compare(Compare.EQUALS, StringUtils.EMPTY)));
formulaTextArea.setText(StringUtils.EMPTY);
// peter:需要构建成ListCondition,加入到里面. // peter:需要构建成ListCondition,加入到里面.
if (liteCondition instanceof ListCondition) { if (liteCondition instanceof ListCondition) {
ListCondition listCondition = (ListCondition) liteCondition; ListCondition listCondition = (ListCondition) liteCondition;

Loading…
Cancel
Save