From b41d851f397caddeb036a4a06c3c4fe799e2f3b6 Mon Sep 17 00:00:00 2001
From: rinoux <rinoux@foxmail.com>
Date: Wed, 15 Jun 2022 09:26:59 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-72237=20=E7=BC=93=E5=AD=98=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E9=9D=A2=E6=9D=BF=E6=98=BE=E7=A4=BA=E5=9C=A8=E5=9C=A8?=
 =?UTF-8?q?=E6=89=80=E6=9C=89=E5=BA=94=E7=94=A8=E6=9C=80=E4=B8=8A=E6=96=B9?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data/tabledata/tabledatapane/DBTableDataPane.java       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java
index 1746330f1..47c6171db 100644
--- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java
+++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java
@@ -24,6 +24,7 @@ import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.file.HistoryTemplateListCache;
+import com.fr.design.formula.FunctionManagerPane;
 import com.fr.design.fun.DBTableDataMenuHandler;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icheckbox.UICheckBox;
@@ -66,6 +67,7 @@ import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JSplitPane;
 import javax.swing.JToolBar;
+import javax.swing.SwingUtilities;
 import javax.swing.text.BadLocationException;
 import javax.swing.text.Document;
 import java.awt.BorderLayout;
@@ -303,7 +305,7 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
                 //显示对应的配置
                 strategyConfigPane.populateBean(populateStrategyConfig);
 
-                BasicDialog dlg = strategyConfigPane.showMediumWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() {
+                BasicDialog dlg = strategyConfigPane.showMediumWindow(SwingUtilities.getWindowAncestor(DBTableDataPane.this), new DialogActionAdapter() {
                     @Override
                     public void doOk() {
                         super.doOk();
@@ -314,7 +316,7 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
                         }
                     }
                 });
-                dlg.setAlwaysOnTop(true);
+                //dlg.setAlwaysOnTop(true);
                 dlg.setVisible(true);
             }
         });