From 71dcfae35efc682ec0f2d5aacfd8750e2ae32393 Mon Sep 17 00:00:00 2001
From: kerry <kerry@finereport.com>
Date: Thu, 14 Jun 2018 14:37:52 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-8710=20&&=20REPORT-8676=09=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7bug10.0=E4=BC=A0=E4=B8=80=E4=BB=BD;=20=20=E6=8F=92?=
 =?UTF-8?q?=E4=BB=B6=E7=AE=A1=E7=90=8610.0=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 designer-base/src/com/fr/design/extra/WebViewDlgHelper.java  | 4 ++--
 .../fr/design/mainframe/form/FormElementCaseDesigner.java    | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/designer-base/src/com/fr/design/extra/WebViewDlgHelper.java b/designer-base/src/com/fr/design/extra/WebViewDlgHelper.java
index 0249c0b1e..4ef012d09 100644
--- a/designer-base/src/com/fr/design/extra/WebViewDlgHelper.java
+++ b/designer-base/src/com/fr/design/extra/WebViewDlgHelper.java
@@ -72,10 +72,12 @@ public class WebViewDlgHelper {
                 if (rv == JOptionPane.OK_OPTION) {
                     downloadShopScripts(SHOP_SCRIPTS);
                 }
+                return;
             }
             String jar_version = PluginStoreConstants.getInstance().getProps(ENV_VERSION, StringUtils.EMPTY);
             if (ComparatorUtils.equals(jar_version, ProductConstants.VERSION)) {
                 updateShopScripts(SHOP_SCRIPTS);
+                showPluginDlg();
             } else {
                 int rv = JOptionPane.showConfirmDialog(
                         null,
@@ -281,7 +283,6 @@ public class WebViewDlgHelper {
                         IOUtils.unzip(new File(StableUtils.pathJoin(PluginConstants.DOWNLOAD_PATH, PluginConstants.TEMP_FILE)), installHome);
                         PluginStoreConstants.refreshProps();    // 下载完刷新一下版本号等
                         JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer-Plugin_Shop_Installed"), Inter.getLocText("FR-Designer_Tooltips"), JOptionPane.INFORMATION_MESSAGE);
-                        showPluginDlg();
                     }
                 } catch (InterruptedException | ExecutionException e) {
                     FineLoggerFactory.getLogger().error(e.getMessage(), e);
@@ -314,7 +315,6 @@ public class WebViewDlgHelper {
                         }
                     }
                 }
-                showPluginDlg();
                 return null;
             }
         }.execute();
diff --git a/designer-realize/src/com/fr/design/mainframe/form/FormElementCaseDesigner.java b/designer-realize/src/com/fr/design/mainframe/form/FormElementCaseDesigner.java
index b501c81d9..bbe6bc466 100644
--- a/designer-realize/src/com/fr/design/mainframe/form/FormElementCaseDesigner.java
+++ b/designer-realize/src/com/fr/design/mainframe/form/FormElementCaseDesigner.java
@@ -12,6 +12,7 @@ import com.fr.design.designer.EditingState;
 import com.fr.design.designer.TargetComponent;
 import com.fr.design.event.TargetModifiedEvent;
 import com.fr.design.event.TargetModifiedListener;
+import com.fr.design.gui.frpane.HyperlinkGroupPane;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.AuthorityEditPane;
 import com.fr.design.mainframe.ElementCasePane;
@@ -260,7 +261,9 @@ public class FormElementCaseDesigner<T extends FormElementCaseProvider, E extend
 
     @Override
     public JPanel getHyperlinkPane(JTemplate jt) {
-        return jt.getHyperLinkPane(HyperlinkGroupPaneActionImpl.getInstance());
+        HyperlinkGroupPane hyperlinkGroupPane = jt.getHyperLinkPane(HyperlinkGroupPaneActionImpl.getInstance());
+        hyperlinkGroupPane.populate(elementCasePane);
+        return  hyperlinkGroupPane;
     }