Merge pull request #531 in DESIGN/design from ~MATA.LI/designrel:release/10.0 to release/10.0

* commit '7e2cc5da13746416b585f01a17c58ea406e852b5':
  REPORT-11473
  REPORT-11473
  REPORT-11473

designer-form/src/main/java/com/fr/design/designer/creator/XWFitLayout.java

@@ -7,26 +7,32 @@ import java.awt.Toolkit;
 import java.awt.event.ContainerEvent;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 import com.fr.design.designer.beans.LayoutAdapter;
 import com.fr.design.designer.beans.adapters.layout.FRFitLayoutAdapter;
 import com.fr.design.designer.beans.location.Direction;
+import com.fr.design.designer.creator.cardlayout.XWCardMainBorderLayout;
 import com.fr.design.designer.creator.cardlayout.XWTabFitLayout;
 import com.fr.design.designer.properties.mobile.BodyMobilePropertyUI;
 import com.fr.design.form.layout.FRFitLayout;
 import com.fr.design.fun.WidgetPropertyUIProvider;
 import com.fr.design.mainframe.FormArea;
+import com.fr.design.mainframe.FormDesigner;
+import com.fr.design.mainframe.WidgetPropertyPane;
 import com.fr.design.utils.gui.LayoutUtils;
 import com.fr.form.ui.PaddingMargin;
 import com.fr.form.ui.Widget;
 import com.fr.form.ui.container.WBodyLayoutType;
 import com.fr.form.ui.container.WFitLayout;
 import com.fr.form.ui.container.WLayout;
+import com.fr.general.FRLogger;
 import com.fr.general.FRScreen;
 import com.fr.form.ui.container.WAbsoluteLayout.BoundsWidget;
 
 import com.fr.stable.ArrayUtils;
+import edu.emory.mathcs.backport.java.util.Arrays;
 
 import javax.swing.JOptionPane;
 
