From a18b7cb1bfa044934e2cba61affa1d065c3f0ce2 Mon Sep 17 00:00:00 2001 From: fanglei <294531121> Date: Mon, 28 Aug 2017 10:45:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E6=8E=A7=E4=BB=B6=E9=A1=BA=E5=BA=8F?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=BF=98=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mobile/ElementCasePropertyUI.java | 2 +- .../design/mainframe/WidgetPropertyPane.java | 22 +++++++++++-------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/designer_form/src/com/fr/design/designer/properties/mobile/ElementCasePropertyUI.java b/designer_form/src/com/fr/design/designer/properties/mobile/ElementCasePropertyUI.java index 065e3cd6e..f84bafc29 100644 --- a/designer_form/src/com/fr/design/designer/properties/mobile/ElementCasePropertyUI.java +++ b/designer_form/src/com/fr/design/designer/properties/mobile/ElementCasePropertyUI.java @@ -21,7 +21,7 @@ public class ElementCasePropertyUI extends AbstractWidgetPropertyUIProvider { @Override public AbstractPropertyTable createWidgetAttrTable() { - return new ElementCasePropertyTable(xCreator); + return null; } @Override diff --git a/designer_form/src/com/fr/design/mainframe/WidgetPropertyPane.java b/designer_form/src/com/fr/design/mainframe/WidgetPropertyPane.java index ff6a8c640..d5878a095 100644 --- a/designer_form/src/com/fr/design/mainframe/WidgetPropertyPane.java +++ b/designer_form/src/com/fr/design/mainframe/WidgetPropertyPane.java @@ -123,9 +123,11 @@ public class WidgetPropertyPane extends FormDockView implements BaseWidgetPrope extraPane.initPropertyGroups(designer); } } -// for (AbstractPropertyTable propertyTable : widgetPropertyTables) { -// propertyTable.initPropertyGroups(designer); -// } + if (widgetPropertyTables != null) { + for (AbstractPropertyTable propertyTable : widgetPropertyTables) { + propertyTable.initPropertyGroups(designer); + } + } } /** @@ -224,12 +226,14 @@ public class WidgetPropertyPane extends FormDockView implements BaseWidgetPrope mobileExtraPropertyPanes.add(extraPane); wsp.add(extraPane); } -// AbstractPropertyTable propertyTable = widgetAttrProvider.createWidgetAttrTable(); -// widgetPropertyTables.add(propertyTable); -// designer.addDesignerEditListener(new WidgetPropertyDesignerAdapter(formWidgetCardPane)); -// -// UIScrollPane uiScrollPane = new UIScrollPane(getExtraBodyTable(propertyTable)); -// wsp.add(uiScrollPane); + AbstractPropertyTable propertyTable = widgetAttrProvider.createWidgetAttrTable(); + if (propertyTable != null) { + widgetPropertyTables.add(propertyTable); + designer.addDesignerEditListener(new WidgetPropertyDesignerAdapter(formWidgetCardPane)); + + UIScrollPane uiScrollPane = new UIScrollPane(getExtraBodyTable(propertyTable)); + wsp.add(uiScrollPane); + } } } }