Browse Source

Merge pull request #716 in BA/design from ~ZHOUPING/design:dev to dev

* commit '3b3481f7685cf32f84681902559ae16cbd47c251':
  REPORT-1814 表单tab块的改良bug 嵌套的问题修改
master
superman 8 years ago
parent
commit
0a1bb6f816
  1. 10
      designer_form/src/com/fr/design/designer/creator/cardlayout/XWCardLayout.java

10
designer_form/src/com/fr/design/designer/creator/cardlayout/XWCardLayout.java

@ -296,8 +296,14 @@ public class XWCardLayout extends XLayoutContainer {
* @return 嵌套与否
*/
private boolean isNested() {
XLayoutContainer xLayoutContainer = this.getBackupParent().getBackupParent();
return xLayoutContainer == null || xLayoutContainer.acceptType(XWTabFitLayout.class);
XCreator xCreator = (XCreator)this.getBackupParent().getParent();
while (xCreator != null) {
if (xCreator.acceptType(XWCardMainBorderLayout.class)) {
return true;
}
xCreator = (XCreator) xCreator.getParent();
}
return false;
}
public CRPropertyDescriptor[] getisCarousel() throws IntrospectionException {

Loading…
Cancel
Save