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

* commit '6f92950c99c8e3b73462a71546b6d86f7467cc3e':
  设计器bug, 条件属性那边选普通形态, 无法保存公式, 日期等格式.

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

@@ -97,11 +97,14 @@ public class PresentHighlightPane extends ConditionAttrSingleConditionPane<Highl
     }
 
     public  void populate(HighlightAction ha) {
-        int valueIndex = ((PresentHighlightAction)ha).getValueIndex();
         Object obj = ((PresentHighlightAction)ha).getValue();
-        presentComboBox.setSelectedIndex(valueIndex);
+        present = ((PresentHighlightAction)ha).getPresent();
         if(null != obj) {
+            presentComboBox.setSelectedIndex(0);
             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) {
                 present = new NormalPresent(this.valueEditor.update());
             }
+            return new PresentHighlightAction(present);
         }
         return new PresentHighlightAction(this.valueEditor.update());
     }