Merge pull request #16613 in DESIGN/design from fbp/release to fbp/feature

* commit '93384179e4bc449103a6515409ad01a3836fe663':
  REPORT-147520 fix:折叠弹窗增加esc退出操作

designer-base/src/main/java/com/fr/design/dialog/CollapsibleDetailDialog.java

@@ -11,15 +11,21 @@ import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.utils.gui.GUICoreUtils;
-import java.awt.*;
-import java.awt.event.ActionEvent;
+import java.awt.Frame;
+import java.awt.Dimension;
+import java.awt.BorderLayout;
+import java.awt.Color;
 import java.awt.event.ActionListener;
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import javax.swing.JPanel;
 import javax.swing.JDialog;
 import javax.swing.JScrollPane;
 import javax.swing.JTextArea;
+import javax.swing.KeyStroke;
+import javax.swing.JComponent;
 
 
 import static com.fine.swing.ui.layout.Layouts.cell;
@@ -70,6 +76,7 @@ public class CollapsibleDetailDialog extends JDialog implements ActionListener {
         this.setSize(this.collapseDimension);
         GUICoreUtils.centerWindow(this);
         this.setAlwaysOnTop(true);
+        this.getRootPane().registerKeyboardAction(e -> dispose(), KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), JComponent.WHEN_IN_FOCUSED_WINDOW);
     }
 
     private void initTopPanel() {