Merge pull request #5567 in DESIGN/design from release/10.0 to release/11.0

* commit '8af144acf1235c6081f3c85676f7277d51ffbd9d':
  REPORT-56147 决策报表-电脑200%缩放下决策报表下方显示不全
  REPORT-58159 日志栏点击日志窗口不显示在上面

designer-base/src/main/java/com/fr/design/mainframe/loghandler/LogMessageBar.java

@@ -48,6 +48,7 @@ public class LogMessageBar extends JPanel {
 			public void mouseClicked(MouseEvent e) {
 				if (dlg != null && dlg.isVisible()) {
 					dlg.setExtendedState(JFrame.NORMAL);
+					dlg.requestFocus();
 					return;
 				}
 				dlg = new LogDetailPane().showDialog();

designer-form/src/main/java/com/fr/design/mainframe/FormArea.java

@@ -175,14 +175,12 @@ public class FormArea extends JComponent implements ScrollRulerComponent {
         double[] rowSize = {f};
         double[] columnSize = {p, f, p, p, p, p, p, f, p};
         UILabel tipsPane = new UILabel("form");
-        tipsPane.setPreferredSize(new Dimension(265, 0));
         widthPane = new UINumberField();
         widthPane.setPreferredSize(new Dimension(60, 0));
         heightPane = new UINumberField();
         heightPane.setPreferredSize(new Dimension(60, 0));
 
         slidePane = JFormSliderPane.getInstance();
-        slidePane.setPreferredSize(new Dimension(326, 20));
 
         JPanel resizePane = TableLayoutHelper.createCommonTableLayoutPane(
                 new JComponent[][]{{tipsPane, new UILabel(), widthPane,