Browse Source

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

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

* commit '3fcc281144070ecc49e4866129ce6ce8aef5e7a5':
  REPORT-37872 远程设计-打不开表单
feature/big-screen
Hades 4 years ago
parent
commit
c85bc64e04
  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 @Override
public XLayoutContainer getTopLayout() { 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()) { if (xTopLayout != null && !xTopLayout.isEditable()) {
return xTopLayout; return xTopLayout;
} else { } else {

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

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

Loading…
Cancel
Save