Merge pull request #7048 in DESIGN/design from release/10.0 to bugfix/10.0

* commit '861c84c4aec091b57e850d89fbf73a1dbd4e133d':
  REPORT-63106 决策报表-两个组件选中时拖拽到其他位置，然后点击对齐任意一个，两个组件会跳回刚才的位置

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

@@ -0,0 +1,33 @@
+package com.fr.design.mainframe;
+
+public enum ArrangementType {
+    LEFT_ALIGN(0),
+    RIGHT_ALIGN(1),
+    TOP_ALIGN(2),
+    BOTTOM_ALIGN(3),
+    HORIZONTAL_CENTER_ALIGN(4),
+    VERTICAL_CENTER_ALIGN(5),
+    HORIZONTAL_AUTO_DISTRIBUTION(6),
+    HORIZONTAL_MANUAL_DISTRIBUTION(7),
+    VERTICAL_AUTO_DISTRIBUTION(8),
+    VERTICAL_MANUAL_DISTRIBUTION(9);
+
+    private int type;
+
+    ArrangementType(int type) {
+        this.type = type;
+    }
+
+    public int getType() {
+        return this.type;
+    }
+
+    public static ArrangementType parse(int type) {
+        for (ArrangementType arrangementType : ArrangementType.values()) {
+            if (arrangementType.getType() == type) {
+                return arrangementType;
+            }
+        }
+        return LEFT_ALIGN;
+    }
+}

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

