Merge pull request #1311 in DESIGN/design from ~BJORN/design:feature/10.0 to feature/10.0

* commit '2570ebc9dc894a7e7d311f50fa82c76c4e05ca86':
  CHART-11513 数据集配置面板布局优化

designer-chart/src/main/java/com/fr/design/chartx/fields/AbstractCellDataFieldsPane.java

@@ -47,7 +47,7 @@ public abstract class AbstractCellDataFieldsPane<T extends AbstractColumnFieldCo
             this.add(south, BorderLayout.SOUTH);
         }
 
-        this.setBorder(BorderFactory.createEmptyBorder(0, 15, 0, 8));
+        this.setBorder(BorderFactory.createEmptyBorder(0, 24, 0, 15));
     }
 
     protected JPanel createCenterPane() {
@@ -66,7 +66,7 @@ public abstract class AbstractCellDataFieldsPane<T extends AbstractColumnFieldCo
         }
 
         double p = TableLayout.PREFERRED;
-        double[] columnSize = {ChartDataPane.LABEL_WIDTH, 124};
+        double[] columnSize = {ChartDataPane.LABEL_WIDTH, 122};
         double[] rowSize = new double[len];
         Arrays.fill(rowSize, p);
 

designer-chart/src/main/java/com/fr/design/chartx/fields/diff/GaugeCellDataFieldsPane.java

@@ -34,7 +34,7 @@ public class GaugeCellDataFieldsPane extends AbstractCellDataFieldsPane<GaugeCol
 
         JPanel northPane = new JPanel(new BorderLayout(0, 6));
         northPane.add(createCenterPane(), BorderLayout.CENTER);
-        northPane.setBorder(BorderFactory.createEmptyBorder(0, 15, 0, 8));
+        northPane.setBorder(BorderFactory.createEmptyBorder(0, 24, 0, 15));
 
         this.setLayout(new BorderLayout(0, 6));
         this.add(northPane, BorderLayout.NORTH);

designer-chart/src/main/java/com/fr/design/chartx/single/SingleDataPane.java

@@ -7,23 +7,24 @@ import com.fr.design.chartx.fields.AbstractCellDataFieldsPane;
 import com.fr.design.chartx.fields.AbstractDataSetFieldsPane;
 import com.fr.design.constants.LayoutConstants;
 import com.fr.design.gui.frpane.UIComboBoxPane;
+import com.fr.design.gui.ilable.BoldFontTextLabel;
 import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.mainframe.chart.gui.ChartDataPane;
-import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.utils.gui.UIComponentUtils;
 
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
-import java.awt.BorderLayout;
-import java.awt.Component;
-import java.awt.Dimension;
 import java.util.ArrayList;
 import java.util.List;
+import java.awt.BorderLayout;
 
 /**
  * Created by shine on 2019/5/21.
  */
 public class SingleDataPane extends BasicBeanPane<AbstractDataDefinition> {
 
+    private static final int  TABLE_DATA_LABEL_LINE_WIDTH = 81;
+
     private UIComboBoxPane<AbstractDataDefinition> comboBoxPane;
 
     private DataSetPane dataSetPane;
@@ -51,11 +52,13 @@ public class SingleDataPane extends BasicBeanPane<AbstractDataDefinition> {
             protected void initLayout() {
                 this.setLayout(new BorderLayout(LayoutConstants.HGAP_LARGE, 6));
                 JPanel northPane = new JPanel(new BorderLayout(LayoutConstants.HGAP_LARGE, 0));
+
+                UILabel label = new BoldFontTextLabel(Toolkit.i18nText("Fine-Design_Chart_Data_Source"));
+                UIComponentUtils.setPreferedWidth(label, TABLE_DATA_LABEL_LINE_WIDTH);
+                northPane.add(label,BorderLayout.WEST);
                 northPane.add(jcb, BorderLayout.CENTER);
-                UILabel label1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Source"));
-                label1.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH, ChartDataPane.LABEL_HEIGHT));
-                northPane.add(GUICoreUtils.createBorderLayoutPane(new Component[]{jcb, null, null, label1, null}));
-                northPane.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 8));
+
+                northPane.setBorder(BorderFactory.createEmptyBorder(5,24,0,15));
                 this.add(northPane, BorderLayout.NORTH);
                 this.add(cardPane, BorderLayout.CENTER);
 
@@ -70,7 +73,6 @@ public class SingleDataPane extends BasicBeanPane<AbstractDataDefinition> {
 
         this.setLayout(new BorderLayout());
         this.add(comboBoxPane, BorderLayout.CENTER);
-
     }
 
     @Override