fanruan
/
design
6
1
Fork 2
Code Issues 2 Pull Requests Releases Wiki Activity
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
ae4144fc6c e68d64cda2
commit
24465f7758
1 changed files with 8 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/NormalChartDataPane.java

12
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/NormalChartDataPane.java
Unescape View File

@ -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 = new JPanel(new BorderLayout(LayoutConstants.HGAP_LARGE, 0));
northPane.add(jcb, BorderLayout.CENTER); northPane.add(jcb, BorderLayout.CENTER);
UILabel label1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Source")); 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)); label1.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH, ChartDataPane.LABEL_HEIGHT));
northPane.add(GUICoreUtils.createBorderLayoutPane(new Component[]{jcb, null, null, label1, null})); northPane.add(GUICoreUtils.createBorderLayoutPane(new Component[]{jcb, null, null, label1, null}));
northPane.setBorder(BorderFactory.createEmptyBorder(0,5,0,8)); if (ChartEditContext.normalMode()) {
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);
} }

Write Preview
Loading…
Cancel
Save