Browse Source

Merge pull request #834 in BA/design from ~YAOH.WU/design_0407:release to release

* commit 'c0c2ed2f6033a68d233b0cf4c538a9536396ba17':
  REPORT-2381 客户bug历史遗留问题,空指针引发控件属性面板生成失败最终导致报表切换失败
master
superman 8 years ago
parent
commit
248ce0345a
  1. 7
      designer_form/src/com/fr/design/mainframe/WidgetPropertyPane.java

7
designer_form/src/com/fr/design/mainframe/WidgetPropertyPane.java

@ -259,8 +259,11 @@ public class WidgetPropertyPane extends FormDockView implements BaseWidgetProper
xCreator = designer.getRootComponent(); xCreator = designer.getRootComponent();
} }
XLayoutContainer container = XCreatorUtils.getHotspotContainer(xCreator); XLayoutContainer container = XCreatorUtils.getHotspotContainer(xCreator);
//TODO container可能为空,引发空指针异常
return xCreator.acceptType(XWParameterLayout.class) || container.acceptType(XWParameterLayout.class); boolean xCreatorAccept = xCreator.acceptType(XWParameterLayout.class);
boolean containerAccept = container!=null && container.acceptType(XWParameterLayout.class);
return xCreatorAccept || containerAccept;
} }
public void setEditingFormDesigner(BaseFormDesigner editor) { public void setEditingFormDesigner(BaseFormDesigner editor) {

Loading…
Cancel
Save