Merge pull request #2866 in DESIGN/design from final/10.0 to persist/10.0

* commit '556dc363ed854ae0acad3c224125c5b17273364d':
  REPORT-40853 提交单元格组多次点击卡死
  REPORT-43280 参数面板控件选不到
  REPORT-42470 调整下位置 保证原顺序不变
  REPORT-42470 假保存

designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java

@@ -53,6 +53,7 @@ import javax.swing.BorderFactory;
 import javax.swing.DefaultCellEditor;
 import javax.swing.DefaultComboBoxModel;
 import javax.swing.Icon;
+import javax.swing.JFrame;
 import javax.swing.JList;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
@@ -867,13 +868,14 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
 			textLabel = new UILabel();
 			textLabel.addMouseListener(new MouseAdapter() {
 				public void mousePressed(MouseEvent e) {
+					vPaneDLG.setAlwaysOnTop(true);
 					vPaneDLG.setVisible(true);
 
 				}
 			});
 
 			vPane = new ValuePane(types);
-			vPaneDLG = vPane.showSmallWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() {
+			vPaneDLG = vPane.showSmallWindow(new JFrame(), new DialogActionAdapter() {
 				public void doOk() {
 					fireEditingStopped(); // Make the renderer
 					// reappear.

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 {