From 7c76b1e46323e216467734712141381b0884c84e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E5=B2=B3?= <445798420@qq.com>
Date: Wed, 17 Jul 2019 17:25:55 +0800
Subject: [PATCH] =?UTF-8?q?CHART-4798=20=E6=95=B0=E6=8D=AE=E9=9B=86?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

分类系列使用字段名时，value和series的fieldName放反了
---
 .../chartx/component/SeriesValueFieldComboBoxPane.java      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/designer-chart/src/main/java/com/fr/design/chartx/component/SeriesValueFieldComboBoxPane.java b/designer-chart/src/main/java/com/fr/design/chartx/component/SeriesValueFieldComboBoxPane.java
index 30ae364b7..4372cf0db 100644
--- a/designer-chart/src/main/java/com/fr/design/chartx/component/SeriesValueFieldComboBoxPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chartx/component/SeriesValueFieldComboBoxPane.java
@@ -79,8 +79,8 @@ public class SeriesValueFieldComboBoxPane extends AbstractCustomFieldComboBoxPan
             List<Object[]> list = new ArrayList<Object[]>();
             for (SeriesValueField seriesValueField : seriesValueCorrelationDefinition.getSeriesValueFieldList()) {
                 Object[] array = new Object[]{
-                        seriesValueField.getSeries().getFieldName(),
                         seriesValueField.getValue().getFieldName(),
+                        seriesValueField.getSeries().getFieldName(),
                         DataPaneHelper.getFunctionString(seriesValueField.getValue().getDataFunction())
                 };
                 list.add(array);
@@ -92,8 +92,8 @@ public class SeriesValueFieldComboBoxPane extends AbstractCustomFieldComboBoxPan
         protected void setTableModelListToTBean(List<Object[]> tableValues, SeriesValueCorrelationDefinition seriesValueCorrelationDefinition) {
             List<SeriesValueField> seriesValueFields = new ArrayList<SeriesValueField>();
             for (Object[] line : tableValues) {
-                ColumnField series = new ColumnField(GeneralUtils.objectToString(line[0]));
-                ColumnField value = new ColumnField(GeneralUtils.objectToString(line[1]));
+                ColumnField value = new ColumnField(GeneralUtils.objectToString(line[0]));
+                ColumnField series = new ColumnField(GeneralUtils.objectToString(line[1]));
                 value.setDataFunction(DataPaneHelper.getFunctionByName(GeneralUtils.objectToString(line[2])));
                 SeriesValueField seriesValueField = new SeriesValueField();
                 seriesValueField.setValue(value);