From f3fa01d795ad0da213d177145b5b27f71442ca77 Mon Sep 17 00:00:00 2001
From: zpc <zpc@finereport.com>
Date: Thu, 11 Aug 2016 15:59:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E5=99=A8bug,=20=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E5=B1=9E=E6=80=A7=E9=82=A3=E8=BE=B9=E9=80=89=E6=99=AE?=
 =?UTF-8?q?=E9=80=9A=E5=BD=A2=E6=80=81,=20=E6=97=A0=E6=B3=95=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E5=85=AC=E5=BC=8F,=20=E6=97=A5=E6=9C=9F=E7=AD=89?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

设计器bug, 条件属性那边选普通形态, 无法保存公式, 日期等格式.
---
 .../src/com/fr/design/condition/PresentHighlightPane.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/designer/src/com/fr/design/condition/PresentHighlightPane.java b/designer/src/com/fr/design/condition/PresentHighlightPane.java
index f306ec0f7..6883373a7 100644
--- a/designer/src/com/fr/design/condition/PresentHighlightPane.java
+++ b/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());
     }