From 024e2fb543c172a0828872777a9a74af042bbd1d Mon Sep 17 00:00:00 2001
From: "Mata.Li" <Mata.Li@fanruan.com>
Date: Wed, 20 Jun 2018 16:13:41 +0800
Subject: [PATCH] REPORT-8709 and REPORT-8763

---
 .../src/com/fr/design/ChartTypeInterfaceManager.java |  1 -
 .../com/fr/design/mainframe/FormParaWidgetPane.java  | 12 +++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/designer-chart/src/com/fr/design/ChartTypeInterfaceManager.java b/designer-chart/src/com/fr/design/ChartTypeInterfaceManager.java
index 010c5f812..23d77a89b 100644
--- a/designer-chart/src/com/fr/design/ChartTypeInterfaceManager.java
+++ b/designer-chart/src/com/fr/design/ChartTypeInterfaceManager.java
@@ -116,7 +116,6 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
     private static Map<String, String> idAndPriorityMap = new HashMap<String, String>();
 
     public synchronized static ChartTypeInterfaceManager getInstance() {
-        DesignModuleFactory.registerExtraWidgetOptions(initWidgetOption());
         return classManager;
     }
 
diff --git a/designer-form/src/com/fr/design/mainframe/FormParaWidgetPane.java b/designer-form/src/com/fr/design/mainframe/FormParaWidgetPane.java
index 0cb48eed8..d5c597265 100644
--- a/designer-form/src/com/fr/design/mainframe/FormParaWidgetPane.java
+++ b/designer-form/src/com/fr/design/mainframe/FormParaWidgetPane.java
@@ -317,9 +317,15 @@ public class FormParaWidgetPane extends JPanel {
             @Override
             public void mouseClicked(MouseEvent e) {
                 initWidgetTypePopUp();
-                widgetTypePopupMenu.show(FormParaWidgetPane.this,
-                        (int) jSeparatorLayout.getLocation().getX() + BORDER,
-                        (int) jSeparatorLayout.getLocation().getY());
+                if(jSeparatorChart != null) {
+                    widgetTypePopupMenu.show(FormParaWidgetPane.this,
+                            (int) jSeparatorChart.getLocation().getX() + BORDER,
+                            (int) jSeparatorChart.getLocation().getY());
+                }else{
+                    widgetTypePopupMenu.show(FormParaWidgetPane.this,
+                            (int) jSeparatorLayout.getLocation().getX() + BORDER,
+                            (int) jSeparatorLayout.getLocation().getY());
+                }
             }
 
         });