From fa3e1eedca1ca99c8f5469f9f4e65160e3998080 Mon Sep 17 00:00:00 2001
From: kerry <kerry@finereport.com>
Date: Sat, 30 Sep 2017 11:31:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=BC=8F=E6=8F=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/mainframe/widget/ui/FormWidgetCardPane.java | 2 +-
 .../fr/design/widget/FormWidgetDefinePaneFactoryBase.java | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java b/designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java
index b621b1a7f..6eefcba6d 100644
--- a/designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java
+++ b/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.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 0));
 
-        if(FormWidgetDefinePaneFactoryBase.isWidget(innerCreator.toData())){
+        if(FormWidgetDefinePaneFactoryBase.isExtraXWidget(innerCreator.toData())){
             return;
         }
 
diff --git a/designer_form/src/com/fr/design/widget/FormWidgetDefinePaneFactoryBase.java b/designer_form/src/com/fr/design/widget/FormWidgetDefinePaneFactoryBase.java
index 8fba8220f..47efd40fe 100644
--- a/designer_form/src/com/fr/design/widget/FormWidgetDefinePaneFactoryBase.java
+++ b/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) {
-        Appearance dn = defineMap.get(widget.getClass());
-        if(dn == null){
+        if(isExtraXWidget(widget)){
             WidgetDefinePane widgetDefinePane = new WidgetDefinePane(creator, designer);
             return new RN(widgetDefinePane, widgetDefinePane.title4PopupWindow());
         }
+        Appearance dn = defineMap.get(widget.getClass());
         DataModify<Widget> definePane = null;
         try {
             Constructor con =  dn.getDefineClass().getConstructor(XCreator.class);
@@ -92,6 +92,10 @@ public class FormWidgetDefinePaneFactoryBase {
         return new RN(definePane, dn.getDisplayName());
     }
 
+    public static boolean isExtraXWidget(Widget widget){
+        return  defineMap.get(widget.getClass()) == null;
+    }
+
     public static class RN {
         private DataModify<Widget> definePane;
         private String cardName;