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 742629af01..4cddfea738 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
@@ -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);
                 }
             }
         });
diff --git a/designer-realize/src/main/java/com/fr/design/share/ui/generate/ShareMainPane.java b/designer-realize/src/main/java/com/fr/design/share/ui/generate/ShareMainPane.java
index 0518c6884f..70ec2b6f9c 100644
--- a/designer-realize/src/main/java/com/fr/design/share/ui/generate/ShareMainPane.java
+++ b/designer-realize/src/main/java/com/fr/design/share/ui/generate/ShareMainPane.java
@@ -660,7 +660,7 @@ public class ShareMainPane extends JPanel {
                     Toolkit.i18nText("Fine-Design_Basic_Error"), ERROR_MESSAGE, UIManager.getIcon("OptionPane.errorIcon"));
             return false;
         }
-        if (FileCommonUtils.isFileNameValid(name)) {
+        if (!FileCommonUtils.isFileNameValid(name)) {
             FineJOptionPane.showMessageDialog(
                     shareDialog,
                     Toolkit.i18nText("Fine-Design_Share_Generate_Failure_Illegal_Component_Name_Tip"),