Merge pull request #988 in DESIGN/design from ~BJORN/design:refactor/19.4.3 to refactor/19.4.3

* commit '9dce29f1f205d967511a089a5ba3703c1f4c559f':
  CHART-4798 数据集数据源

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[0]));
-                ColumnField value = new ColumnField(GeneralUtils.objectToString(line[1]));
+                ColumnField series = new ColumnField(GeneralUtils.objectToString(line[1]));
                 value.setDataFunction(DataPaneHelper.getFunctionByName(GeneralUtils.objectToString(line[2])));
                 SeriesValueField seriesValueField = new SeriesValueField();
                 seriesValueField.setValue(value);