Browse Source

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

* commit 'd048ba59fd37734bd85f627e838d1a7d3e48b968':
  REPORT-1814 表单tab块的改良bug 屏蔽内层的tab组件轮播属性
master
superman 8 years ago
parent
commit
46c1be5433
  1. 18
      designer_form/src/com/fr/design/designer/creator/cardlayout/XWCardLayout.java

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

@ -277,8 +277,22 @@ public class XWCardLayout extends XLayoutContainer {
* @throws IntrospectionException * @throws IntrospectionException
*/ */
public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
CRPropertyDescriptor[] crp = ((WCardLayout) data).isCarousel() ? getisCarousel() : getisnotCarousel(); //嵌套的tab组件,内层的不支持轮播属性,屏蔽属性表
return ArrayUtils.addAll(getDefaultDescriptor(), crp); if(!isNested()) {
CRPropertyDescriptor[] crp = ((WCardLayout) data).isCarousel() ? getisCarousel() : getisnotCarousel();
return ArrayUtils.addAll(getDefaultDescriptor(), crp);
}else{
return getDefaultDescriptor();
}
}
/**
* 判断当前tab组件是不是嵌套的
* @return 嵌套与否
*/
private boolean isNested(){
XLayoutContainer xLayoutContainer = this.getBackupParent().getBackupParent();
return xLayoutContainer != null && xLayoutContainer.acceptType(XWTabFitLayout.class);
} }
public CRPropertyDescriptor[] getisCarousel() throws IntrospectionException { public CRPropertyDescriptor[] getisCarousel() throws IntrospectionException {

Loading…
Cancel
Save