From 95afad2ff8af399b852a732f58ddf1977c514c33 Mon Sep 17 00:00:00 2001 From: kerry Date: Wed, 23 Oct 2019 14:38:07 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-16531=E3=80=90=E8=87=AA=E9=80=82?= =?UTF-8?q?=E5=BA=94=E5=86=85=E7=BD=AE=E3=80=91=E5=90=8D=E7=A7=B0=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E4=B8=8D=E5=AF=B9=EF=BC=8C=E8=A1=A8=E5=8D=95cpt?= =?UTF-8?q?=E9=83=BD=E5=AD=98=E5=9C=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/report/fit/menupane/ReportFitAttrPane.java | 4 ++-- .../fr/design/report/fit/menupane/TemplateFitAttrPane.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/report/fit/menupane/ReportFitAttrPane.java b/designer-base/src/main/java/com/fr/design/report/fit/menupane/ReportFitAttrPane.java index 55e11e9fd2..3381df3e46 100644 --- a/designer-base/src/main/java/com/fr/design/report/fit/menupane/ReportFitAttrPane.java +++ b/designer-base/src/main/java/com/fr/design/report/fit/menupane/ReportFitAttrPane.java @@ -50,7 +50,7 @@ public class ReportFitAttrPane extends BasicBeanPane { * @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"); } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/report/fit/menupane/TemplateFitAttrPane.java b/designer-base/src/main/java/com/fr/design/report/fit/menupane/TemplateFitAttrPane.java index 01b3196f5d..66673fc5f5 100644 --- a/designer-base/src/main/java/com/fr/design/report/fit/menupane/TemplateFitAttrPane.java +++ b/designer-base/src/main/java/com/fr/design/report/fit/menupane/TemplateFitAttrPane.java @@ -50,6 +50,6 @@ public class TemplateFitAttrPane extends BasicBeanPane { * @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"); } } From e6a9b4298e0b512a56b813489e181a4e34056376 Mon Sep 17 00:00:00 2001 From: kerry Date: Thu, 24 Oct 2019 10:01:13 +0800 Subject: [PATCH 2/2] =?UTF-8?q?REPORT-23181=20&&=20REPORT-23179=20windows?= =?UTF-8?q?=E4=B8=8B=E4=BF=9D=E5=AD=98=E5=A4=B1=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer-base/src/main/java/com/fr/file/FILEChooserPane.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/file/FILEChooserPane.java b/designer-base/src/main/java/com/fr/file/FILEChooserPane.java index b938845380..08c16fd178 100644 --- a/designer-base/src/main/java/com/fr/file/FILEChooserPane.java +++ b/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); }