Pull request #9152: REPORT-73256 文本超出后隐藏设置会影响单元格基本属性设置

Merge in DESIGN/design from ~BRUCE.DENG/design:final/11.0 to final/11.0

* commit '950d4881a54ec4f2e324261ebdb80dba5959d9d2':
  REPORT-73256 文本超出后隐藏设置会影响单元格基本属性设置
  REPORT-73256 文本超出后隐藏设置会影响单元格基本属性设置

designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java

@@ -79,6 +79,7 @@ public class CellOtherSetPane extends AbstractCellAttrPane {
 
     //文本超出时隐藏
     private UICheckBox textOverflowCheckBox;
+    private int curSelectedIndex;
     private UIComboBox showPartComboBox;
     private CardLayout showPartLayout;
     private JPanel showPartPane;
@@ -325,7 +326,16 @@ public class CellOtherSetPane extends AbstractCellAttrPane {
                         showPartLayout.show(showPartPane, "none");
                         showPartPane.setPreferredSize(new Dimension(0, 0));
                     }
+                    // 记录目前自动调整哪个被选中
+                    for (int i = 0; i < adjustRadioButtons.length; i++) {
+                        if (adjustRadioButtons[i].isSelected()) {
+                            curSelectedIndex = i;
+                            break;
+                        }
+                    }
                     noAutoRadioButton.setSelected(true);
+                } else {
+                    adjustRadioButtons[curSelectedIndex].setSelected(true);
                 }
             }
         });