From 71dcfae35efc682ec0f2d5aacfd8750e2ae32393 Mon Sep 17 00:00:00 2001 From: kerry Date: Thu, 14 Jun 2018 14:37:52 +0800 Subject: [PATCH 1/3] =?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 Date: Thu, 14 Jun 2018 14:50:21 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=85=88=E9=A2=84=E7=95=99=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E6=9B=B4=E6=96=B0=E7=9A=84Key=E5=92=8C=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=E4=B8=8B=E8=BD=BD=E7=9A=84=E5=9C=B0=E5=9D=80key?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer-base/src/com/fr/design/extra/PluginUtils.java | 2 +- designer-base/src/com/fr/design/extra/WebViewDlgHelper.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/designer-base/src/com/fr/design/extra/PluginUtils.java b/designer-base/src/com/fr/design/extra/PluginUtils.java index 2c684fad0..781a7167a 100644 --- a/designer-base/src/com/fr/design/extra/PluginUtils.java +++ b/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 map = new HashMap(); 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); diff --git a/designer-base/src/com/fr/design/extra/WebViewDlgHelper.java b/designer-base/src/com/fr/design/extra/WebViewDlgHelper.java index 4ef012d09..d63e2075e 100644 --- a/designer-base/src/com/fr/design/extra/WebViewDlgHelper.java +++ b/designer-base/src/com/fr/design/extra/WebViewDlgHelper.java @@ -296,7 +296,7 @@ public class WebViewDlgHelper { new SwingWorker() { @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(); From dda807cc9bef3afa3ac1cdf91abb703fcd824c56 Mon Sep 17 00:00:00 2001 From: "yaoh.wu" Date: Thu, 14 Jun 2018 14:51:38 +0800 Subject: [PATCH 3/3] =?UTF-8?q?REPORT-8603=209=20=E8=B6=85=E9=93=BE?= =?UTF-8?q?=E9=80=89=E4=B8=8D=E5=88=B0=E6=96=B0=E5=A2=9E=E7=9A=84=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/FormHyperlinkNorthPane.java | 86 ++++++++++--------- 1 file changed, 45 insertions(+), 41 deletions(-) diff --git a/designer-chart/src/com/fr/design/chart/series/SeriesCondition/impl/FormHyperlinkNorthPane.java b/designer-chart/src/com/fr/design/chart/series/SeriesCondition/impl/FormHyperlinkNorthPane.java index ebaf84e46..f5f3856de 100644 --- a/designer-chart/src/com/fr/design/chart/series/SeriesCondition/impl/FormHyperlinkNorthPane.java +++ b/designer-chart/src/com/fr/design/chart/series/SeriesCondition/impl/FormHyperlinkNorthPane.java @@ -1,13 +1,6 @@ package com.fr.design.chart.series.SeriesCondition.impl; -import java.awt.BorderLayout; -import java.awt.Component; - -import javax.swing.DefaultListCellRenderer; -import javax.swing.JList; -import javax.swing.JPanel; - import com.fr.design.DesignModelAdapter; import com.fr.design.beans.BasicBeanPane; import com.fr.design.gui.icombobox.UIComboBox; @@ -22,17 +15,26 @@ import com.fr.general.Inter; import com.fr.js.FormHyperlinkProvider; import com.fr.stable.bridge.StableFactory; +import javax.swing.DefaultComboBoxModel; +import javax.swing.DefaultListCellRenderer; +import javax.swing.JPanel; +import java.awt.BorderLayout; +import java.awt.Component; + /** - + * Created with IntelliJ IDEA. - + * User: zx - + * Date: 14-8-6 - + * Time: 下午2:53 - + */ -public class FormHyperlinkNorthPane extends BasicBeanPane { + * + * Created with IntelliJ IDEA. + * + * User: zx + * + * Date: 14-8-6 + * + * Time: 下午2:53 + * + + * + * @author zx + */ +public class FormHyperlinkNorthPane extends BasicBeanPane { private UITextField itemNameTextField; private boolean needRenamePane = false; - private Widget[] formHyperlinkEditors; + private Widget[] formHyperlinkEditors; private UIComboBox targetFrameComboBox; public FormHyperlinkNorthPane(boolean needRenamePane) { @@ -47,21 +49,16 @@ public class FormHyperlinkNorthPane extends BasicBeanPane