From b8f22b901def58d22a472f38ada25b663afcc3b8 Mon Sep 17 00:00:00 2001
From: "Henry.Wang" <Henry.Wang@fanruan.com>
Date: Wed, 29 Jul 2020 18:32:43 +0800
Subject: [PATCH 1/2] =?UTF-8?q?REPORT-29562=20=E3=80=90=E5=9B=BD=E9=99=85?=
 =?UTF-8?q?=E5=8C=96=E3=80=91=E6=9D=A1=E4=BB=B6=E5=B1=9E=E6=80=A7=E4=B8=AD?=
 =?UTF-8?q?=E8=B6=85=E7=BA=A7=E9=93=BE=E6=8E=A5=E5=92=8C=E6=8E=A7=E4=BB=B6?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E6=96=87=E5=AD=97=E5=B1=95=E7=A4=BA=E4=B8=8D?=
 =?UTF-8?q?=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/fr/design/condition/HyperlinkPane.java    | 4 +++-
 .../java/com/fr/design/condition/WidgetHighlightPane.java   | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/designer-realize/src/main/java/com/fr/design/condition/HyperlinkPane.java b/designer-realize/src/main/java/com/fr/design/condition/HyperlinkPane.java
index 643ad7890..594d2ed9c 100644
--- a/designer-realize/src/main/java/com/fr/design/condition/HyperlinkPane.java
+++ b/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.*;
 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() {
diff --git a/designer-realize/src/main/java/com/fr/design/condition/WidgetHighlightPane.java b/designer-realize/src/main/java/com/fr/design/condition/WidgetHighlightPane.java
index 6f8586838..afb86978f 100644
--- a/designer-realize/src/main/java/com/fr/design/condition/WidgetHighlightPane.java
+++ b/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(
-                        SwingUtilities.getWindowAncestor(conditionAttributesPane));
+                BasicDialog dialog = widgetPane.showWindowWithCustomSize(SwingUtilities.getWindowAncestor(conditionAttributesPane), null, WINDOW_CUSTOM_SIZE);
                 dialog.addDialogActionListener(new DialogActionAdapter() {
                     public void doOk() {
                         widget = widgetPane.update();

From 0701d7b397579e53228631c076ac7522cbecae7f Mon Sep 17 00:00:00 2001
From: "Henry.Wang" <Henry.Wang@fanruan.com>
Date: Wed, 29 Jul 2020 19:24:19 +0800
Subject: [PATCH 2/2] =?UTF-8?q?REPORT-29562=20=E3=80=90=E5=9B=BD=E9=99=85?=
 =?UTF-8?q?=E5=8C=96=E3=80=91=E6=9D=A1=E4=BB=B6=E5=B1=9E=E6=80=A7=E4=B8=AD?=
 =?UTF-8?q?=E8=B6=85=E7=BA=A7=E9=93=BE=E6=8E=A5=E5=92=8C=E6=8E=A7=E4=BB=B6?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E6=96=87=E5=AD=97=E5=B1=95=E7=A4=BA=E4=B8=8D?=
 =?UTF-8?q?=E5=85=A8=20=E4=BF=AE=E6=94=B9import?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/fr/design/condition/HyperlinkPane.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer-realize/src/main/java/com/fr/design/condition/HyperlinkPane.java b/designer-realize/src/main/java/com/fr/design/condition/HyperlinkPane.java
index 594d2ed9c..1df652a84 100644
--- a/designer-realize/src/main/java/com/fr/design/condition/HyperlinkPane.java
+++ b/designer-realize/src/main/java/com/fr/design/condition/HyperlinkPane.java
@@ -15,7 +15,7 @@ import com.fr.report.cell.cellattr.highlight.HighlightAction;
 import com.fr.report.cell.cellattr.highlight.HyperlinkHighlightAction;
 
 import javax.swing.*;
-import java.awt.*;
+import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;