Merge branch 'release/10.0' of https://code.fineres.com/scm/~henry.wang/design into release/10.0

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

@@ -177,14 +177,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,

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

@@ -109,6 +109,10 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
             Arrays.asList(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_M_Edit_Cut"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_M_Edit_Copy"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_Edit_Delete")})
     );
 
+    protected static final ArrayList<String> PARAMETER_TOOLAR_BAN_LIST = new ArrayList<String>(
+            Arrays.asList(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_M_Edit_Cut"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_M_Edit_Copy")})
+    );
+
 
     private double scale = 1.0D;
     //底层容器的默认大小
@@ -1304,6 +1308,10 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
     protected void setToolbarButtons() {
         //自适应布局和底层都不能删除
         DesignerContext.getDesignerFrame().checkCombineUp(!isRootSelected(), NAME_ARRAY_LIST);
+
+        if (isParameterSelected()) {
+            DesignerContext.getDesignerFrame().checkCombineUp(false, PARAMETER_TOOLAR_BAN_LIST);
+        }
     }
 
     private void invalidateLayout() {