diff --git a/designer-chart/src/main/java/com/fr/design/chart/AutoChartTypePane.java b/designer-chart/src/main/java/com/fr/design/chart/AutoChartTypePane.java index a390d3fb53..ece856eadc 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/AutoChartTypePane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/AutoChartTypePane.java @@ -138,22 +138,22 @@ public class AutoChartTypePane extends ChartWizardPane implements CallbackEvent } }; + private JPanel createContentPane() { - JPanel panel = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); - JPanel tableDataPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); - panel.add(tableDataPane); - tableDataPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Chart_Table_Data") + ":")); - tableNameComboBox.setPreferredSize(new Dimension(FineUIScale.scale(126), FineUIScale.scale(20))); - tableDataPane.add(tableNameComboBox); - - JPanel areaNamePane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); - panel.add(areaNamePane); - areaNamePane.add(new UILabel(Toolkit.i18nText("Fine-Design_Chart_Data_Field") + ":")); - areaNamePane.add(dataFieldBox); - dataFieldBox.setPreferredSize(new Dimension(FineUIScale.scale(126), FineUIScale.scale(20))); - panel.add(refreshButton); - panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0)); - return panel; + JPanel contentPane = new JPanel(new BorderLayout()); + contentPane.add(column( + row(10, + flex().weight(0.1), + cell(new UILabel(Toolkit.i18nText("Fine-Design_Chart_Table_Data") + ":")).weight(1), + cell(tableNameComboBox).weight(3), + cell(new UILabel(Toolkit.i18nText("Fine-Design_Chart_Data_Field") + ":")).weight(1.3), + cell(dataFieldBox).weight(3), + cell(refreshButton).weight(1.5), + flex(3) + ).with(it -> it.setPreferredSize(new Dimension(super.getPreferredSize().width, FineUIScale.scale(tableNameComboBox.getPreferredSize().height)))) + ).getComponent()); + contentPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0)); + return contentPane; } private void initButtonGroup() {