Browse Source

Merge pull request #12886 in DESIGN/design from bugfix/11.0 to feature/x

* commit 'e68d64cda26491ef8b6781781a5763f5c7e66b5f':
  fix: 英文环境fvs模板显示不全 #REPORT-106352
feature/x
superman 1 year ago
parent
commit
24465f7758
  1. 18
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/NormalChartDataPane.java

18
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() { protected void initLayout() {
this.setLayout(new BorderLayout(ChartEditContext.normalMode() ? LayoutConstants.HGAP_LARGE : 0,6)); this.setLayout(new BorderLayout(ChartEditContext.normalMode() ? LayoutConstants.HGAP_LARGE : 0,6));
if (ChartEditContext.supportReportData()) { if (ChartEditContext.supportReportData()) {
JPanel northPane; JPanel northPane = new JPanel(new BorderLayout(LayoutConstants.HGAP_LARGE, 0));
if (ChartEditContext.normalMode()) { northPane.add(jcb, BorderLayout.CENTER);
northPane = new JPanel(new BorderLayout(LayoutConstants.HGAP_LARGE, 0)); UILabel label1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Source"));
northPane.add(jcb, BorderLayout.CENTER); label1.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH, ChartDataPane.LABEL_HEIGHT));
UILabel label1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Source")); northPane.add(GUICoreUtils.createBorderLayoutPane(new Component[]{jcb, null, null, label1, null}));
label1.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH,ChartDataPane.LABEL_HEIGHT)); if (ChartEditContext.normalMode()) {
northPane.add(GUICoreUtils.createBorderLayoutPane(new Component[]{jcb, null, null, label1, null})); northPane.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 8));
northPane.setBorder(BorderFactory.createEmptyBorder(0,5,0,8));
} else { } else {
northPane = DataLayoutHelper.createDataLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Source"), jcb); northPane.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 20));
northPane.setBorder(BorderFactory.createEmptyBorder(0, DataLayoutHelper.LEFT_GAP, 0, DataLayoutHelper.RIGHT_GAP));
} }
this.add(northPane, BorderLayout.NORTH); this.add(northPane, BorderLayout.NORTH);
} }

Loading…
Cancel
Save