REPORT-102520 fix:面板样式优化

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/NormalChartDataPane.java

@@ -2,6 +2,7 @@ package com.fr.design.mainframe.chart.gui.data;
 
 import com.fr.chart.chartattr.ChartCollection;
 import com.fr.design.beans.FurtherBasicBeanPane;
+import com.fr.design.chartx.data.DataLayoutHelper;
 import com.fr.design.constants.LayoutConstants;
 import com.fr.design.gui.frpane.AttributeChangeListener;
 import com.fr.design.gui.frpane.UIComboBoxPane;
@@ -61,15 +62,22 @@ public class NormalChartDataPane extends DataContentsPane {
 				JPanel contentPane = new JPanel(new BorderLayout());
 				dataPane = new UIComboBoxPane<ChartCollection>() {
 					protected void initLayout() {
-						this.setLayout(new BorderLayout(LayoutConstants.HGAP_LARGE,6));
-						JPanel northPane = new JPanel(new BorderLayout(LayoutConstants.HGAP_LARGE,0));
-						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));
 						if (ChartEditContext.supportReportData()) {
-							this.add(northPane, BorderLayout.NORTH);
+							if (ChartEditContext.normalMode()) {
+								this.setLayout(new BorderLayout(LayoutConstants.HGAP_LARGE,6));
+								JPanel northPane = new JPanel(new BorderLayout(LayoutConstants.HGAP_LARGE,0));
+								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));
+								this.add(northPane, BorderLayout.NORTH);
+							} else {
+								this.setLayout(new BorderLayout(0, 6));
+								JPanel northPane = DataLayoutHelper.createDataLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Source"), jcb);
+								northPane.setBorder(BorderFactory.createEmptyBorder(0, DataLayoutHelper.LEFT_GAP, 0, DataLayoutHelper.RIGHT_GAP));
+								this.add(northPane, BorderLayout.NORTH);
+							}
 						}
 						this.add(cardPane, BorderLayout.CENTER);