From 6f210916d7f33f4d41ce3efa817d994699f9ad7c Mon Sep 17 00:00:00 2001 From: "Henry.Wang" Date: Thu, 23 Jul 2020 10:48:31 +0800 Subject: [PATCH 1/4] =?UTF-8?q?REPORT-35568=20=E5=8F=82=E6=95=B0=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=A4=9A=E4=B8=AA=E6=8E=A7?= =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E6=92=A4=E9=94=80=EF=BC=8C=E4=BC=9A=E5=87=BA?= =?UTF-8?q?=E7=8E=B0=E4=B8=80=E4=B8=AA=E8=93=9D=E8=89=B2=E7=9A=84=E6=A1=86?= =?UTF-8?q?=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/mainframe/JWorkBook.java | 1 + 1 file changed, 1 insertion(+) diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java b/designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java index ff52dac14..449ffc074 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java @@ -760,6 +760,7 @@ public class JWorkBook extends JTemplate { if (centerPane.isUpEditMode()) { if (hasParameterPane()) { parameterPane.populate(u.getApplyTarget()); + setAutoHeightForCenterPane(); DesignModuleFactory.getFormHierarchyPane().refreshRoot(); } } else { From 0b4d28c4c22971e956e37de33f86a680c1316bf2 Mon Sep 17 00:00:00 2001 From: "Henry.Wang" Date: Mon, 27 Jul 2020 14:49:36 +0800 Subject: [PATCH 2/4] =?UTF-8?q?REPORT-35568=20=E5=8F=82=E6=95=B0=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF=E6=B7=BB=E5=8A=A0=E5=A4=9A=E4=B8=AA=E6=8E=A7=E4=BB=B6?= =?UTF-8?q?=E6=92=A4=E9=94=80=E4=BC=9A=E5=87=BA=E7=8E=B0=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E8=93=9D=E8=89=B2=E7=9A=84=E6=A1=86=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/mainframe/JWorkBook.java | 1 + 1 file changed, 1 insertion(+) diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java b/designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java index 449ffc074..b68833f83 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java @@ -783,6 +783,7 @@ public class JWorkBook extends JTemplate { private void applyAll(WorkBookUndoState u) { if (hasParameterPane()) { parameterPane.populate(u.getApplyTarget()); + setAutoHeightForCenterPane(); DesignModuleFactory.getFormHierarchyPane().refreshRoot(); } //报表主体 From 975f4c6a3addac55a34eae4359e805c91930994e Mon Sep 17 00:00:00 2001 From: "Henry.Wang" Date: Mon, 27 Jul 2020 19:53:57 +0800 Subject: [PATCH 3/4] =?UTF-8?q?REPORT-35544=20=E5=9B=BD=E9=99=85=E5=8C=96-?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=88=B0=E9=9F=A9=E6=96=87=EF=BC=8C=E5=86=85?= =?UTF-8?q?=E7=BD=AE=E6=9C=8D=E5=8A=A1=E5=99=A8=E5=90=AF=E5=8A=A8=E7=9A=84?= =?UTF-8?q?=E6=97=B6=E5=80=99=EF=BC=8C=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/gui/iprogressbar/ProgressDialog.java | 5 +++++ .../fr/start/server/FineEmbedServerMonitor.java | 14 ++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/gui/iprogressbar/ProgressDialog.java b/designer-base/src/main/java/com/fr/design/gui/iprogressbar/ProgressDialog.java index e416083f7..6d10b48e5 100644 --- a/designer-base/src/main/java/com/fr/design/gui/iprogressbar/ProgressDialog.java +++ b/designer-base/src/main/java/com/fr/design/gui/iprogressbar/ProgressDialog.java @@ -96,4 +96,9 @@ public class ProgressDialog extends UIDialog { public void updateLoadingText(String text) { this.text.setText(text); } + + public void updateLoadingText(String text, FRFont font) { + this.text.setFont(font); + this.text.setText(text); + } } diff --git a/designer-base/src/main/java/com/fr/start/server/FineEmbedServerMonitor.java b/designer-base/src/main/java/com/fr/start/server/FineEmbedServerMonitor.java index 078372183..6bab19fde 100644 --- a/designer-base/src/main/java/com/fr/start/server/FineEmbedServerMonitor.java +++ b/designer-base/src/main/java/com/fr/start/server/FineEmbedServerMonitor.java @@ -7,7 +7,11 @@ import com.fr.event.Event; import com.fr.event.EventDispatcher; import com.fr.event.Listener; import com.fr.event.Null; +import com.fr.general.FRFont; +import com.fr.general.GeneralContext; +import javax.swing.plaf.ColorUIResource; +import java.util.Locale; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; @@ -86,8 +90,14 @@ public class FineEmbedServerMonitor { } if (!DesignerContext.getDesignerFrame().getProgressDialog().isVisible()) { DesignerContext.getDesignerFrame().showProgressDialog(); - DesignerContext.getDesignerFrame().getProgressDialog() - .updateLoadingText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Loading_Embed_Server")); + String text = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Loading_Embed_Server"); + //如果为韩文则改变字体 + if (GeneralContext.getLocale().equals(Locale.KOREA)) { + FRFont font = FRFont.getInstance().applySize(14).applyForeground(new ColorUIResource(333334)).applyName("Dialog"); + DesignerContext.getDesignerFrame().getProgressDialog().updateLoadingText(text, font); + } else { + DesignerContext.getDesignerFrame().getProgressDialog().updateLoadingText(text); + } } DesignerContext.getDesignerFrame().updateProgress(getProgress()); } From 4644b3d208f2b2739943a12327b042617f7e1867 Mon Sep 17 00:00:00 2001 From: "Henry.Wang" Date: Mon, 27 Jul 2020 19:57:42 +0800 Subject: [PATCH 4/4] =?UTF-8?q?REPORT-35568=20=E5=8F=82=E6=95=B0=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=A4=9A=E4=B8=AA=E6=8E=A7?= =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E6=92=A4=E9=94=80=EF=BC=8C=E4=BC=9A=E5=87=BA?= =?UTF-8?q?=E7=8E=B0=E4=B8=80=E4=B8=AA=E8=93=9D=E8=89=B2=E7=9A=84=E6=A1=86?= =?UTF-8?q?=E7=BA=BF=20=20=E6=92=A4=E5=9B=9E=E5=8F=A6=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/gui/iprogressbar/ProgressDialog.java | 5 ----- .../fr/start/server/FineEmbedServerMonitor.java | 14 ++------------ 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/gui/iprogressbar/ProgressDialog.java b/designer-base/src/main/java/com/fr/design/gui/iprogressbar/ProgressDialog.java index 6d10b48e5..e416083f7 100644 --- a/designer-base/src/main/java/com/fr/design/gui/iprogressbar/ProgressDialog.java +++ b/designer-base/src/main/java/com/fr/design/gui/iprogressbar/ProgressDialog.java @@ -96,9 +96,4 @@ public class ProgressDialog extends UIDialog { public void updateLoadingText(String text) { this.text.setText(text); } - - public void updateLoadingText(String text, FRFont font) { - this.text.setFont(font); - this.text.setText(text); - } } diff --git a/designer-base/src/main/java/com/fr/start/server/FineEmbedServerMonitor.java b/designer-base/src/main/java/com/fr/start/server/FineEmbedServerMonitor.java index 6bab19fde..078372183 100644 --- a/designer-base/src/main/java/com/fr/start/server/FineEmbedServerMonitor.java +++ b/designer-base/src/main/java/com/fr/start/server/FineEmbedServerMonitor.java @@ -7,11 +7,7 @@ import com.fr.event.Event; import com.fr.event.EventDispatcher; import com.fr.event.Listener; import com.fr.event.Null; -import com.fr.general.FRFont; -import com.fr.general.GeneralContext; -import javax.swing.plaf.ColorUIResource; -import java.util.Locale; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; @@ -90,14 +86,8 @@ public class FineEmbedServerMonitor { } if (!DesignerContext.getDesignerFrame().getProgressDialog().isVisible()) { DesignerContext.getDesignerFrame().showProgressDialog(); - String text = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Loading_Embed_Server"); - //如果为韩文则改变字体 - if (GeneralContext.getLocale().equals(Locale.KOREA)) { - FRFont font = FRFont.getInstance().applySize(14).applyForeground(new ColorUIResource(333334)).applyName("Dialog"); - DesignerContext.getDesignerFrame().getProgressDialog().updateLoadingText(text, font); - } else { - DesignerContext.getDesignerFrame().getProgressDialog().updateLoadingText(text); - } + DesignerContext.getDesignerFrame().getProgressDialog() + .updateLoadingText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Loading_Embed_Server")); } DesignerContext.getDesignerFrame().updateProgress(getProgress()); }