@@ -15,67 +15,103 @@ import java.util.Comparator;
 import java.util.List;
 
 public class MultiSelectionArrangement {
+    private static final int DEFAULT_GAP = 10;
+
     private FormDesigner designer;
-    private XLayoutContainer parent; // 当前选中的那些组件所在父容器
     private List<XCreator> selectedCreators;
     private Rectangle rec;
 
     public MultiSelectionArrangement(FormDesigner designer) {
         this.designer = designer;
-        update();
     }
 
-    public void leftAlign() {
+    public void doArrangement(ArrangementType type) {
+        doArrangement(type, DEFAULT_GAP);
+    }
+
+    public void doArrangement(ArrangementType type, int gap) {
+        updatePosition();
+        switch (type) {
+            case RIGHT_ALIGN:
+                rightAlign();
+                break;
+            case TOP_ALIGN:
+                topAlign();
+                break;
+            case BOTTOM_ALIGN:
+                bottomAlign();
+                break;
+            case HORIZONTAL_CENTER_ALIGN:
+                horizontalCenterAlign();
+                break;
+            case VERTICAL_CENTER_ALIGN:
+                verticalCenterAlign();
+                break;
+            case HORIZONTAL_AUTO_DISTRIBUTION:
+                horizontalAutoDistribution();
+                break;
+            case HORIZONTAL_MANUAL_DISTRIBUTION:
+                horizontalManualDistribution(gap);
+                break;
+            case VERTICAL_AUTO_DISTRIBUTION:
+                verticalAutoDistribution();
+                break;
+            case VERTICAL_MANUAL_DISTRIBUTION:
+                verticalManualDistribution(gap);
+                break;
+            case LEFT_ALIGN:
+            default:
+                leftAlign();
+                break;
+        }
+        updateModel();
+    }
+
+    private void leftAlign() {
         for (XCreator creator : selectedCreators) {
             creator.setLocation(rec.x, creator.getY());
         }
-        update();
     }
 
-    public void rightAlign() {
+    private void rightAlign() {
         for (XCreator creator : selectedCreators) {
             creator.setLocation(rec.x + rec.width - creator.getWidth(), creator.getY());
         }
-        update();
     }
 
-    public void topAlign() {
+    private void topAlign() {
         for (XCreator creator : selectedCreators) {
             creator.setLocation(creator.getX(), rec.y);
         }
-        update();
     }
 
-    public void bottomAlign() {
+    private void bottomAlign() {
         for (XCreator creator : selectedCreators) {
             creator.setLocation(creator.getX(), rec.y + rec.height - creator.getHeight());
         }
-        update();
     }
 
-    public void horizontalCenterAlign() {
+    private void horizontalCenterAlign() {
         for (XCreator creator : selectedCreators) {
             creator.setLocation(rec.x + rec.width / 2 - creator.getWidth() / 2, creator.getY());
         }
-        update();
     }
 
-    public void verticalCenterAlign() {
+    private void verticalCenterAlign() {
         for (XCreator creator : selectedCreators) {
             creator.setLocation(creator.getX(), rec.y + rec.height / 2 - creator.getHeight() / 2);
         }
-        update();
     }
 
     // 水平分布，自动，间距由selectedCreators和border共同计算而来
-    public void horizontalAutoDistribution() {
+    private void horizontalAutoDistribution() {
         sortHorizontal();
         int[] gaps = calculateHorizontalGaps();
         horizontalDistribution(gaps);
     }
 
     // 水平分布，手动，传入一个间距，排列selectedCreators
-    public void horizontalManualDistribution(int gap) {
+    private void horizontalManualDistribution(int gap) {
         sortHorizontal();
         reSizeRecByHorizontal(gap);
         horizontalDistribution(fillGaps(gap, selectedCreators.size() - 1));
@@ -87,7 +123,6 @@ public class MultiSelectionArrangement {
             XCreator preCreator = selectedCreators.get(i - 1);
             creator.setLocation(preCreator.getX() + preCreator.getWidth() + gaps[i - 1], creator.getY());
         }
-        update();
     }
 
     private void reSizeRecByHorizontal(int gap) {
@@ -145,13 +180,13 @@ public class MultiSelectionArrangement {
         return calculateIntegerGaps(distanceBetweenHeadAndTailCreators - sum, gapCount);
     }
 
-    public void verticalAutoDistribution() {
+    private void verticalAutoDistribution() {
         sortVertical();
         int[] gaps = calculateVerticalGaps();
         verticalDistribution(gaps);
     }
 
-    public void verticalManualDistribution(int gap) {
+    private void verticalManualDistribution(int gap) {
         sortVertical();
         reSizeRecByVertical(gap);
         verticalDistribution(fillGaps(gap, selectedCreators.size() - 1));
@@ -163,7 +198,6 @@ public class MultiSelectionArrangement {
             XCreator preCreator = selectedCreators.get(i - 1);
             creator.setLocation(creator.getX(), preCreator.getY() + preCreator.getHeight() + gaps[i - 1]);
         }
-        update();
     }
 
     private void reSizeRecByVertical(int gap) {
@@ -252,12 +286,15 @@ public class MultiSelectionArrangement {
         return gaps;
     }
 
-    private void update() {
+    private void updatePosition() {
         FormSelection selection = designer.getSelectionModel().getSelection();
         this.selectedCreators = Arrays.asList(selection.getSelectedCreators());
         this.rec = selection.getSelctionBounds();
-        this.parent = getParent(selection.getSelectedCreator());
+    }
 
+    private void updateModel() {
+        FormSelection selection = designer.getSelectionModel().getSelection();
+        XLayoutContainer parent = getParent(selection.getSelectedCreator());
         if (parent != null) {
             // 这里要修改修改engine里面的对象才能成功保存，光修改设计器对象没用
             WLayout wabs = parent.toData();

designer-form/src/main/java/com/fr/design/mainframe/widget/arrangement/buttons/AbstractMultiSelectionArrangementButton.java

@@ -5,6 +5,9 @@ import com.fr.design.event.UIObserverListener;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.mainframe.MultiSelectionArrangement;
 
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
 public abstract class AbstractMultiSelectionArrangementButton extends UIButton implements MultiSelectionArrangementButton, UIObserver {
     private static final long serialVersionUID = -2114423583742242771L;
     protected MultiSelectionArrangement arrangement;
@@ -29,4 +32,15 @@ public abstract class AbstractMultiSelectionArrangementButton extends UIButton i
     public boolean shouldResponseChangeListener() {
         return true;
     }
+
+    @Override
+    public ActionListener getActionListener() {
+        return new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                arrangement.doArrangement(getArrangementType());
+                uiObserverListener.doChange();
+            }
+        };
+    }
 }

designer-form/src/main/java/com/fr/design/mainframe/widget/arrangement/buttons/BottomAlignButton.java

@@ -1,14 +1,15 @@
 package com.fr.design.mainframe.widget.arrangement.buttons;
 
 import com.fr.design.i18n.Toolkit;
+import com.fr.design.mainframe.ArrangementType;
 import com.fr.design.mainframe.MultiSelectionArrangement;
 import com.fr.general.IOUtils;
 
 import javax.swing.Icon;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 
 public class BottomAlignButton extends AbstractMultiSelectionArrangementButton {
+    private static final long serialVersionUID = 2397455240682353024L;
+
     public BottomAlignButton(MultiSelectionArrangement arrangement) {
         super(arrangement);
     }
@@ -24,13 +25,7 @@ public class BottomAlignButton extends AbstractMultiSelectionArrangementButton {
     }
 
     @Override
-    public ActionListener getActionListener() {
+    public ArrangementType getArrangementType() {
-        return new ActionListener() {
+        return ArrangementType.BOTTOM_ALIGN;
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                arrangement.bottomAlign();
-                uiObserverListener.doChange();
-            }
-        };
     }
 }

designer-form/src/main/java/com/fr/design/mainframe/widget/arrangement/buttons/HorizontalCenterButton.java

@@ -1,14 +1,15 @@
 package com.fr.design.mainframe.widget.arrangement.buttons;
 
 import com.fr.design.i18n.Toolkit;
+import com.fr.design.mainframe.ArrangementType;
 import com.fr.design.mainframe.MultiSelectionArrangement;
 import com.fr.general.IOUtils;
 
 import javax.swing.Icon;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 
 public class HorizontalCenterButton extends AbstractMultiSelectionArrangementButton {
+    private static final long serialVersionUID = 6290178236460051049L;
+
     public HorizontalCenterButton(MultiSelectionArrangement arrangement) {
         super(arrangement);
     }
@@ -24,13 +25,7 @@ public class HorizontalCenterButton extends AbstractMultiSelectionArrangementBut
     }
 
     @Override
-    public ActionListener getActionListener() {
+    public ArrangementType getArrangementType() {
-        return new ActionListener() {
+        return ArrangementType.HORIZONTAL_CENTER_ALIGN;
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                arrangement.horizontalCenterAlign();
-                uiObserverListener.doChange();
-            }
-        };
     }
 }

designer-form/src/main/java/com/fr/design/mainframe/widget/arrangement/buttons/HorizontalDistributionButton.java

@@ -1,14 +1,15 @@
 package com.fr.design.mainframe.widget.arrangement.buttons;
 
 import com.fr.design.i18n.Toolkit;
+import com.fr.design.mainframe.ArrangementType;
 import com.fr.design.mainframe.MultiSelectionArrangement;
 import com.fr.general.IOUtils;
 
 import javax.swing.Icon;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 
 public class HorizontalDistributionButton extends AbstractMultiSelectionArrangementButton {
+    private static final long serialVersionUID = 5052092252720664954L;
+
     public HorizontalDistributionButton(MultiSelectionArrangement arrangement) {
         super(arrangement);
     }
@@ -24,13 +25,7 @@ public class HorizontalDistributionButton extends AbstractMultiSelectionArrangem
     }
 
     @Override
-    public ActionListener getActionListener() {
+    public ArrangementType getArrangementType() {
-        return new ActionListener() {
+        return ArrangementType.HORIZONTAL_AUTO_DISTRIBUTION;
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                arrangement.horizontalAutoDistribution();
-                uiObserverListener.doChange();
-            }
-        };
     }
 }

designer-form/src/main/java/com/fr/design/mainframe/widget/arrangement/buttons/LeftAlignButton.java

@@ -1,14 +1,15 @@
 package com.fr.design.mainframe.widget.arrangement.buttons;
 
 import com.fr.design.i18n.Toolkit;
+import com.fr.design.mainframe.ArrangementType;
 import com.fr.design.mainframe.MultiSelectionArrangement;
 import com.fr.general.IOUtils;
 
 import javax.swing.Icon;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 
 public class LeftAlignButton extends AbstractMultiSelectionArrangementButton {
+    private static final long serialVersionUID = -8177637788632733710L;
+
     public LeftAlignButton(MultiSelectionArrangement arrangement) {
         super(arrangement);
     }
@@ -24,13 +25,7 @@ public class LeftAlignButton extends AbstractMultiSelectionArrangementButton {
     }
 
     @Override
-    public ActionListener getActionListener() {
+    public ArrangementType getArrangementType() {
-        return new ActionListener() {
+        return ArrangementType.LEFT_ALIGN;
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                arrangement.leftAlign();
-                uiObserverListener.doChange();
-            }
-        };
     }
 }

designer-form/src/main/java/com/fr/design/mainframe/widget/arrangement/buttons/MultiSelectionArrangementButton.java

@@ -1,5 +1,7 @@
 package com.fr.design.mainframe.widget.arrangement.buttons;
 
+import com.fr.design.mainframe.ArrangementType;
+
 import javax.swing.Icon;
 import java.awt.event.ActionListener;
 
@@ -9,4 +11,6 @@ public interface MultiSelectionArrangementButton {
     String getTipText();
 
     ActionListener getActionListener();
+
+    ArrangementType getArrangementType();
 }

designer-form/src/main/java/com/fr/design/mainframe/widget/arrangement/buttons/RightAlignButton.java

@@ -1,14 +1,15 @@
 package com.fr.design.mainframe.widget.arrangement.buttons;
 
 import com.fr.design.i18n.Toolkit;
+import com.fr.design.mainframe.ArrangementType;
 import com.fr.design.mainframe.MultiSelectionArrangement;
 import com.fr.general.IOUtils;
 
 import javax.swing.Icon;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 
 public class RightAlignButton extends AbstractMultiSelectionArrangementButton {
+    private static final long serialVersionUID = -8698936349956288409L;
+
     public RightAlignButton(MultiSelectionArrangement arrangement) {
         super(arrangement);
     }
@@ -24,13 +25,7 @@ public class RightAlignButton extends AbstractMultiSelectionArrangementButton {
     }
 
     @Override
-    public ActionListener getActionListener() {
+    public ArrangementType getArrangementType() {
-        return new ActionListener() {
+        return ArrangementType.RIGHT_ALIGN;
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                arrangement.rightAlign();
-                uiObserverListener.doChange();
-            }
-        };
     }
 }

designer-form/src/main/java/com/fr/design/mainframe/widget/arrangement/buttons/TopAlignButton.java

@@ -1,14 +1,15 @@
 package com.fr.design.mainframe.widget.arrangement.buttons;
 
 import com.fr.design.i18n.Toolkit;
+import com.fr.design.mainframe.ArrangementType;
 import com.fr.design.mainframe.MultiSelectionArrangement;
 import com.fr.general.IOUtils;
 
 import javax.swing.Icon;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 
 public class TopAlignButton extends AbstractMultiSelectionArrangementButton {
+    private static final long serialVersionUID = 2896267783075870924L;
+
     public TopAlignButton(MultiSelectionArrangement arrangement) {
         super(arrangement);
     }
@@ -24,13 +25,7 @@ public class TopAlignButton extends AbstractMultiSelectionArrangementButton {
     }
 
     @Override
-    public ActionListener getActionListener() {
+    public ArrangementType getArrangementType() {
-        return new ActionListener() {
+        return ArrangementType.TOP_ALIGN;
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                arrangement.topAlign();
-                uiObserverListener.doChange();
-            }
-        };
     }
 }

designer-form/src/main/java/com/fr/design/mainframe/widget/arrangement/buttons/VerticalCenterButton.java

@@ -1,12 +1,11 @@
 package com.fr.design.mainframe.widget.arrangement.buttons;
 
 import com.fr.design.i18n.Toolkit;
+import com.fr.design.mainframe.ArrangementType;
 import com.fr.design.mainframe.MultiSelectionArrangement;
 import com.fr.general.IOUtils;
 
 import javax.swing.Icon;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 
 public class VerticalCenterButton extends AbstractMultiSelectionArrangementButton {
     public VerticalCenterButton(MultiSelectionArrangement arrangement) {
@@ -24,13 +23,7 @@ public class VerticalCenterButton extends AbstractMultiSelectionArrangementButto
     }
 
     @Override
-    public ActionListener getActionListener() {
+    public ArrangementType getArrangementType() {
-        return new ActionListener() {
+        return ArrangementType.VERTICAL_CENTER_ALIGN;
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                arrangement.verticalCenterAlign();
-                uiObserverListener.doChange();
-            }
-        };
     }
 }

designer-form/src/main/java/com/fr/design/mainframe/widget/arrangement/buttons/VerticalDistributionButton.java

@@ -1,12 +1,11 @@
 package com.fr.design.mainframe.widget.arrangement.buttons;
 
 import com.fr.design.i18n.Toolkit;
+import com.fr.design.mainframe.ArrangementType;
 import com.fr.design.mainframe.MultiSelectionArrangement;
 import com.fr.general.IOUtils;
 
 import javax.swing.Icon;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 
 public class VerticalDistributionButton extends AbstractMultiSelectionArrangementButton {
     public VerticalDistributionButton(MultiSelectionArrangement arrangement) {
@@ -24,13 +23,7 @@ public class VerticalDistributionButton extends AbstractMultiSelectionArrangemen
     }
 
     @Override
-    public ActionListener getActionListener() {
+    public ArrangementType getArrangementType() {
-        return new ActionListener() {
+        return ArrangementType.VERTICAL_AUTO_DISTRIBUTION;
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                arrangement.verticalAutoDistribution();
-                uiObserverListener.doChange();
-            }
-        };
     }
 }

designer-form/src/main/java/com/fr/design/mainframe/widget/ui/FormMultiWidgetCardPane.java

@@ -9,6 +9,7 @@ import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.mainframe.ArrangementType;
 import com.fr.design.mainframe.FormDesigner;
 import com.fr.design.mainframe.MultiSelectionArrangement;
 import com.fr.design.mainframe.widget.arrangement.buttons.BottomAlignButton;
@@ -186,9 +187,9 @@ public class FormMultiWidgetCardPane extends FormWidgetCardPane {
             int gap = (int) Math.floor(Float.parseFloat(text));
             numberField.setValue(gap);
             if (isVertical) {
-                arrangement.verticalManualDistribution(gap);
+                arrangement.doArrangement(ArrangementType.VERTICAL_MANUAL_DISTRIBUTION, gap);
             } else {
-                arrangement.horizontalManualDistribution(gap);
+                arrangement.doArrangement(ArrangementType.HORIZONTAL_MANUAL_DISTRIBUTION, gap);
             }
             attributeChanged();
         }