From 567adaddb6c9a57eeb4424aa22bc991b427c14bb Mon Sep 17 00:00:00 2001
From: shine <zheng@fanruan.com>
Date: Thu, 1 Sep 2022 11:17:21 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-77649=20feat:fvs=E5=9B=BE=E8=A1=A8?=
 =?UTF-8?q?=E8=B6=85=E9=93=BE=E7=95=8C=E9=9D=A2populate=E4=B8=8Drefresh?=
 =?UTF-8?q?=E8=B6=85=E9=93=BE=E7=B1=BB=E5=9E=8B=EF=BC=8Cps=EF=BC=9Arefresh?=
 =?UTF-8?q?=E5=BA=94=E8=AF=A5=E9=83=BD=E6=B2=A1=E6=9C=89=E5=BF=85=E8=A6=81?=
 =?UTF-8?q?=20=E5=85=88=E5=8F=AA=E6=94=B9fvs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../component/VanChartHyperLinkPane.java      | 27 +++++++++++--------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartHyperLinkPane.java b/designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartHyperLinkPane.java
index f3a19a41e3..6e5b346a18 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartHyperLinkPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartHyperLinkPane.java
@@ -6,6 +6,7 @@ import com.fr.chart.web.ChartHyperPoplink;
 import com.fr.chart.web.ChartHyperRelateCellLink;
 import com.fr.chart.web.ChartHyperRelateFloatLink;
 import com.fr.design.ExtraDesignClassManager;
+import com.fr.design.base.mode.DesignModeContext;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.chart.javascript.ChartEmailPane;
 import com.fr.design.chart.series.SeriesCondition.impl.ChartHyperPoplinkPane;
@@ -78,14 +79,11 @@ public class VanChartHyperLinkPane extends VanChartUIListControlPane {
             constructor = creator.getUpdatePane().getConstructor(HashMap.class, boolean.class);
             return constructor.newInstance(getHyperLinkEditorMap(), false);
 
-        } catch (InstantiationException e) {
-            FineLoggerFactory.getLogger().error(e.getMessage(), e);
-        } catch (IllegalAccessException e) {
+        } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
         } catch (NoSuchMethodException e) {
+            FineLoggerFactory.getLogger().warn(e.getMessage(), e);
             return super.createPaneByCreators(creator);
-        } catch (InvocationTargetException e) {
-            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
         return null;
     }
@@ -144,9 +142,11 @@ public class VanChartHyperLinkPane extends VanChartUIListControlPane {
         return new NameJavaScriptGroup(res_array);
     }
 
-    public void populate(Plot plot) {
-        setPlot(plot);
-        HashMap paneMap = getHyperlinkMap(plot);
+    private void refreshNameableCreator() {
+        if (DesignModeContext.isDuchampMode()) {
+            return;
+        }
+        HashMap paneMap = getHyperlinkMap();
 
         //安装平台内打开插件时,添加相应按钮
         Set<HyperlinkProvider> providers = ExtraDesignClassManager.getInstance().getArray(HyperlinkProvider.XML_TAG);
@@ -166,6 +166,12 @@ public class VanChartHyperLinkPane extends VanChartUIListControlPane {
         }
 
         refreshNameableCreator(creators);
+    }
+
+    public void populate(Plot plot) {
+        setPlot(plot);
+
+        refreshNameableCreator();
 
         java.util.List<NameObject> nameObjects = new ArrayList<NameObject>();
 
@@ -174,8 +180,7 @@ public class VanChartHyperLinkPane extends VanChartUIListControlPane {
             NameJavaScript javaScript = nameGroup.getNameHyperlink(i);
             if (javaScript != null && javaScript.getJavaScript() != null) {
                 JavaScript script = javaScript.getJavaScript();
-                UIMenuNameableCreator uiMenuNameableCreator = new UIMenuNameableCreator(javaScript.getName(), script, getUseMap(paneMap, script.getClass()));
-                nameObjects.add(new NameObject(uiMenuNameableCreator.getName(), uiMenuNameableCreator.getObj()));
+                nameObjects.add(new NameObject(javaScript.getName(), script));
 
             }
         }
@@ -188,7 +193,7 @@ public class VanChartHyperLinkPane extends VanChartUIListControlPane {
         return plot.getHotHyperLink();
     }
 
-    protected HashMap getHyperlinkMap(Plot plot) {
+    protected HashMap getHyperlinkMap() {
         HashMap<Class, Class> map = new HashMap<Class, Class>();
 
         map.put(ReportletHyperlink.class, ReportletHyperlinkPane.class);