REPORT-97972 回退一下自己代码库的改动

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(new UILabel(Toolkit.i18nText("Fine-Design_Report_CellWrite_TextOverflow_Nums")), BorderLayout.WEST);
-        showPartNumPane.add(showCharLabel, 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[]{showPartLabel, showPartComboBox, showPartPane},
-                new Component[]{showPartPane},
+                new Component[]{hideTypeLabel, textOverflowTypeComboBox, null}
-                new Component[]{hidePane}
         };
         JPanel textOverflowComPane = TableLayoutHelper.createTableLayoutPane(textOverflowComponents, new double[]{p, p, p}, new double[]{p, f, p});
         textOverflowComPane.setVisible(false);