From ad744f4c57f5d356d44294aa16f5fe4b6b6bbea7 Mon Sep 17 00:00:00 2001
From: zheng <zheng@finereport.com>
Date: Fri, 14 Sep 2018 14:38:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=90=8D=E4=BD=9C=E4=B8=BA?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E6=96=B0=E7=9A=84=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/fr/plugin/demo/DemoChart.java          | 7 +++++--
 src/com/fr/plugin/demo/DemoReportDataPane.java | 5 +++++
 src/com/fr/plugin/demo/DemoTableDataPane.java  | 4 ++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/com/fr/plugin/demo/DemoChart.java b/src/com/fr/plugin/demo/DemoChart.java
index 7be15f3..2f13fcb 100644
--- a/src/com/fr/plugin/demo/DemoChart.java
+++ b/src/com/fr/plugin/demo/DemoChart.java
@@ -136,8 +136,11 @@ public class DemoChart extends AbstractChart<DemoDataConfig>{
 
           //  jsonObject.put("targetName", dataConfig.getTargetName());
 
-            List<Object> expectList = dataConfig.getExpect().getValues();
-            List<Object> actualList = dataConfig.getActual().getValues();
+//            List<Object> expectList = dataConfig.getExpect().getValues();
+//            List<Object> actualList = dataConfig.getActual().getValues();
+
+            List<Object> customNames = dataConfig.getCustomNameField().getValues();
+            List<Object> customValues = dataConfig.getCustomValueField().getValues();
 
             for (int i = 0, len = xValues.size(); i < len; i++) {
                 maxValue = Math.max(GeneralUtils.objectToNumber(zValues.get(i)).doubleValue(), maxValue);
diff --git a/src/com/fr/plugin/demo/DemoReportDataPane.java b/src/com/fr/plugin/demo/DemoReportDataPane.java
index c9d44dc..9fc7eea 100644
--- a/src/com/fr/plugin/demo/DemoReportDataPane.java
+++ b/src/com/fr/plugin/demo/DemoReportDataPane.java
@@ -16,6 +16,11 @@ public class DemoReportDataPane extends AbstractExtendedChartReportDataPane<Demo
     private TinyFormulaPane yPane;
     private TinyFormulaPane zPane;
 
+    @Override
+    protected boolean hasCustomFieldPane() {
+        return true;
+    }
+
     @Override
     protected String[] fieldLabel() {
         return new String[]{
diff --git a/src/com/fr/plugin/demo/DemoTableDataPane.java b/src/com/fr/plugin/demo/DemoTableDataPane.java
index 6b84815..f31a291 100644
--- a/src/com/fr/plugin/demo/DemoTableDataPane.java
+++ b/src/com/fr/plugin/demo/DemoTableDataPane.java
@@ -21,6 +21,10 @@ public class DemoTableDataPane extends AbstractExtendedChartTableDataPane<DemoDa
     private UIComboBox actual;
     private CalculateComboBox actualFunction;
 
+    @Override
+    protected boolean hasCustomFieldPane() {
+        return true;
+    }
 
     @Override
     protected String[] fieldLabels() {