Browse Source

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

* commit 'c85bc64e0430e98debb3b516cd7d3d907fddb283':
  REPORT-37872 远程设计-打不开表单
bugfix/10.0
superman 4 years ago
parent
commit
8cb2489c1c
  1. 6
      designer-form/src/main/java/com/fr/design/designer/creator/XWAbsoluteLayout.java
  2. 3
      designer-form/src/main/java/com/fr/design/form/util/FormDesignerUtils.java

6
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 {

3
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();
}

Loading…
Cancel
Save