Pull request #9177: REPORT-72237 缓存配置面板显示在在所有应用最上方的问题

Merge in DESIGN/design from ~RINOUX/design:release/11.0 to release/11.0

* commit 'b87a26799e1771015fd0dbcedb94539c7ec35764':
  import
  REPORT-72237 缓存配置面板显示在在所有应用最上方的问题

designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java

@@ -66,6 +66,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 +304,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 +315,7 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
                         }
                     }
                 });
-                dlg.setAlwaysOnTop(true);
+                //dlg.setAlwaysOnTop(true);
                 dlg.setVisible(true);
             }
         });