Pull request #1944: REPORT-29562 【国际化】条件属性中超级链接和控件事件文字展示不全

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

* commit '0701d7b397579e53228631c076ac7522cbecae7f':
  REPORT-29562 【国际化】条件属性中超级链接和控件事件文字展示不全 修改import
  REPORT-29562 【国际化】条件属性中超级链接和控件事件文字展示不全

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

@@ -15,6 +15,7 @@ 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;
 
@@ -30,6 +31,7 @@ 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);
@@ -39,7 +41,7 @@ public class HyperlinkPane extends ConditionAttrSingleConditionPane<HighlightAct
                 NameJavaScriptGroup nameHyperlinks = jsGroup;
                 pane = DesignerContext.getDesignerFrame().getSelectedJTemplate().getHyperLinkPaneNoPop(HyperlinkGroupPaneActionImpl.getInstance());
                 pane.populate(nameHyperlinks);
-                dialog = pane.showWindow(SwingUtilities.getWindowAncestor(conditionAttributesPane));
+                dialog = pane.showWindowWithCustomSize(SwingUtilities.getWindowAncestor(conditionAttributesPane), null, WINDOW_CUSTOM_SIZE);
                 dialog.addDialogActionListener(new DialogActionAdapter() {
                     @Override
                     public void doOk() {

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

@@ -12,10 +12,12 @@ 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;
 
@@ -27,6 +29,7 @@ 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;
@@ -45,8 +48,7 @@ public class WidgetHighlightPane extends ConditionAttrSingleConditionPane<Highli
                     }
                 };
                 widgetPane.populate(widget);
-                BasicDialog dialog = widgetPane.showWindow(
+                BasicDialog dialog = widgetPane.showWindowWithCustomSize(SwingUtilities.getWindowAncestor(conditionAttributesPane), null, WINDOW_CUSTOM_SIZE);
-                        SwingUtilities.getWindowAncestor(conditionAttributesPane));
                 dialog.addDialogActionListener(new DialogActionAdapter() {
                     public void doOk() {
                         widget = widgetPane.update();