Browse Source

REPORT-107652 【最强控件】单元格的按钮控件,设置自定义后关闭开启显示增强,配置项显示异常

release/11.0
obo 1 year ago
parent
commit
92981d755a
  1. 11
      designer-realize/src/main/java/com/fr/design/widget/ui/btn/FreeButtonDetailPane.java

11
designer-realize/src/main/java/com/fr/design/widget/ui/btn/FreeButtonDetailPane.java

@ -3,6 +3,7 @@ package com.fr.design.widget.ui.btn;
import java.awt.Component; import java.awt.Component;
import com.fr.form.ui.FreeButton; import com.fr.form.ui.FreeButton;
import com.fr.widgettheme.util.WidgetThemeDesignerUtils;
/** /**
* 自定义按钮 * 自定义按钮
@ -16,7 +17,7 @@ public class FreeButtonDetailPane extends AbstractExtraButtonPane<FreeButton> {
@Override @Override
protected Component createCenterPane() { protected Component createCenterPane() {
buttonSytleDefinedPane = new ButtonSytleDefinedPane(); buttonSytleDefinedPane = WidgetThemeDesignerUtils.enableWidgetEnhance() ? null : new ButtonSytleDefinedPane();
return createExtraPane(buttonSytleDefinedPane); return createExtraPane(buttonSytleDefinedPane);
} }
@ -27,13 +28,17 @@ public class FreeButtonDetailPane extends AbstractExtraButtonPane<FreeButton> {
public void populate(FreeButton button) { public void populate(FreeButton button) {
super.populate(button); super.populate(button);
buttonSytleDefinedPane.populate(button); if (buttonSytleDefinedPane != null) {
buttonSytleDefinedPane.populate(button);
}
} }
@Override @Override
public FreeButton update() { public FreeButton update() {
FreeButton button = super.update(); FreeButton button = super.update();
buttonSytleDefinedPane.update(button); if (buttonSytleDefinedPane != null) {
buttonSytleDefinedPane.update(button);
}
return button; return button;
} }

Loading…
Cancel
Save