Browse Source

漏提

master
kerry 7 years ago
parent
commit
fa3e1eedca
  1. 2
      designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java
  2. 8
      designer_form/src/com/fr/design/widget/FormWidgetDefinePaneFactoryBase.java

2
designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java

@ -133,7 +133,7 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane {
jPanel.add(attriCardPane, BorderLayout.CENTER); jPanel.add(attriCardPane, BorderLayout.CENTER);
jPanel.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 0)); jPanel.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 0));
if(FormWidgetDefinePaneFactoryBase.isWidget(innerCreator.toData())){ if(FormWidgetDefinePaneFactoryBase.isExtraXWidget(innerCreator.toData())){
return; return;
} }

8
designer_form/src/com/fr/design/widget/FormWidgetDefinePaneFactoryBase.java

@ -76,11 +76,11 @@ public class FormWidgetDefinePaneFactoryBase {
} }
public static RN createWidgetDefinePane(XCreator creator, FormDesigner designer, Widget widget, Operator operator) { public static RN createWidgetDefinePane(XCreator creator, FormDesigner designer, Widget widget, Operator operator) {
Appearance dn = defineMap.get(widget.getClass()); if(isExtraXWidget(widget)){
if(dn == null){
WidgetDefinePane widgetDefinePane = new WidgetDefinePane(creator, designer); WidgetDefinePane widgetDefinePane = new WidgetDefinePane(creator, designer);
return new RN(widgetDefinePane, widgetDefinePane.title4PopupWindow()); return new RN(widgetDefinePane, widgetDefinePane.title4PopupWindow());
} }
Appearance dn = defineMap.get(widget.getClass());
DataModify<Widget> definePane = null; DataModify<Widget> definePane = null;
try { try {
Constructor con = dn.getDefineClass().getConstructor(XCreator.class); Constructor con = dn.getDefineClass().getConstructor(XCreator.class);
@ -92,6 +92,10 @@ public class FormWidgetDefinePaneFactoryBase {
return new RN(definePane, dn.getDisplayName()); return new RN(definePane, dn.getDisplayName());
} }
public static boolean isExtraXWidget(Widget widget){
return defineMap.get(widget.getClass()) == null;
}
public static class RN { public static class RN {
private DataModify<Widget> definePane; private DataModify<Widget> definePane;
private String cardName; private String cardName;

Loading…
Cancel
Save