REPORT-35569 参数面板，添加一个参数控件，撤销之后，再次添加的控件会空一个位置添加

designer-base/src/main/java/com/fr/design/parameter/ParameterDesignerProvider.java

@@ -48,7 +48,7 @@ public interface ParameterDesignerProvider {
 
     boolean addingParameter2EditorWithQueryButton(Parameter parameter, int index);
 
-    void addingAllParameter2Editor(Parameter[] parameterArray, int currentIndex);
+    int addingAllParameter2Editor(Parameter[] parameterArray, int currentIndex);
 
     JPanel[] toolbarPanes4Form();
 

designer-form/src/main/java/com/fr/design/form/parameter/FormParaDesigner.java

@@ -74,7 +74,7 @@ import java.util.List;
 public class FormParaDesigner extends FormDesigner implements ParameterDesignerProvider {
     private static final int NUM_IN_A_LINE = 4;
     private static final int H_COMPONENT_GAP = 165;
-    private static final int V_COMPONENT_GAP = 25;
+    public static final int V_COMPONENT_GAP = 25;
     private static final int FIRST_V_LOCATION = 35;
     private static final int FIRST_H_LOCATION = 90;
     private static final int SECOND_H_LOCATION = 170;
@@ -637,9 +637,9 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP
      *
      * @param parameterArray 参数        c
      * @param currentIndex   位置   w
-     * @return 是否加入   s
+     * @return currentIndex的最新值
      */
-    public void addingAllParameter2Editor(Parameter[] parameterArray, int currentIndex) {
+    public int addingAllParameter2Editor(Parameter[] parameterArray, int currentIndex) {
         for (int i = 0; i < parameterArray.length; i++) {
             com.fr.form.ui.Label label = new com.fr.form.ui.Label();
             label.setWidgetName("Label" + parameterArray[i].getName());
@@ -667,9 +667,10 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP
             XCreator xCreator = XCreatorUtils.createXCreator(formSubmitButton);
             if (!(this.autoAddComponent(xCreator, H_COMPONENT_GAP * 3 + H_GAP, FIRST_V_LOCATION
                     + V_COMPONENT_GAP * (currentIndex / NUM_IN_A_LINE)))) {
-                return;
+                currentIndex = ((int) Math.ceil((currentIndex + 1) / (double) NUM_IN_A_LINE)) * NUM_IN_A_LINE;
             }
         }
+        return currentIndex;
     }
 
     /**

designer-realize/src/main/java/com/fr/design/parameter/ParameterDefinitePane.java

@@ -17,6 +17,7 @@ import com.fr.design.designer.TargetComponent;
 import com.fr.design.event.TargetModifiedEvent;
 import com.fr.design.event.TargetModifiedListener;
 import com.fr.design.file.HistoryTemplateListPane;
+import com.fr.design.form.parameter.FormParaDesigner;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ibutton.UIButtonGroup;
 import com.fr.design.layout.FRGUIPaneFactory;
@@ -30,6 +31,10 @@ import com.fr.design.menu.ShortCut;
 import com.fr.design.menu.ToolBarDef;
 import com.fr.design.module.DesignModuleFactory;
 import com.fr.design.style.background.BackgroundPane;
+import com.fr.form.main.parameter.FormParameterUI;
+import com.fr.form.ui.Widget;
+import com.fr.form.ui.container.WAbsoluteLayout;
+import com.fr.form.ui.container.WLayout;
 import com.fr.log.FineLoggerFactory;
 import com.fr.main.parameter.ReportParameterAttr;
 import com.fr.main.parameter.TemplateParameterAttr;
@@ -46,6 +51,7 @@ import java.awt.Color;
 import java.awt.Component;
 import java.awt.Container;
 import java.awt.Dimension;
+import java.awt.Rectangle;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.ItemEvent;
@@ -249,6 +255,22 @@ public class ParameterDefinitePane extends JPanel implements ToolBarMenuDockPlus
                 FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
         }
+        currentIndex = reportParameterAttr.getCurrentIndex();
+        //因为以前的版本没有保存currentIndex，所以要计算currentIndex的值
+        if (parameterUI != null && parameterUI instanceof FormParameterUI && currentIndex == 0) {
+            WLayout wLayout = ((FormParameterUI) parameterUI).getContainer();
+            int widgetCount = wLayout.getWidgetCount();
+            Rectangle endRec = null;
+            for (int i = 0; i < widgetCount; i++) {
+                Widget widget = wLayout.getWidget(i);
+                Rectangle tempRec = ((WAbsoluteLayout.BoundsWidget) widget).getBounds();
+                if (endRec == null || tempRec.y > endRec.y) {
+                    endRec = tempRec;
+                }
+            }
+            if (endRec != null)
+                currentIndex = (int) (Math.ceil(endRec.y / FormParaDesigner.V_COMPONENT_GAP)) * NUM_IN_A_LINE;
+        }
 
         paraDesignEditor.populate(parameterUI);
 
@@ -268,8 +290,6 @@ public class ParameterDefinitePane extends JPanel implements ToolBarMenuDockPlus
             bridge.setBackground(reportParameterAttr.getBackground());
             bridge.setUseParamsTemplate(reportParameterAttr.isUseParamsTemplate());
         }
-
-        currentIndex = reportParameterAttr.getCurrentIndex();
     }
 
 
@@ -438,7 +458,7 @@ public class ParameterDefinitePane extends JPanel implements ToolBarMenuDockPlus
             return;
         }
 
-        paraDesignEditor.addingAllParameter2Editor(parameterArray, currentIndex);
+        currentIndex = paraDesignEditor.addingAllParameter2Editor(parameterArray, currentIndex);
 
         parameterArray = null;
         refreshParameter();