Pull request #2851: REPORT-42470 假保存 && REPORT-43280 参数面板控件选不到

Merge in DESIGN/design from ~HADES/design:final/10.0 to final/10.0

* commit '63d53215ffdef923d2e2d80e1f31db38daa64933':
  REPORT-43280 参数面板控件选不到
  REPORT-42470 调整下位置 保证原顺序不变
  REPORT-42470 假保存

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());

designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java

@@ -760,6 +760,7 @@ public class JWorkBook extends JTemplate<WorkBook, WorkBookUndoState> {
                     if (hasParameterPane()) {
                         parameterPane.populate(u.getApplyTarget());
                         setAutoHeightForCenterPane();
+                        reportComposite.setSelectedIndex(u.getSelectedReportIndex());
                         DesignModuleFactory.getFormHierarchyPane().refreshRoot();
                     }
                 } else {