From 5501f1b41099d2529d3a792683ead253e9a252b7 Mon Sep 17 00:00:00 2001
From: "Bruce.Deng" <bruce.deng@fanruan.com>
Date: Mon, 24 Jan 2022 15:42:04 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-66196=20=E3=80=90=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=A4=A7=E6=96=87=E6=9C=AC=E3=80=91=E6=96=B0=E5=BB=BA=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E8=AE=BE=E7=BD=AE=EF=BC=8C=E6=98=BE=E7=A4=BA=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E8=AE=BE=E7=BD=AE=E5=AD=97=E7=AC=A6=E9=95=BF=E5=BA=A6?=
 =?UTF-8?q?5=EF=BC=8C=E7=82=B9=E5=87=BB=E4=BF=9D=E5=AD=98=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E6=9F=A5=E7=9C=8B=E6=9C=89=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cell/settingpane/CellOtherSetPane.java         | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 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 8bd6dcac11..99a0d9bf48 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
@@ -318,16 +318,14 @@ public class CellOtherSetPane extends AbstractCellAttrPane {
             public void itemStateChanged(ItemEvent e) {
                 textOverflowComPane.setVisible(e.getStateChange() == ItemEvent.SELECTED);
                 if (e.getStateChange() == ItemEvent.SELECTED) {
-                    noAutoRadioButton.setSelected(true);
-                    textOverflowComPane.setVisible(true);
                     if (showPartComboBox.getSelectedIndex() == 0) {
+                        showPartPane.setPreferredSize(new Dimension(70, 20));
                         showPartLayout.show(showPartPane, "content");
                     } else {
                         showPartLayout.show(showPartPane, "none");
                         showPartPane.setPreferredSize(new Dimension(0, 0));
                     }
-                } else {
-                    textOverflowComPane.setVisible(false);
+                    noAutoRadioButton.setSelected(true);
                 }
             }
         });
@@ -543,11 +541,10 @@ public class CellOtherSetPane extends AbstractCellAttrPane {
         if (cellGUIAttr.isHideTextWhenOverflow()) {
             textOverflowCheckBox.setSelected(true);
             if (cellGUIAttr.isShowCharNum()) {
-                showPartLayout.show(showPartPane, "content");
+                showPartComboBox.setSelectedIndex(0);
                 showCharNums.setValue(cellGUIAttr.getShowCharNums());
             } else {
-                showPartLayout.show(showPartPane, "none");
-                showPartPane.setPreferredSize(new Dimension(0, 0));
+                showPartComboBox.setSelectedIndex(1);
             }
             showPartPane.setVisible(true);
             if (cellGUIAttr.isTextOverflowEllipsis()) {
@@ -556,6 +553,9 @@ public class CellOtherSetPane extends AbstractCellAttrPane {
                 textOverflowTypeComboBox.setSelectedItem(Toolkit.i18nText("Fine-Design_Report_CellWrite_TextOverflow_NoneSymbol"));
             }
         } else {
+            showPartComboBox.setSelectedIndex(0);
+            showCharNums.setValue(cellGUIAttr.getShowCharNums());
+            textOverflowTypeComboBox.setSelectedIndex(0);
             textOverflowCheckBox.setSelected(false);
         }
         CellPageAttr cellPageAttr = cellElement.getCellPageAttr(); // 分页