diff --git a/designer-realize/src/main/java/com/fr/design/widget/ui/btn/FreeButtonDetailPane.java b/designer-realize/src/main/java/com/fr/design/widget/ui/btn/FreeButtonDetailPane.java index 125a7498c..4e8a9d5e9 100644 --- a/designer-realize/src/main/java/com/fr/design/widget/ui/btn/FreeButtonDetailPane.java +++ b/designer-realize/src/main/java/com/fr/design/widget/ui/btn/FreeButtonDetailPane.java @@ -3,7 +3,6 @@ package com.fr.design.widget.ui.btn; import java.awt.Component; import com.fr.form.ui.FreeButton; -import com.fr.widgettheme.util.WidgetThemeDesignerUtils; /** * 自定义按钮 @@ -17,7 +16,7 @@ public class FreeButtonDetailPane extends AbstractExtraButtonPane { @Override protected Component createCenterPane() { - buttonSytleDefinedPane = creatButtonSytleDefinedPane(); + buttonSytleDefinedPane = new ButtonSytleDefinedPane(); return createExtraPane(buttonSytleDefinedPane); } @@ -28,17 +27,13 @@ public class FreeButtonDetailPane extends AbstractExtraButtonPane { public void populate(FreeButton button) { super.populate(button); - if (buttonSytleDefinedPane != null) { - buttonSytleDefinedPane.populate(button); - } + buttonSytleDefinedPane.populate(button); } @Override public FreeButton update() { FreeButton button = super.update(); - if (buttonSytleDefinedPane != null) { - buttonSytleDefinedPane.update(button); - } + buttonSytleDefinedPane.update(button); return button; } @@ -46,13 +41,4 @@ public class FreeButtonDetailPane extends AbstractExtraButtonPane { public Class classType() { return FreeButton.class; } - - /** - * 自定义按钮控件开启控件显示增强时,原有的buttonSytleDefinedPane会被保留 - * 内容和控件增强的pane重复,且不生效。其他控件目前不存在这种情况,因此要在实现这里做个判断 - * 如果开启控件增强,原有的ButtonSytleDefinedPane不展示,创建时返回null - */ - private ButtonSytleDefinedPane creatButtonSytleDefinedPane() { - return WidgetThemeDesignerUtils.enableWidgetEnhance() ? null : new ButtonSytleDefinedPane(); - } } \ No newline at end of file