Pull request #2331: REPORT-39894 不将自适应布局和绝对布局的子类加入顶层

Merge in DESIGN/design from ~YUAN.WANG/design:release/10.0 to release/10.0

* commit 'c686b6956a82aefc099cdc7a17a3bd0ddc663526':
  REPORT-39894 不将自适应布局和绝对布局的子类加入顶层

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

@@ -805,4 +805,11 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo
 		return false;
 	}
 
+	/**
+	 * 是否支持置顶显示
+	 */
+	public boolean isTopable() {
+		return true;
+	}
+
 }

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

@@ -131,4 +131,8 @@ public class XWAbsoluteBodyLayout extends XWAbsoluteLayout {
         return false;
     }
 
+    @Override
+    public boolean isTopable() {
+        return false;
+    }
 }

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

@@ -1222,6 +1222,11 @@ public class XWFitLayout extends XLayoutContainer {
 		return false;
 	}
 
+	@Override
+	public boolean isTopable() {
+		return false;
+	}
+
 	public  boolean switch2FitBodyLayout(XCreator creator) {
 		try {
 			XWFitLayout xfl = (XWFitLayout) creator.getBackupParent();

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

@@ -251,6 +251,8 @@ public class XWParameterLayout extends XWAbsoluteLayout {
         return false;
     }
 
-
-
+    @Override
+    public boolean isTopable() {
+        return false;
+    }
 }

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

@@ -639,4 +639,8 @@ public class XWTabFitLayout extends XWFitLayout {
 		checkVisible();
 	}
 
+	@Override
+	public boolean isTopable() {
+		return true;
+	}
 }

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

@@ -58,6 +58,9 @@ public class TopXCreators extends JComponent {
         SelectionModel selectionModel = designer.getSelectionModel();
         XCreator[] xCreators = selectionModel.getSelection().getSelectedCreators();
         for (XCreator creator : xCreators) {
+            if (!creator.isTopable()) {
+                continue;
+            }
             XWCardMainBorderLayout topXMainBorderLayout = XCreatorUtils.getTopXMainBorderLayout(creator);
             add(new TopXCreator(designer, creator));
             if (topXMainBorderLayout != null) {