Pull request #2042: REPORT-37041 中文版设计器条件属性中超级链接和控件事件弹框尺寸发生变化

Merge in DESIGN/design from ~HENRY.WANG/design:release/10.0 to release/10.0

* commit '3aee824a90eff55de4cff4b9429a01e023fbfc60':
  REPORT-37041 中文版设计器条件属性中超级链接和控件事件弹框尺寸发生变化

designer-base/src/main/java/com/fr/design/javascript/JSContentPane.java

@@ -31,6 +31,7 @@ public class JSContentPane extends BasicPane {
     private RSyntaxTextArea contentTextArea;
     private UILabel funNameLabel;
     private AutoCompletion ac;
+    private static final Dimension FUNCTION_NAME_LABEL_SIZE = new Dimension(300, 80);
 
     private int titleWidth = 180;
 
@@ -68,7 +69,7 @@ public class JSContentPane extends BasicPane {
         JPanel jsParaPane = new JPanel(new BorderLayout(4, 4));
         jsParaPane.setPreferredSize(new Dimension(300, 80));
         UIScrollPane scrollPane = new UIScrollPane(funNameLabel);
-        scrollPane.setPreferredSize(new Dimension(400, 80));
+        scrollPane.setPreferredSize(FUNCTION_NAME_LABEL_SIZE);
         scrollPane.setBorder(new UIRoundedBorder(UIConstants.TITLED_BORDER_COLOR, 1, UIConstants.ARC));
         jsParaPane.add(scrollPane, BorderLayout.WEST);
         jsParaPane.add(label, BorderLayout.EAST);

designer-realize/src/main/java/com/fr/design/condition/HyperlinkPane.java

@@ -15,7 +15,6 @@ import com.fr.report.cell.cellattr.highlight.HighlightAction;
 import com.fr.report.cell.cellattr.highlight.HyperlinkHighlightAction;
 
 import javax.swing.*;
-import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
@@ -31,7 +30,6 @@ public class HyperlinkPane extends ConditionAttrSingleConditionPane<HighlightAct
     protected UIButton hyperlinkButton;
     protected HyperlinkGroupPane pane;
     protected BasicDialog dialog;
-    private static final Dimension WINDOW_CUSTOM_SIZE = new Dimension(730, 600);
 
     public HyperlinkPane(final ConditionAttributesPane conditionAttributesPane) {
         super(conditionAttributesPane);
@@ -41,7 +39,7 @@ public class HyperlinkPane extends ConditionAttrSingleConditionPane<HighlightAct
                 NameJavaScriptGroup nameHyperlinks = jsGroup;
                 pane = DesignerContext.getDesignerFrame().getSelectedJTemplate().getHyperLinkPaneNoPop(HyperlinkGroupPaneActionImpl.getInstance());
                 pane.populate(nameHyperlinks);
-                dialog = pane.showWindowWithCustomSize(SwingUtilities.getWindowAncestor(conditionAttributesPane), null, WINDOW_CUSTOM_SIZE);
+                dialog = pane.showWindow(SwingUtilities.getWindowAncestor(conditionAttributesPane));
                 dialog.addDialogActionListener(new DialogActionAdapter() {
                     @Override
                     public void doOk() {

designer-realize/src/main/java/com/fr/design/condition/WidgetHighlightPane.java

@@ -12,12 +12,10 @@ import com.fr.design.widget.WidgetManageCardPane;
 import com.fr.design.widget.WidgetPane;
 import com.fr.form.ui.*;
 
-import com.fr.form.ui.TextArea;
 import com.fr.report.cell.cellattr.highlight.HighlightAction;
 import com.fr.report.cell.cellattr.highlight.WidgetHighlightAction;
 
 import javax.swing.*;
-import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
@@ -29,7 +27,6 @@ import java.awt.event.ActionListener;
 public class WidgetHighlightPane extends ConditionAttrSingleConditionPane<HighlightAction> {
     private static final int DIALOG_WIDTH = 700;
     private static final int DIALOG_HEIGHT = 400;
-    private static final Dimension WINDOW_CUSTOM_SIZE = new Dimension(720, 600);
 
     private Widget widget;
     private UIComboBox box;
@@ -48,7 +45,8 @@ public class WidgetHighlightPane extends ConditionAttrSingleConditionPane<Highli
                     }
                 };
                 widgetPane.populate(widget);
-                BasicDialog dialog = widgetPane.showWindowWithCustomSize(SwingUtilities.getWindowAncestor(conditionAttributesPane), null, WINDOW_CUSTOM_SIZE);
+                BasicDialog dialog = widgetPane.showWindow(
+                        SwingUtilities.getWindowAncestor(conditionAttributesPane));
                 dialog.addDialogActionListener(new DialogActionAdapter() {
                     public void doOk() {
                         widget = widgetPane.update();