From d3a296018d8708b04c56e400cdf19ef3b4064f17 Mon Sep 17 00:00:00 2001 From: shine Date: Thu, 28 Sep 2023 09:44:52 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=8B=B1=E6=96=87=E7=8E=AF=E5=A2=83fvs?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8=20#REPOR?= =?UTF-8?q?T-106352?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chart/gui/data/NormalChartDataPane.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/NormalChartDataPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/NormalChartDataPane.java index 8ea385864..9943c7963 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/NormalChartDataPane.java +++ b/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); }