From 7e6c990c72ef50bd70425629a4e3b54d8b82f41e Mon Sep 17 00:00:00 2001
From: mengao <283296419@qq.com>
Date: Mon, 25 Sep 2017 09:05:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=84=E5=90=88=E5=9B=BE?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=82=B9=E6=8F=90=E7=A4=BA=EF=BC=8C=E8=BD=AE?=
 =?UTF-8?q?=E6=92=AD=E8=AE=BE=E7=BD=AE=E9=9D=A2=E6=9D=BF=E5=9C=A8=E5=9B=BE?=
 =?UTF-8?q?=E8=A1=A8=E8=B6=85=E9=93=BE=E4=B8=AD=E7=9A=84=E5=BC=B9=E5=87=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mainframe/chart/gui/ChartTypeButtonPane.java       | 10 ++++++++--
 .../plugin/chart/designer/other/AutoRefreshPane.java   |  3 ++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java
index 3710dcd52..dfd06f08b 100644
--- a/designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java
+++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java
@@ -23,7 +23,13 @@ import com.fr.stable.StringUtils;
 
 import javax.swing.*;
 import java.awt.*;
-import java.awt.event.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
 import java.awt.geom.Rectangle2D;
 import java.awt.image.BufferedImage;
 import java.util.ArrayList;
@@ -150,7 +156,7 @@ public class ChartTypeButtonPane extends BasicBeanPane<ChartCollection> implemen
             UIMenuNameableCreator ui = configCreator.clone();
             final BasicBeanPane pane = ui.getPane();
             pane.populateBean(editingCollection);
-            UIDialog dialog = pane.showUnsizedWindow(SwingUtilities.getWindowAncestor(new JPanel()), new DialogActionListener() {
+            UIDialog dialog = pane.showUnsizedWindow(SwingUtilities.getWindowAncestor(parent), new DialogActionListener() {
                 @Override
                 public void doOk() {
                     pane.updateBean(editingCollection);
diff --git a/designer_chart/src/com/fr/plugin/chart/designer/other/AutoRefreshPane.java b/designer_chart/src/com/fr/plugin/chart/designer/other/AutoRefreshPane.java
index d625b95c8..386a35378 100644
--- a/designer_chart/src/com/fr/plugin/chart/designer/other/AutoRefreshPane.java
+++ b/designer_chart/src/com/fr/plugin/chart/designer/other/AutoRefreshPane.java
@@ -126,7 +126,7 @@ public class AutoRefreshPane extends BasicBeanPane<RefreshMoreLabel> {
 
                 final VanChartPlotTooltipPane pane = PlotFactory.createPlotRefreshTooltipPane(chart.getPlot());
                 pane.populate(chart.getRefreshMoreLabel().getAttrTooltip());
-                UIDialog dialog = pane.showUnsizedWindow(SwingUtilities.getWindowAncestor(new JPanel()), new DialogActionListener() {
+                UIDialog dialog = pane.showUnsizedWindow(SwingUtilities.getWindowAncestor(contentPane), new DialogActionListener() {
                     @Override
                     public void doOk() {
 
@@ -138,6 +138,7 @@ public class AutoRefreshPane extends BasicBeanPane<RefreshMoreLabel> {
 
                     }
                 });
+                dialog.setModal(true);
                 dialog.setVisible(true);
             }
         });