Merge pull request #128 in DESIGN/design from ~KERRY/design_10.0:feature/10.0 to feature/10.0

* commit '1c253142ce01dd1e147b7d155fdf1aadb1658803':
  先预留一个更新的Key和脚本下载的地址key
  REPORT-8710 && REPORT-8676	客户bug10.0传一份;  插件管理10.0升级

designer-base/src/com/fr/design/extra/PluginUtils.java

@@ -109,7 +109,7 @@ public class PluginUtils {
     private static String getDownloadPath(String id) throws Exception {
         HashMap<String, String> map = new HashMap<String, String>();
         map.put("id", id);
-        HttpClient httpClient = new HttpClient(SiteCenter.getInstance().acquireUrlByKind("shop.plugin.scripts"));
+        HttpClient httpClient = new HttpClient(SiteCenter.getInstance().acquireUrlByKind("shop.plugin.scripts_10"));
         httpClient.asGet();
         String resText = httpClient.getResponseText();
         JSONObject resultJSONObject = new JSONObject(resText);

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);
@@ -295,7 +296,7 @@ public class WebViewDlgHelper {
         new SwingWorker<Void, Void>() {
             @Override
             protected Void doInBackground() throws Exception {
-                HttpClient httpClient = new HttpClient(SiteCenter.getInstance().acquireUrlByKind("shop.plugin.cv") + "&version=" + PluginStoreConstants.getInstance().getProps("VERSION"));
+                HttpClient httpClient = new HttpClient(SiteCenter.getInstance().acquireUrlByKind("shop.plugin.cv_10") + "&version=" + PluginStoreConstants.getInstance().getProps("VERSION"));
                 httpClient.asGet();
                 if (httpClient.getResponseCode() == HttpURLConnection.HTTP_OK) {
                     String text = httpClient.getResponseText();
@@ -314,7 +315,6 @@ public class WebViewDlgHelper {
                         }
                     }
                 }
-                showPluginDlg();
                 return null;
             }
         }.execute();

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;
     }