Browse Source

REPORT-3837 [9.0一轮回归]新建单元

格条件属性自动显示之前公式状态=>修复强转给其他地方引入的bug
master
plough 7 years ago
parent
commit
8cedf366de
  1. 6
      designer_base/src/com/fr/design/condition/LiteConditionPane.java
  2. 6
      designer_base/src/com/fr/design/condition/ObjectLiteConditionPane.java

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

@ -854,7 +854,7 @@ public abstract class LiteConditionPane<T extends Condition> extends BasicBeanPa
rootTreeNode.removeAllChildren(); rootTreeNode.removeAllChildren();
// 清空编辑框 // 清空编辑框
defaultConditionPane.populateBean((T)new ObjectCondition(new Compare(Compare.EQUALS, StringUtils.EMPTY))); clearDefaultConditionPane();
formulaTextArea.setText(StringUtils.EMPTY); formulaTextArea.setText(StringUtils.EMPTY);
// peter:需要构建成ListCondition,加入到里面. // peter:需要构建成ListCondition,加入到里面.
@ -892,6 +892,10 @@ public abstract class LiteConditionPane<T extends Condition> extends BasicBeanPa
} }
} }
// 有需要再重写,不用做成抽象方法
protected void clearDefaultConditionPane() {
}
protected boolean needDoWithCondition(Condition liteCondition) { protected boolean needDoWithCondition(Condition liteCondition) {
return true; return true;
} }

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

@ -20,6 +20,7 @@ import com.fr.design.layout.TableLayoutHelper;
import com.fr.design.editor.ValueEditorPane; import com.fr.design.editor.ValueEditorPane;
import com.fr.design.editor.ValueEditorPaneFactory; import com.fr.design.editor.ValueEditorPaneFactory;
import com.fr.general.Inter; import com.fr.general.Inter;
import com.fr.stable.StringUtils;
public class ObjectLiteConditionPane extends LiteConditionPane<ObjectCondition> { public class ObjectLiteConditionPane extends LiteConditionPane<ObjectCondition> {
@ -33,6 +34,11 @@ public class ObjectLiteConditionPane extends LiteConditionPane<ObjectCondition>
return VariableResolver.DEFAULT; return VariableResolver.DEFAULT;
} }
@Override
protected void clearDefaultConditionPane() {
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;

Loading…
Cancel
Save