Merge remote-tracking branch 'origin/release/10.0' into release/10.0

designer-form/src/main/java/com/fr/design/designer/beans/models/StateModel.java

@@ -301,12 +301,14 @@ public class StateModel {
 
         Rectangle bounds = createCurrentBounds(x, y);
         // 有参数面板时 要考虑下参数面板的高度影响
-        int yOffset = 0;
-        XLayoutContainer paramComponent = designer.getParaComponent();
-        if (paramComponent != null) {
-            yOffset = paramComponent.getHeight();
+        if (!designer.isFormParaDesigner()) {
+            int yOffset = 0;
+            XLayoutContainer paramComponent = designer.getParaComponent();
+            if (paramComponent != null) {
+                yOffset = paramComponent.getHeight();
+            }
+            bounds.y = Math.max(bounds.y - yOffset, 0);
         }
-        bounds.y = Math.max(bounds.y - yOffset, 0);
 
         if ((x != currentX) || (y != currentY)) {
             ArrayList<XCreator> creators = getHotspotCreators(bounds, designer.getRootComponent());