Merge pull request #1221 in DESIGN/design from ~KERRY/design_10.0:release/10.0 to release/10.0

* commit 'e6a9b4298e0b512a56b813489e181a4e34056376':
  REPORT-23181 && REPORT-23179 windows下保存失效
  REPORT-16531【自适应内置】名称优化不对，表单cpt都存在

designer-base/src/main/java/com/fr/design/report/fit/menupane/ReportFitAttrPane.java

@@ -50,7 +50,7 @@ public class ReportFitAttrPane extends BasicBeanPane<ReportFitAttr> {
      * @return 标题
      */
     protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Fit-Attr");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_PC_Element_Case_Fit_Attr");
     }
 
 }

designer-base/src/main/java/com/fr/design/report/fit/menupane/TemplateFitAttrPane.java

@@ -50,6 +50,6 @@ public class TemplateFitAttrPane extends BasicBeanPane<ReportFitAttr> {
      * @return 标题
      */
     protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Fit-Attr");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_PC_Fit_Attr");
     }
 }

designer-base/src/main/java/com/fr/file/FILEChooserPane.java

@@ -480,7 +480,9 @@ public class FILEChooserPane extends BasicPane {
                 Object ss = postfixComboBox.getSelectedItem();
                 if (ss instanceof ChooseFileFilter) {
                     setFILEFilter((ChooseFileFilter) ss);
-                    fileNameTextField.setText(calProperFileName(fileNameTextField.getText(), (ChooseFileFilter) ss));
+                    if (fileNameTextField.isShowing()) {
+                        fileNameTextField.setText(calProperFileName(fileNameTextField.getText(), (ChooseFileFilter) ss));
+                    }
                 } else {
                     setFILEFilter(null);
                 }