From a417d401af5d6712119826455096edeec28e4b95 Mon Sep 17 00:00:00 2001 From: obo Date: Thu, 29 Jun 2023 14:16:19 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-97972=20=E5=9B=9E=E9=80=80=E4=B8=80?= =?UTF-8?q?=E4=B8=8B=E8=87=AA=E5=B7=B1=E4=BB=A3=E7=A0=81=E5=BA=93=E7=9A=84?= =?UTF-8?q?=E6=94=B9=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cell/settingpane/CellOtherSetPane.java | 15 +++------------ 1 file changed, 3 insertions(+), 12 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 03ec887fd8..101ee470d7 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,8 +357,7 @@ 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)); - UILabel showCharLabel = new UILabel(Toolkit.i18nText("Fine-Design_Report_CellWrite_TextOverflow_Nums") + ":"); - showPartNumPane.add(showCharLabel, BorderLayout.WEST); + showPartNumPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Report_CellWrite_TextOverflow_Nums")), BorderLayout.WEST); showPartNumPane.add(showCharNums, BorderLayout.CENTER); showPartPane.add(new JPanel(), "none"); showPartPane.add(showPartNumPane, "content"); @@ -378,18 +377,10 @@ 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[]{pane}, - new Component[]{showPartPane}, - new Component[]{hidePane} + new Component[]{showPartLabel, showPartComboBox, showPartPane}, + new Component[]{hideTypeLabel, textOverflowTypeComboBox, null} }; JPanel textOverflowComPane = TableLayoutHelper.createTableLayoutPane(textOverflowComponents, new double[]{p, p, p}, new double[]{p, f, p}); textOverflowComPane.setVisible(false);