Pull request #12870: fix: 英文环境fvs模板显示不全 #REPORT-106352

Merge in DESIGN/design from ~ZHENG/c-design:release/11.0 to release/11.0

* commit 'e53ecafe84b8f0d50b4fe34ce8498ec8b51192ba':
  fix: 英文环境fvs模板显示不全 #REPORT-106352

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

@@ -64,17 +64,15 @@ public class NormalChartDataPane extends DataContentsPane {
 					protected void initLayout() {
 						this.setLayout(new BorderLayout(ChartEditContext.normalMode() ? LayoutConstants.HGAP_LARGE : 0,6));
 						if (ChartEditContext.supportReportData()) {
-							JPanel northPane;
-							if (ChartEditContext.normalMode()) {
-								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));
+                            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}));
+                            if (ChartEditContext.normalMode()) {
+                                northPane.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 8));
 							} else {
-								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));
+                                northPane.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 20));
 							}
 							this.add(northPane, BorderLayout.NORTH);
 						}