From a5929659051b1b0a56824d5f79c368a7802c36c6 Mon Sep 17 00:00:00 2001
From: fr_shine <zheng@finereport.com>
Date: Thu, 19 May 2016 11:50:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E6=95=B0=E6=8D=AE=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chart/gui/data/table/SeriesNameUseFieldNamePane.java    | 6 +++++-
 .../chart/gui/data/table/SeriesNameUseFieldValuePane.java   | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldNamePane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldNamePane.java
index f9258bc81..b8fb5ae74 100644
--- a/designer_chart/src/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldNamePane.java
+++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldNamePane.java
@@ -224,6 +224,10 @@ public class SeriesNameUseFieldNamePane extends FurtherBasicBeanPane<ChartCollec
         return CalculateComboBox.CALCULATE_ARRAY[0];
     }
 
+    protected MoreNameCDDefinition createMoreNameCDDefinition() {
+        return new MoreNameCDDefinition();
+    }
+
     /**
      * 保存界面属性到ChartCollection
      */
@@ -233,7 +237,7 @@ public class SeriesNameUseFieldNamePane extends FurtherBasicBeanPane<ChartCollec
         if (normalDefinition instanceof MoreNameCDDefinition) {
             moreDefinition = (MoreNameCDDefinition) normalDefinition;
         } else {
-            moreDefinition = new MoreNameCDDefinition();
+            moreDefinition = createMoreNameCDDefinition();
         }
 
         List<Object[]> data = seriesDataPane.updateBean();
diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldValuePane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldValuePane.java
index a1eed2138..2d5099db4 100644
--- a/designer_chart/src/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldValuePane.java
+++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldValuePane.java
@@ -278,7 +278,7 @@ public class SeriesNameUseFieldValuePane extends FurtherBasicBeanPane<ChartColle
      * 保存界面内容 字段值
      */
     public void updateBean(ChartCollection collection) {
-        OneValueCDDefinition oneDefinition = new OneValueCDDefinition();
+        OneValueCDDefinition oneDefinition = createOneValueCDDefinition();
 
         String seriesName = (String) this.seriesName.getSelectedItem();
         oneDefinition.setSeriesColumnName(seriesName);
@@ -292,6 +292,10 @@ public class SeriesNameUseFieldValuePane extends FurtherBasicBeanPane<ChartColle
         collection.getSelectedChart().setFilterDefinition(oneDefinition);
     }
 
+    protected OneValueCDDefinition createOneValueCDDefinition(){
+        return new OneValueCDDefinition();
+    }
+
     /**
      * 保存界面属性 新的ChartCollection
      */