@@ -38,6 +44,7 @@ import javax.swing.JOptionPane;
 public class XWFitLayout extends XLayoutContainer {
 
 	private static final long serialVersionUID = 8112908607102660176L;
+	private static final int EACH_ROW_COUNT = 4;
 
 	//由于屏幕分辨率不同，界面上的容器大小可能不是默认的100%，此时拖入组件时，保存的大小按照100%时的计算
 	protected double containerPercent = 1.0;
@@ -1209,4 +1216,120 @@ public class XWFitLayout extends XLayoutContainer {
 	public boolean isMovable() {
 		return false;
 	}
+
+	public  boolean switch2FitBodyLayout(XCreator creator) {
+		try {
+			XWFitLayout xfl = (XWFitLayout) creator.getBackupParent();
+			//备份一下组件间隔
+			int compInterval = xfl.toData().getCompInterval();
+			Component[] components = creator.getComponents();
+
+			Arrays.sort(components, new ComparatorComponentLocation());
+
+			xfl.getLayoutAdapter().removeBean(creator, creator.getWidth(), creator.getHeight());
+			xfl.remove(creator);
+
+			for (Component comp : components) {
+				XCreator xCreator = (XCreator) comp;
+				if (xCreator.shouldScaleCreator()) {
+					XLayoutContainer parentPanel = xCreator.initCreatorWrapper(xCreator.getHeight());
+					xfl.add(parentPanel, xCreator.toData().getWidgetName());
+					parentPanel.updateChildBound(xfl.getActualMinHeight());
+					continue;
+				}
+				xfl.add(xCreator);
+			}
+			//这边计算的时候会先把组件间隔去掉
+			moveComponents2FitLayout(xfl);
+
+
+			for (int i = 0; i < components.length; i++) {
+				Component comp = xfl.getComponent(i);
+				creator = (XCreator) comp;
+				creator.setBackupBound(components[i].getBounds());
+			}
+
+			//把组件间隔加上
+			if (xfl.toData().getCompInterval() != compInterval) {
+				xfl.moveContainerMargin();
+				xfl.moveCompInterval(xfl.getAcualInterval());
+				xfl.toData().setCompInterval(compInterval);
+				xfl.addCompInterval(xfl.getAcualInterval());
+			}
+			xfl.toData().setLayoutType(WBodyLayoutType.FIT);
+			FormDesigner formDesigner = WidgetPropertyPane.getInstance().getEditingFormDesigner();
+			formDesigner.getSelectionModel().setSelectedCreator(xfl);
+			return true;
+		} catch (Exception e) {
+			FRLogger.getLogger().error(e.getMessage());
+			return false;
+		}
+	}
+
+	private void moveComponents2FitLayout(XWFitLayout xwFitLayout) {
+		Component[] components = xwFitLayout.getComponents();
+		if (components.length == 0) {
+			xwFitLayout.updateBoundsWidget();
+			return;
+		}
+		int layoutWidth = xwFitLayout.getWidth() - xwFitLayout.toData().getMargin().getLeft() - xwFitLayout.toData().getMargin().getRight();
+		int layoutHeight = xwFitLayout.getHeight() - xwFitLayout.toData().getMargin().getTop() - xwFitLayout.toData().getMargin().getBottom();
+		int leftMargin = xwFitLayout.toData().getMargin().getLeft();
+		int topMargin = xwFitLayout.toData().getMargin().getTop();
+		xwFitLayout.toData().setCompInterval(0);
+		int row = (components.length / EACH_ROW_COUNT) + (components.length % EACH_ROW_COUNT == 0 ? 0 : 1);
+		//最后一行的列数不定
+		int column = components.length % EACH_ROW_COUNT == 0 ? EACH_ROW_COUNT : components.length % EACH_ROW_COUNT;
+		int componentWidth = layoutWidth / EACH_ROW_COUNT;
+		int componentHeight = layoutHeight / row;
+		for (int i = 0; i < row - 1; i++) {
+			for (int j = 0; j < EACH_ROW_COUNT; j++) {
+				components[EACH_ROW_COUNT * i + j].setBounds(
+						leftMargin + componentWidth * j,
+						topMargin + componentHeight * i,
+						j == EACH_ROW_COUNT - 1 ? layoutWidth - componentWidth * (EACH_ROW_COUNT - 1) : componentWidth,
+						componentHeight
+				);
+			}
+		}
+		//最后一行列数是特殊的，要单独处理
+		int lastRowWidth = layoutWidth / column;
+		int lastRowHeight = layoutHeight - componentHeight * (row - 1);
+		for (int i = 0; i < column; i++) {
+			components[EACH_ROW_COUNT * (row - 1) + i].setBounds(
+					leftMargin + lastRowWidth * i,
+					topMargin + componentHeight * (row - 1),
+					i == column - 1 ? layoutWidth - lastRowWidth * (column - 1) : lastRowWidth,
+					lastRowHeight
+			);
+		}
+		for (int i = 0; i < components.length; i++) {
+			if (components[i] instanceof XWCardMainBorderLayout) {
+				((XWCardMainBorderLayout) components[i]).recalculateChildWidth(components[i].getWidth(), false);
+				((XWCardMainBorderLayout) components[i]).recalculateChildHeight(components[i].getHeight(), false);
+			}
+			xwFitLayout.dealDirections((XCreator) components[i], false);
+		}
+		xwFitLayout.updateBoundsWidget();
+	}
+
+	//以组件的位置来确定先后顺序，y小的在前，x小的在前
+	private class ComparatorComponentLocation implements Comparator {
+		@Override
+		public int compare(Object o1, Object o2) {
+			if (((Component) o1).getY() < ((Component) o2).getY()) {
+				return -1;
+			} else if (((Component) o1).getY() > ((Component) o2).getY()) {
+				return 1;
+			} else {
+				if (((Component) o1).getX() < ((Component) o2).getX()) {
+					return -1;
+				} else if (((Component) o1).getX() > ((Component) o2).getX()) {
+					return 1;
+				} else {
+					return 0;
+				}
+			}
+		}
+	}
 }

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

@@ -72,6 +72,7 @@ public class FormMobileAttrAction extends JTemplateAction<JForm> {
                 // 设置移动端属性并刷新界面
                 formTpl.setFormMobileAttr(formMobileAttr);  // 会调整 body 的自适应布局，放到最后
                 ((FormArea)jf.getFormDesign().getParent()).onMobileAttrModified();
+                jf.getFormDesign().getSelectionModel().setSelectedCreator(jf.getFormDesign().getRootComponent());
                 WidgetPropertyPane.getInstance().refreshDockingView();
                 jf.fireTargetModified();
             }

designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRAbsoluteBodyLayoutDefinePane.java

@@ -124,7 +124,7 @@ public class FRAbsoluteBodyLayoutDefinePane extends FRAbsoluteLayoutDefinePane {
         if (layoutType == WBodyLayoutType.ABSOLUTE) {
             ((XWFitLayout) creator.getBackupParent()).toData().resetStyle();
             if (state == WBodyLayoutType.FIT.getTypeValue()) {
-                switch2FitBodyLayout();
+                ((XWFitLayout)creator.getBackupParent()).switch2FitBodyLayout(creator);
             }
         }
         layout.setBorderStyle((LayoutBorderStyle) borderStyleEditor.getValue());
@@ -149,123 +149,5 @@ public class FRAbsoluteBodyLayoutDefinePane extends FRAbsoluteLayoutDefinePane {
         return null;
     }
 
-    private boolean switch2FitBodyLayout() {
-        try {
-            XWFitLayout xfl = (XWFitLayout) creator.getBackupParent();
-            //备份一下组件间隔
-            int compInterval = xfl.toData().getCompInterval();
-            Component[] components = creator.getComponents();
-
-            Arrays.sort(components, new ComparatorComponentLocation());
-
-            xfl.getLayoutAdapter().removeBean(creator, creator.getWidth(), creator.getHeight());
-            xfl.remove(creator);
-
-            for (Component comp : components) {
-                XCreator xCreator = (XCreator) comp;
-                if (xCreator.shouldScaleCreator()) {
-                    XLayoutContainer parentPanel = xCreator.initCreatorWrapper(xCreator.getHeight());
-                    xfl.add(parentPanel, xCreator.toData().getWidgetName());
-                    parentPanel.updateChildBound(xfl.getActualMinHeight());
-                    continue;
-                }
-                xfl.add(xCreator);
-            }
-            //这边计算的时候会先把组件间隔去掉
-            moveComponents2FitLayout(xfl);
-
-
-            for (int i = 0; i < components.length; i++) {
-                Component comp = xfl.getComponent(i);
-                XCreator creator = (XCreator) comp;
-                creator.setBackupBound(components[i].getBounds());
-            }
-
-            //把组件间隔加上
-            if (xfl.toData().getCompInterval() != compInterval) {
-                xfl.moveContainerMargin();
-                xfl.moveCompInterval(xfl.getAcualInterval());
-                xfl.toData().setCompInterval(compInterval);
-                xfl.addCompInterval(xfl.getAcualInterval());
-            }
-            xfl.toData().setLayoutType(WBodyLayoutType.FIT);
-            FormDesigner formDesigner = WidgetPropertyPane.getInstance().getEditingFormDesigner();
-            formDesigner.getSelectionModel().setSelectedCreator(xfl);
-            return true;
-        } catch (Exception e) {
-            FineLoggerFactory.getLogger().error(e.getMessage(), e);
-            return false;
-        }
-    }
-
-    // 把绝对布局中的元素按规则移动到自适应布局中
-    // 规则：各元素按顺序放置，其中每行最多4个元素，超出则换行，各元素均分body的高度和宽度
-    private void moveComponents2FitLayout(XWFitLayout xwFitLayout) {
-        Component[] components = xwFitLayout.getComponents();
-        if (components.length == 0) {
-            xwFitLayout.updateBoundsWidget();
-            return;
-        }
-        int layoutWidth = xwFitLayout.getWidth() - xwFitLayout.toData().getMargin().getLeft() - xwFitLayout.toData().getMargin().getRight();
-        int layoutHeight = xwFitLayout.getHeight() - xwFitLayout.toData().getMargin().getTop() - xwFitLayout.toData().getMargin().getBottom();
-        int leftMargin = xwFitLayout.toData().getMargin().getLeft();
-        int topMargin = xwFitLayout.toData().getMargin().getTop();
-        xwFitLayout.toData().setCompInterval(0);
-        int row = (components.length / EACH_ROW_COUNT) + (components.length % EACH_ROW_COUNT == 0 ? 0 : 1);
-        //最后一行的列数不定
-        int column = components.length % EACH_ROW_COUNT == 0 ? EACH_ROW_COUNT : components.length % EACH_ROW_COUNT;
-        int componentWidth = layoutWidth / EACH_ROW_COUNT;
-        int componentHeight = layoutHeight / row;
-        for (int i = 0; i < row - 1; i++) {
-            for (int j = 0; j < EACH_ROW_COUNT; j++) {
-                components[EACH_ROW_COUNT * i + j].setBounds(
-                        leftMargin + componentWidth * j,
-                        topMargin + componentHeight * i,
-                        j == EACH_ROW_COUNT - 1 ? layoutWidth - componentWidth * (EACH_ROW_COUNT - 1) : componentWidth,
-                        componentHeight
-                );
-            }
-        }
-        //最后一行列数是特殊的，要单独处理
-        int lastRowWidth = layoutWidth / column;
-        int lastRowHeight = layoutHeight - componentHeight * (row - 1);
-        for (int i = 0; i < column; i++) {
-            components[EACH_ROW_COUNT * (row - 1) + i].setBounds(
-                    leftMargin + lastRowWidth * i,
-                    topMargin + componentHeight * (row - 1),
-                    i == column - 1 ? layoutWidth - lastRowWidth * (column - 1) : lastRowWidth,
-                    lastRowHeight
-            );
-        }
-        for (int i = 0; i < components.length; i++) {
-            if (components[i] instanceof XWCardMainBorderLayout) {
-                ((XWCardMainBorderLayout) components[i]).recalculateChildWidth(components[i].getWidth(), false);
-                ((XWCardMainBorderLayout) components[i]).recalculateChildHeight(components[i].getHeight(), false);
-            }
-            xwFitLayout.dealDirections((XCreator) components[i], false);
-        }
-        xwFitLayout.updateBoundsWidget();
-    }
-
-    //以组件的位置来确定先后顺序，y小的在前，x小的在前
-    private class ComparatorComponentLocation implements Comparator {
-        @Override
-        public int compare(Object o1, Object o2) {
-            if (((Component) o1).getY() < ((Component) o2).getY()) {
-                return -1;
-            } else if (((Component) o1).getY() > ((Component) o2).getY()) {
-                return 1;
-            } else {
-                if (((Component) o1).getX() < ((Component) o2).getX()) {
-                    return -1;
-                } else if (((Component) o1).getX() > ((Component) o2).getX()) {
-                    return 1;
-                } else {
-                    return 0;
-                }
-            }
-        }
-    }
-
 
 }

designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java

@@ -26,6 +26,7 @@ import com.fr.design.mainframe.widget.accessibles.AccessibleBodyWatermarkEditor;
 import com.fr.design.mainframe.widget.accessibles.AccessibleWLayoutBorderStyleEditor;
 import com.fr.design.widget.ui.designer.AbstractDataModify;
 import com.fr.design.widget.ui.designer.component.PaddingBoundPane;
+import com.fr.form.main.Form;
 import com.fr.form.ui.LayoutBorderStyle;
 import com.fr.form.ui.Widget;
 import com.fr.form.ui.container.WAbsoluteBodyLayout;
@@ -136,9 +137,15 @@ public class FRFitLayoutDefinePane extends AbstractDataModify<WFitLayout> {
         XLayoutContainer rootLayout = selectedBodyLayout(formDesigner);
         if (rootLayout != formDesigner.getRootComponent()
                 && formDesigner.getSelectionModel().getSelection().getSelectedCreator() == formDesigner.getRootComponent()) {
+            //原单例面板populate根据当前样式populate属性面板，现加入移动端逻辑：可能需要根据面板属性改变样式
+            Form form = formDesigner.getTarget();
+            if (form.getFormMobileAttr().isMobileOnly() && form.getFormMobileAttr().isAdaptivePropertyAutoMatch()) {
+                ((XWFitLayout)formDesigner.getRootComponent()).switch2FitBodyLayout(rootLayout);
+            } else {
                 formDesigner.getSelectionModel().setSelectedCreators(
                         FormSelectionUtils.rebuildSelection(xWFitLayout, new Widget[]{selectedBodyLayout(formDesigner).toData()}));
             }
+        }
         paddingBound.populate(ob);
         layoutComboBox.setSelectedIndex(ob.getBodyLayoutType().getTypeValue());
         adaptComboBox.setSelectedIndex(ob.getCompState());