Browse Source

Merge pull request #259 in BA/design from ~ZPC/basic_design:dev to dev

* commit '6f92950c99c8e3b73462a71546b6d86f7467cc3e':
  设计器bug, 条件属性那边选普通形态, 无法保存公式, 日期等格式.
master
superman 8 years ago
parent
commit
60e0d97cdf
  1. 8
      designer/src/com/fr/design/condition/PresentHighlightPane.java

8
designer/src/com/fr/design/condition/PresentHighlightPane.java

@ -97,11 +97,14 @@ public class PresentHighlightPane extends ConditionAttrSingleConditionPane<Highl
} }
public void populate(HighlightAction ha) { public void populate(HighlightAction ha) {
int valueIndex = ((PresentHighlightAction)ha).getValueIndex();
Object obj = ((PresentHighlightAction)ha).getValue(); Object obj = ((PresentHighlightAction)ha).getValue();
presentComboBox.setSelectedIndex(valueIndex); present = ((PresentHighlightAction)ha).getPresent();
if(null != obj) { if(null != obj) {
presentComboBox.setSelectedIndex(0);
this.valueEditor.populate(obj); this.valueEditor.populate(obj);
} else if(null != present) {
presentComboBox.setSelectedIndex(1);
this.valueEditor.populate(present);
} }
} }
@ -111,6 +114,7 @@ public class PresentHighlightPane extends ConditionAttrSingleConditionPane<Highl
if (value instanceof String) { if (value instanceof String) {
present = new NormalPresent(this.valueEditor.update()); present = new NormalPresent(this.valueEditor.update());
} }
return new PresentHighlightAction(present);
} }
return new PresentHighlightAction(this.valueEditor.update()); return new PresentHighlightAction(this.valueEditor.update());
} }

Loading…
Cancel
Save