Browse Source

REPORT-1814 表单tab块的改良bug

嵌套的问题修改
master
zhouping 8 years ago
parent
commit
3b3481f768
  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 嵌套与否 * @return 嵌套与否
*/ */
private boolean isNested() { private boolean isNested() {
XLayoutContainer xLayoutContainer = this.getBackupParent().getBackupParent(); XCreator xCreator = (XCreator)this.getBackupParent().getParent();
return xLayoutContainer == null || xLayoutContainer.acceptType(XWTabFitLayout.class); while (xCreator != null) {
if (xCreator.acceptType(XWCardMainBorderLayout.class)) {
return true;
}
xCreator = (XCreator) xCreator.getParent();
}
return false;
} }
public CRPropertyDescriptor[] getisCarousel() throws IntrospectionException { public CRPropertyDescriptor[] getisCarousel() throws IntrospectionException {

Loading…
Cancel
Save