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

designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java

@@ -38,6 +38,7 @@ import com.fr.stable.ParameterProvider;
 import com.fr.stable.StringUtils;
 import com.fr.stable.xml.XMLPrintWriter;
 
+import javax.swing.JFrame;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import java.io.ByteArrayOutputStream;
@@ -422,7 +423,7 @@ public abstract class DesignTableDataManager {
         final Map<String, Object> parameterMap = new HashMap<>();
         if (needInputParams(isMustInputParameters, parameters)) {
             final ParameterInputPane pPane = new ParameterInputPane(parameters);
-            pPane.showSmallWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() {
+            pPane.showSmallWindow(new JFrame(), new DialogActionAdapter() {
                 @Override
                 public void doOk() {
                     parameterMap.putAll(pPane.update());

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

@@ -265,12 +265,18 @@ public class FormSelection {
      * @param designer 设计界面组件
      */
     public void fixCreator(FormDesigner designer) {
+        int i = 0;
         for (XCreator creator : selection) {
             LayoutAdapter layoutAdapter = AdapterBus.searchLayoutAdapter(designer, creator);
             if (layoutAdapter != null) {
-                creator.setBackupBound(backupBounds);
+                if (creator.acceptType(XWAbsoluteLayout.class) && recs.size() > i) {
+                    creator.setBackupBound(recs.get(i));
+                } else {
+                    creator.setBackupBound(backupBounds);
+                }
                 layoutAdapter.fix(creator);
             }
+            i++;
         }
     }