From 1b9c30f9612d2bb831cde74184b9b35a53500dbd Mon Sep 17 00:00:00 2001
From: plough <plough@finereport.com>
Date: Tue, 12 Sep 2017 16:54:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=EF=BC=8Ccpt?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=88=87=E6=8D=A2=E5=88=B0=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?-=E8=B6=85=E7=BA=A7=E9=93=BE=E6=8E=A5=E9=9D=A2=E6=9D=BF?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/mainframe/form/FormElementCaseDesigner.java | 4 ++--
 .../com/fr/design/mainframe/form/FormECDesignerProvider.java  | 4 +++-
 designer_form/src/com/fr/design/mainframe/JForm.java          | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/designer/src/com/fr/design/mainframe/form/FormElementCaseDesigner.java b/designer/src/com/fr/design/mainframe/form/FormElementCaseDesigner.java
index a93604dcb3..103a695113 100644
--- a/designer/src/com/fr/design/mainframe/form/FormElementCaseDesigner.java
+++ b/designer/src/com/fr/design/mainframe/form/FormElementCaseDesigner.java
@@ -229,8 +229,8 @@ public class FormElementCaseDesigner<T extends FormElementCaseProvider, E extend
         return conditionAttributesGroupPane;
     }
 
-    public JPanel getHyperlinkPane() {
-        return DesignerContext.getDesignerFrame().getSelectedJTemplate().getHyperLinkPane(HyperlinkGroupPaneActionImpl.getInstance());
+    public JPanel getHyperlinkPane(JTemplate jt) {
+        return jt.getHyperLinkPane(HyperlinkGroupPaneActionImpl.getInstance());
     }
 
 
diff --git a/designer_base/src/com/fr/design/mainframe/form/FormECDesignerProvider.java b/designer_base/src/com/fr/design/mainframe/form/FormECDesignerProvider.java
index 81ac3e7fbc..525601fef1 100644
--- a/designer_base/src/com/fr/design/mainframe/form/FormECDesignerProvider.java
+++ b/designer_base/src/com/fr/design/mainframe/form/FormECDesignerProvider.java
@@ -6,6 +6,7 @@ import java.awt.image.BufferedImage;
 import javax.swing.JComponent;
 
 import com.fr.design.designer.TargetComponent;
+import com.fr.design.mainframe.JTemplate;
 import com.fr.design.menu.MenuDef;
 import com.fr.design.menu.ShortCut;
 import com.fr.design.menu.ToolBarDef;
@@ -70,9 +71,10 @@ public interface FormECDesignerProvider {
 
     /**
      *   超级链接面板
+     *   @param jt 当前模板（JForm）
      * @return    属性面板
      */
-    public JComponent getHyperlinkPane();
+    public JComponent getHyperlinkPane(JTemplate jt);
 
     /**
      *   超级链接面板
diff --git a/designer_form/src/com/fr/design/mainframe/JForm.java b/designer_form/src/com/fr/design/mainframe/JForm.java
index 7504a32557..2913df00af 100644
--- a/designer_form/src/com/fr/design/mainframe/JForm.java
+++ b/designer_form/src/com/fr/design/mainframe/JForm.java
@@ -683,7 +683,7 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm {
             EastRegionContainerPane.getInstance().replaceCellAttrPane(elementCaseDesign.getEastDownPane());
             EastRegionContainerPane.getInstance().replaceCellElementPane(elementCaseDesign.getEastUpPane());
             EastRegionContainerPane.getInstance().replaceConditionAttrPane(elementCaseDesign.getConditionAttrPane());
-            EastRegionContainerPane.getInstance().replaceHyperlinkPane(elementCaseDesign.getHyperlinkPane());
+            EastRegionContainerPane.getInstance().replaceHyperlinkPane(elementCaseDesign.getHyperlinkPane(this));
             return;
         }