Pull request #2172: REPORT-37872 远程设计-打不开表单

Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0

* commit '3fcc281144070ecc49e4866129ce6ce8aef5e7a5':
  REPORT-37872 远程设计-打不开表单

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

@@ -433,7 +433,11 @@ public class XWAbsoluteLayout extends XLayoutContainer {
 
     @Override
     public XLayoutContainer getTopLayout() {
-        XLayoutContainer xTopLayout = XCreatorUtils.getParentXLayoutContainer(this).getTopLayout();
+        XLayoutContainer parentXLayoutContainer = XCreatorUtils.getParentXLayoutContainer(this);
+        if (parentXLayoutContainer == null) {
+            return this;
+        }
+        XLayoutContainer xTopLayout = parentXLayoutContainer.getTopLayout();
         if (xTopLayout != null && !xTopLayout.isEditable()) {
             return xTopLayout;
         } else {

designer-form/src/main/java/com/fr/design/form/util/FormDesignerUtils.java

@@ -17,6 +17,9 @@ public class FormDesignerUtils {
      * @return
      */
     public static boolean isAppRelayout(FormDesigner designer) {
+        if (!designer.getRootComponent().acceptType(WFitLayout.class)) {
+            return false;
+        }
         return ((WFitLayout) designer.getRootComponent().toData()).isAppRelayout();
     }