Browse Source

Merge pull request #1933 in DESIGN/design from bugfix/10.0 to feature/10.0

* commit '769c07987ffc86cebad2f483f601c7434ea7e68c':
  REPORT-29515 修改默认弹窗窗体宽度,由660*600改成700*630,修改height是因为只改width,看起来不太好看
  无jira任务 单元测试依赖
research/11.0
superman 4 years ago
parent
commit
eb267b2c62
  1. 1
      build.gradle
  2. 7
      designer-realize/src/main/java/com/fr/design/actions/server/ServerConfigManagerAction.java

1
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'

7
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() {

Loading…
Cancel
Save