From 9c6f4c90cd115ca0103109cd86067db07f76761a Mon Sep 17 00:00:00 2001 From: obo Date: Thu, 29 Jun 2023 09:48:16 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-97972=20=E3=80=90FR=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96=E3=80=91=E6=96=87=E5=AD=97=E6=98=BE=E7=A4=BA=E4=B8=8D?= =?UTF-8?q?=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cell/settingpane/CellOtherSetPane.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java index 5ac64d401..03ec887fd 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java @@ -357,7 +357,8 @@ public class CellOtherSetPane extends AbstractCellAttrPane { showPartPane = new JPanel(showPartLayout); showCharNums = new UISpinner(0, Integer.MAX_VALUE, 1, 10); JPanel showPartNumPane = new JPanel(new BorderLayout(4, 0)); - showPartNumPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Report_CellWrite_TextOverflow_Nums")), BorderLayout.WEST); + UILabel showCharLabel = new UILabel(Toolkit.i18nText("Fine-Design_Report_CellWrite_TextOverflow_Nums") + ":"); + showPartNumPane.add(showCharLabel, BorderLayout.WEST); showPartNumPane.add(showCharNums, BorderLayout.CENTER); showPartPane.add(new JPanel(), "none"); showPartPane.add(showPartNumPane, "content"); @@ -377,12 +378,20 @@ public class CellOtherSetPane extends AbstractCellAttrPane { textOverflowTypeComboBox = new UIComboBox(new String[]{Toolkit.i18nText("Fine-Design_Report_CellWrite_TextOverflow_Ellipsis"), Toolkit.i18nText("Fine-Design_Report_CellWrite_TextOverflow_NoneSymbol")}); UILabel showPartLabel = new UILabel(Toolkit.i18nText("Fine-Design_Report_CellWrite_TextOverflow_ShowPart") + ":"); + showCharLabel.setPreferredSize(new Dimension(showPartLabel.getPreferredSize().width, 15)); + JPanel pane = new JPanel(new BorderLayout(4, 0)); + pane.add(showPartLabel, BorderLayout.WEST); + pane.add(showPartComboBox, BorderLayout.CENTER); UILabel hideTypeLabel = new UILabel(Toolkit.i18nText("Fine-Design_Report_CellWrite_TextOverflow_HideType") + ":"); + JPanel hidePane = new JPanel(new BorderLayout(4, 0)); + hidePane.add(hideTypeLabel, BorderLayout.WEST); + hidePane.add(textOverflowTypeComboBox, BorderLayout.CENTER); Component[][] textOverflowComponents = new Component[][]{ - new Component[]{showPartLabel, showPartComboBox, showPartPane}, - new Component[]{hideTypeLabel, textOverflowTypeComboBox, null} + new Component[]{pane}, + new Component[]{showPartPane}, + new Component[]{hidePane} }; - JPanel textOverflowComPane = TableLayoutHelper.createTableLayoutPane(textOverflowComponents, new double[]{p, p}, new double[]{p, f, p}); + JPanel textOverflowComPane = TableLayoutHelper.createTableLayoutPane(textOverflowComponents, new double[]{p, p, p}, new double[]{p, f, p}); textOverflowComPane.setVisible(false); textOverflowCheckBox = new UICheckBox(Toolkit.i18nText("Fine-Design_Report_CellWrite_TextOverflow_HideWhenOverflow")); textOverflowCheckBox.addItemListener(new ItemListener() {