From 07bb4980762755d68955225c93d2255fbfe4dde7 Mon Sep 17 00:00:00 2001
From: vito <vito@finereport.com>
Date: Tue, 28 Jul 2020 17:27:31 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=20=E5=8D=95?=
 =?UTF-8?q?=E5=85=83=E6=B5=8B=E8=AF=95=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle | 1 -
 1 file changed, 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 3118ed8a9..6446da404 100644
--- a/build.gradle
+++ b/build.gradle
@@ -58,7 +58,6 @@ allprojects {
 
     dependencies {
         implementation 'com.fr.third:jxbrowser:6.23'
-        implementation 'com.fr.third:jxbrowser-swing:6.23'
         implementation 'com.fr.third:jxbrowser-mac:6.23'
         implementation 'com.fr.third:jxbrowser-win64:6.23'
         implementation 'com.fr.third.server:servlet-api:3.0'

From 93ff2c993f6ab254b944d41ed6dbcdfa00b74287 Mon Sep 17 00:00:00 2001
From: "Yuan.Wang" <1536296691@qq.com>
Date: Tue, 28 Jul 2020 17:29:42 +0800
Subject: [PATCH 2/2] =?UTF-8?q?REPORT-29515=20=E4=BF=AE=E6=94=B9=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=BC=B9=E7=AA=97=E7=AA=97=E4=BD=93=E5=AE=BD=E5=BA=A6?=
 =?UTF-8?q?=EF=BC=8C=E7=94=B1660*600=E6=94=B9=E6=88=90700*630=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9height=E6=98=AF=E5=9B=A0=E4=B8=BA=E5=8F=AA?=
 =?UTF-8?q?=E6=94=B9width=EF=BC=8C=E7=9C=8B=E8=B5=B7=E6=9D=A5=E4=B8=8D?=
 =?UTF-8?q?=E5=A4=AA=E5=A5=BD=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/actions/server/ServerConfigManagerAction.java   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/designer-realize/src/main/java/com/fr/design/actions/server/ServerConfigManagerAction.java b/designer-realize/src/main/java/com/fr/design/actions/server/ServerConfigManagerAction.java
index f25c6da3d..a75fa5d26 100644
--- a/designer-realize/src/main/java/com/fr/design/actions/server/ServerConfigManagerAction.java
+++ b/designer-realize/src/main/java/com/fr/design/actions/server/ServerConfigManagerAction.java
@@ -18,12 +18,15 @@ import com.fr.transaction.Worker;
 import com.fr.web.attr.ReportWebAttr;
 
 import javax.swing.*;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 
 /**
  * Server Config Manager
  */
 public class ServerConfigManagerAction extends UpdateAction {
+    public static final Dimension DEFAULT = new Dimension(700, 630);
+
     public ServerConfigManagerAction() {
         this.setMenuKeySet(SERVER_CONFIG_MANAGER);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
@@ -48,8 +51,8 @@ public class ServerConfigManagerAction extends UpdateAction {
             }
         };
 
-        final BasicDialog editReportServerParameterDialog = editReportServerParameterPane.showWindow(
-                DesignerContext.getDesignerFrame()
+        final BasicDialog editReportServerParameterDialog = editReportServerParameterPane.showWindowWithCustomSize(
+                DesignerContext.getDesignerFrame(), null,  DEFAULT
         );
 
         editReportServerParameterDialog.addDialogActionListener(new DialogActionAdapter() {