Browse Source

消除一波插件警告

feature/x
obo 11 months ago
parent
commit
a2302fedc6
  1. 25
      designer-base/src/main/java/com/fr/widgettheme/widget/mobile/pane/MobileStyleFontConfigPane.java
  2. 14
      designer-base/src/main/java/com/fr/widgettheme/widget/mobile/provider/WidgetThemeMobileStyleDefinePaneCreator.java
  3. 4
      designer-form/src/main/java/com/fr/design/parameter/RootDesignDefinePane.java
  4. 4
      designer-form/src/main/java/com/fr/design/widget/ui/designer/ButtonDefinePane.java
  5. 4
      designer-form/src/main/java/com/fr/design/widget/ui/designer/CheckBoxDefinePane.java
  6. 4
      designer-form/src/main/java/com/fr/design/widget/ui/designer/DateEditorDefinePane.java
  7. 4
      designer-form/src/main/java/com/fr/design/widget/ui/designer/DirectWriteEditorDefinePane.java
  8. 4
      designer-form/src/main/java/com/fr/design/widget/ui/designer/LabelDefinePane.java
  9. 4
      designer-form/src/main/java/com/fr/design/widget/ui/designer/NumberEditorDefinePane.java
  10. 4
      designer-form/src/main/java/com/fr/design/widget/ui/designer/TextFieldEditorDefinePane.java
  11. 4
      designer-form/src/main/java/com/fr/design/widget/ui/designer/btn/ButtonGroupDefinePane.java
  12. 45
      designer-form/src/main/java/com/fr/design/widgettheme/BaseStyleSettingPane.java
  13. 1
      designer-form/src/main/java/com/fr/design/widgettheme/LabelSettingPane.java
  14. 1
      designer-form/src/main/java/com/fr/design/widgettheme/common/ButtonSettingPane.java
  15. 1
      designer-form/src/main/java/com/fr/design/widgettheme/common/EditorSettingPane.java
  16. 1
      designer-form/src/main/java/com/fr/design/widgettheme/common/NormalButtonSettingPane.java
  17. 1
      designer-form/src/main/java/com/fr/design/widgettheme/common/TreeEditorSettingPane.java
  18. 40
      designer-form/src/main/java/com/fr/design/widgettheme/processor/WidgetThemeCreatorPaneAcceptor.java
  19. 4
      designer-form/src/main/java/com/fr/design/widgettheme/processor/WidgetThemeParaCreatorPaneAcceptor.java

25
designer-base/src/main/java/com/fr/widgettheme/widget/mobile/pane/MobileStyleFontConfigPane.java

@ -33,19 +33,23 @@ import java.util.Vector;
* @since 11.0
* Created on 2023/5/22
*/
public class MobileStyleFontConfigPane extends JPanel {
public static final int FONT_NONE = 0;
private static final int MAX_FONT_SIZE = 18;
private static final int MIN_FONT_SIZE = 12;
private static final Dimension BUTTON_SIZE = new Dimension(20, 18);
/**
* 获取字体大小集合
*
* @return 字体大小集合
*/
public static Vector<Integer> getFontSizes() {
Vector<Integer> FONT_SIZES = new Vector<Integer>();
Vector<Integer> fontSizes = new Vector<Integer>();
for (int i = MIN_FONT_SIZE; i <= MAX_FONT_SIZE; i++) {
FONT_SIZES.add(i);
fontSizes.add(i);
}
return FONT_SIZES;
return fontSizes;
}
private UIComboBox fontSizeComboBox;
@ -75,12 +79,12 @@ public class MobileStyleFontConfigPane extends JPanel {
this.setButtonsTips();
this.setButtonsSize(BUTTON_SIZE);
Component[] components_font = new Component[]{
Component[] componentFont = new Component[]{
fontSizeComboBox, color, italic, bold
};
JPanel buttonPane = new JPanel(new BorderLayout());
JPanel flowPane = GUICoreUtils.createFlowPane(components_font, FlowLayout.LEFT, LayoutConstants.HGAP_LARGE);
JPanel flowPane = GUICoreUtils.createFlowPane(componentFont, FlowLayout.LEFT, LayoutConstants.HGAP_LARGE);
// 4是flowPane的默认横向gap,但会导致最左边的控件和边上也有4的间隙,调整一下
flowPane.setBorder(new EmptyBorder(0, -LayoutConstants.HGAP_LARGE, 0, 0));
buttonPane.add(flowPane);
@ -101,7 +105,11 @@ public class MobileStyleFontConfigPane extends JPanel {
bold.setPreferredSize(size);
}
/**
* 填充字体
*
* @param frFont 字体
*/
public void populateBean(FRFont frFont) {
fontSizeComboBox.setSelectedItem(frFont.getSize());
color.setColor(frFont.getForeground());
@ -109,6 +117,9 @@ public class MobileStyleFontConfigPane extends JPanel {
italic.setSelected(frFont.isItalic());
}
/**
* 更新字体
*/
public FRFont updateBean() {
int style = Font.PLAIN;
style += this.bold.isSelected() ? Font.BOLD : Font.PLAIN;

14
designer-base/src/main/java/com/fr/widgettheme/widget/mobile/provider/WidgetThemeMobileStyleDefinePaneCreator.java

@ -29,6 +29,14 @@ public class WidgetThemeMobileStyleDefinePaneCreator {
private WidgetThemeMobileStyleDefinePaneCreator() {
}
/**
* 创建移动端控件样式属性窗口
*
* @param widget 控件
* @param customDefinePane 窗口类
* @param mobileStyle 样式类
* @return 窗口
*/
public static BasicBeanPane<MobileStyle> createBaseBeanPane(Widget widget, Class<? extends MobileStyleCustomDefinePane> customDefinePane, Class<? extends MobileStyle> mobileStyle) {
try {
JTemplate<?, ?> jTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
@ -49,6 +57,12 @@ public class WidgetThemeMobileStyleDefinePaneCreator {
return null;
}
/**
* 根据控件获取通用扩展属性类
*
* @param widget 控件
* @return class
*/
public static @NotNull Class<? extends MobileCommonExtraStyle> classForCommonExtraStyle(Widget widget) {
if (commonWidget(widget)) {
return WidgetThemeMobileCommonExtraStyle.class;

4
designer-form/src/main/java/com/fr/design/parameter/RootDesignDefinePane.java

@ -28,7 +28,7 @@ import com.fr.design.mainframe.FormDesigner;
import com.fr.design.mainframe.FormSelection;
import com.fr.design.mainframe.JTemplate;
import com.fr.design.mainframe.widget.accessibles.AccessibleBackgroundEditor;
import com.fr.design.widgettheme.processor.WidgetThemeXCreaterPaneAcceptor;
import com.fr.design.widgettheme.processor.WidgetThemeParaCreatorPaneAcceptor;
import com.fr.design.utils.gui.LayoutUtils;
import com.fr.design.utils.gui.UIComponentUtils;
import com.fr.design.widget.ui.designer.AbstractDataModify;
@ -204,7 +204,7 @@ public class RootDesignDefinePane extends AbstractDataModify<WParameterLayout> {
private void refreshExtraAdvancedPane() {
extraPaneList.clear();
backgroundPane.removeAll();
new WidgetThemeXCreaterPaneAcceptor<WParameterLayout>().accept(creator, extraPaneList);
new WidgetThemeParaCreatorPaneAcceptor<WParameterLayout>().accept(creator, extraPaneList);
Set<WidgetAdvancedPaneProvider<WParameterLayout>> providers = ExtraDesignClassManager.getInstance().getArray(WidgetAdvancedPaneProvider.XML_TAG);
for (WidgetAdvancedPaneProvider<WParameterLayout> provider : providers) {
if (!provider.accept(creator)) {

4
designer-form/src/main/java/com/fr/design/widget/ui/designer/ButtonDefinePane.java

@ -12,7 +12,7 @@ import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper;
import com.fr.design.mainframe.widget.accessibles.AccessibleIconEditor;
import com.fr.design.widgettheme.processor.WidgetThemeXCreaterPaneAcceptor;
import com.fr.design.widgettheme.processor.WidgetThemeParaCreatorPaneAcceptor;
import com.fr.design.widget.btn.ButtonConstants;
import com.fr.form.ui.Button;
import com.fr.general.GeneralContext;
@ -66,7 +66,7 @@ public abstract class ButtonDefinePane<T extends Button> extends AbstractDataMod
private void refreshAdvancedPane() {
extraPaneList.clear();
new WidgetThemeXCreaterPaneAcceptor<T>().accept(creator, extraPaneList);
new WidgetThemeParaCreatorPaneAcceptor<T>().accept(creator, extraPaneList);
containsExtraPane = !CollectionUtils.isEmpty(extraPaneList);
Set<WidgetAdvancedPaneProvider<T>> providers = ExtraDesignClassManager.getInstance().getArray(WidgetAdvancedPaneProvider.XML_TAG);
for (WidgetAdvancedPaneProvider<T> provider : providers) {

4
designer-form/src/main/java/com/fr/design/widget/ui/designer/CheckBoxDefinePane.java

@ -11,7 +11,7 @@ import com.fr.design.gui.itextfield.UITextField;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper;
import com.fr.design.widgettheme.processor.WidgetThemeXCreaterPaneAcceptor;
import com.fr.design.widgettheme.processor.WidgetThemeParaCreatorPaneAcceptor;
import com.fr.design.widget.ui.designer.component.FontSizeComboPane;
import com.fr.design.widget.ui.designer.component.FormWidgetValuePane;
import com.fr.form.ui.CheckBox;
@ -78,7 +78,7 @@ public class CheckBoxDefinePane extends AbstractDataModify<CheckBox> {
protected void refreshExtraAdvancedPane() {
extraPaneList.clear();
new WidgetThemeXCreaterPaneAcceptor<CheckBox>().accept(creator, extraPaneList);
new WidgetThemeParaCreatorPaneAcceptor<CheckBox>().accept(creator, extraPaneList);
boolean containsExtraPane = !CollectionUtils.isEmpty(extraPaneList);
Set<WidgetAdvancedPaneProvider<CheckBox>> providers = ExtraDesignClassManager.getInstance().getArray(WidgetAdvancedPaneProvider.XML_TAG);
for (WidgetAdvancedPaneProvider<CheckBox> provider : providers) {

4
designer-form/src/main/java/com/fr/design/widget/ui/designer/DateEditorDefinePane.java

@ -14,7 +14,7 @@ import com.fr.design.gui.icombobox.UIComboBox;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.layout.TableLayoutHelper;
import com.fr.design.widgettheme.processor.WidgetThemeXCreaterPaneAcceptor;
import com.fr.design.widgettheme.processor.WidgetThemeParaCreatorPaneAcceptor;
import com.fr.design.widget.component.DateValuePane;
import com.fr.design.widget.component.UIComboBoxNoArrow;
import com.fr.design.widget.ui.designer.component.FormWidgetValuePane;
@ -100,7 +100,7 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane<DateEditor
protected void refreshExtraAdvancedPane() {
extraPaneList.clear();
new WidgetThemeXCreaterPaneAcceptor<DateEditor>().accept(creator, extraPaneList);
new WidgetThemeParaCreatorPaneAcceptor<DateEditor>().accept(creator, extraPaneList);
boolean containsExtraPane = !CollectionUtils.isEmpty(extraPaneList);
Set<WidgetAdvancedPaneProvider<DateEditor>> providers = ExtraDesignClassManager.getInstance().getArray(WidgetAdvancedPaneProvider.XML_TAG);
for (WidgetAdvancedPaneProvider<DateEditor> provider : providers) {

4
designer-form/src/main/java/com/fr/design/widget/ui/designer/DirectWriteEditorDefinePane.java

@ -9,7 +9,7 @@ import com.fr.design.gui.icheckbox.UICheckBox;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.layout.TableLayoutHelper;
import com.fr.design.widgettheme.processor.WidgetThemeXCreaterPaneAcceptor;
import com.fr.design.widgettheme.processor.WidgetThemeParaCreatorPaneAcceptor;
import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.design.widget.ui.designer.component.FormWidgetValuePane;
import com.fr.form.ui.DirectWriteEditor;
@ -68,7 +68,7 @@ public abstract class DirectWriteEditorDefinePane<T extends DirectWriteEditor> e
protected void refreshExtraAdvancedPane() {
extraPaneList.clear();
new WidgetThemeXCreaterPaneAcceptor<T>().accept(creator, extraPaneList);
new WidgetThemeParaCreatorPaneAcceptor<T>().accept(creator, extraPaneList);
boolean containsExtraPane = !CollectionUtils.isEmpty(extraPaneList);
Set<WidgetAdvancedPaneProvider<T>> providers = ExtraDesignClassManager.getInstance().getArray(WidgetAdvancedPaneProvider.XML_TAG);
for (WidgetAdvancedPaneProvider<T> provider : providers) {

4
designer-form/src/main/java/com/fr/design/widget/ui/designer/LabelDefinePane.java

@ -15,7 +15,7 @@ import com.fr.design.gui.style.FRFontPane;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper;
import com.fr.design.widgettheme.processor.WidgetThemeXCreaterPaneAcceptor;
import com.fr.design.widgettheme.processor.WidgetThemeParaCreatorPaneAcceptor;
import com.fr.design.widget.FRWidgetFactory;
import com.fr.design.widget.ui.designer.component.FormWidgetValuePane;
import com.fr.form.ui.Label;
@ -111,7 +111,7 @@ public class LabelDefinePane extends AbstractDataModify<Label> {
protected void refreshExtraAdvancedPane() {
extraPaneList.clear();
new WidgetThemeXCreaterPaneAcceptor<Label>().accept(creator, extraPaneList);
new WidgetThemeParaCreatorPaneAcceptor<Label>().accept(creator, extraPaneList);
boolean containsExtraPane = !CollectionUtils.isEmpty(extraPaneList);
Set<WidgetAdvancedPaneProvider<Label>> providers = ExtraDesignClassManager.getInstance().getArray(WidgetAdvancedPaneProvider.XML_TAG);
for (WidgetAdvancedPaneProvider<Label> provider : providers) {

4
designer-form/src/main/java/com/fr/design/widget/ui/designer/NumberEditorDefinePane.java

@ -10,7 +10,7 @@ import com.fr.design.gui.ispinner.UIBasicSpinner;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper;
import com.fr.design.widgettheme.processor.WidgetThemeXCreaterPaneAcceptor;
import com.fr.design.widgettheme.processor.WidgetThemeParaCreatorPaneAcceptor;
import com.fr.design.widget.component.NumberEditorValidatePane;
import com.fr.design.widget.ui.designer.component.FormWidgetValuePane;
import com.fr.form.ui.NumberEditor;
@ -76,7 +76,7 @@ public class NumberEditorDefinePane extends FieldEditorDefinePane<NumberEditor>
protected void refreshExtraAdvancedPane() {
extraPaneList.clear();
new WidgetThemeXCreaterPaneAcceptor<NumberEditor>().accept(creator, extraPaneList);
new WidgetThemeParaCreatorPaneAcceptor<NumberEditor>().accept(creator, extraPaneList);
boolean containsExtraPane = !CollectionUtils.isEmpty(extraPaneList);
Set<WidgetAdvancedPaneProvider<NumberEditor>> providers = ExtraDesignClassManager.getInstance().getArray(WidgetAdvancedPaneProvider.XML_TAG);
for (WidgetAdvancedPaneProvider<NumberEditor> provider : providers) {

4
designer-form/src/main/java/com/fr/design/widget/ui/designer/TextFieldEditorDefinePane.java

@ -12,7 +12,7 @@ import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.itextfield.UITextField;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.layout.TableLayoutHelper;
import com.fr.design.widgettheme.processor.WidgetThemeXCreaterPaneAcceptor;
import com.fr.design.widgettheme.processor.WidgetThemeParaCreatorPaneAcceptor;
import com.fr.design.widget.ui.designer.component.FormWidgetValuePane;
import com.fr.form.ui.TextEditor;
import com.fr.log.FineLoggerFactory;
@ -87,7 +87,7 @@ public class TextFieldEditorDefinePane extends FieldEditorDefinePane<TextEditor>
protected void refreshExtraAdvancedPane() {
extraPaneList.clear();
new WidgetThemeXCreaterPaneAcceptor<TextEditor>().accept(creator, extraPaneList);
new WidgetThemeParaCreatorPaneAcceptor<TextEditor>().accept(creator, extraPaneList);
boolean containsExtraPane = !CollectionUtils.isEmpty(extraPaneList);
Set<WidgetAdvancedPaneProvider<TextEditor>> providers = ExtraDesignClassManager.getInstance().getArray(WidgetAdvancedPaneProvider.XML_TAG);
for (WidgetAdvancedPaneProvider<TextEditor> provider : providers) {

4
designer-form/src/main/java/com/fr/design/widget/ui/designer/btn/ButtonGroupDefinePane.java

@ -11,7 +11,7 @@ import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper;
import com.fr.design.mainframe.widget.accessibles.AccessibleDictionaryEditor;
import com.fr.design.widgettheme.processor.WidgetThemeXCreaterPaneAcceptor;
import com.fr.design.widgettheme.processor.WidgetThemeParaCreatorPaneAcceptor;
import com.fr.design.widget.ui.designer.ButtonGroupDictPane;
import com.fr.design.widget.ui.designer.FieldEditorDefinePane;
import com.fr.design.widget.ui.designer.component.FormWidgetValuePane;
@ -70,7 +70,7 @@ public abstract class ButtonGroupDefinePane<T extends ButtonGroup> extends Field
protected void refreshExtraAdvancedPane() {
extraPaneList.clear();
new WidgetThemeXCreaterPaneAcceptor<T>().accept(creator, extraPaneList);
new WidgetThemeParaCreatorPaneAcceptor<T>().accept(creator, extraPaneList);
boolean containsExtraPane = !CollectionUtils.isEmpty(extraPaneList);
Set<WidgetAdvancedPaneProvider<T>> providers = ExtraDesignClassManager.getInstance().getArray(WidgetAdvancedPaneProvider.XML_TAG);
for (WidgetAdvancedPaneProvider<T> provider : providers) {

45
designer-form/src/main/java/com/fr/design/widgettheme/BaseStyleSettingPane.java

@ -85,11 +85,7 @@ public abstract class BaseStyleSettingPane<T extends Widget> extends BasicBeanPa
styleSettingList.forEach(it -> {
switch (it) {
case STYLE_TYPE:
style1 = new UIRadioButton(Toolkit.i18nText("Fine-Design_Widget_Theme_Style_1"));
style2 = new UIRadioButton(Toolkit.i18nText("Fine-Design_Widget_Theme_Style_2"));
ButtonGroup buttonGroup = new ButtonGroup();
buttonGroup.add(style1);
buttonGroup.add(style2);
initStyle();
break;
case THEME_COLOR:
colorSelectBox = new NewColorSelectBox(160, true);
@ -115,6 +111,16 @@ public abstract class BaseStyleSettingPane<T extends Widget> extends BasicBeanPa
});
}
/**
* 初始化style1和style2
*/
private void initStyle() {
style1 = new UIRadioButton(Toolkit.i18nText("Fine-Design_Widget_Theme_Style_1"));
style2 = new UIRadioButton(Toolkit.i18nText("Fine-Design_Widget_Theme_Style_2"));
ButtonGroup buttonGroup = new ButtonGroup();
buttonGroup.add(style1);
buttonGroup.add(style2);
}
protected JPanel createHeadPane() {
UILabel headLabel = new UILabel(Toolkit.i18nText("Fine-Design_Widget_Theme_Style_Setting"));
@ -215,9 +221,21 @@ public abstract class BaseStyleSettingPane<T extends Widget> extends BasicBeanPa
}
private void setThemedStyle(ThemedWidgetStyle widgetStyle) {
setColorSelectBox(widgetStyle);
setStyle(widgetStyle);
setLineComboBox(widgetStyle);
setBorderRadiusSpinner(widgetStyle);
setFontSizePane(widgetStyle);
setFrFontPane(widgetStyle);
setButtonStyleDefinedPane(widgetStyle);
}
private void setColorSelectBox(ThemedWidgetStyle widgetStyle) {
if (colorSelectBox != null) {
colorSelectBox.setSelectObject(widgetStyle.getThemeColor());
}
}
private void setStyle(ThemedWidgetStyle widgetStyle) {
if (widgetStyle.getStyleType() == WidgetThemeDisplayConstants.DEFAULT_STYLE) {
if (style1 != null) {
style1.setSelected(true);
@ -227,24 +245,37 @@ public abstract class BaseStyleSettingPane<T extends Widget> extends BasicBeanPa
style2.setSelected(true);
}
}
if (lineComboBox != null) {
}
private void setLineComboBox(ThemedWidgetStyle widgetStyle) {
if (lineComboBox != null) {
lineComboBox.setSelectedLineStyle(widgetStyle.getBorderStyle().getLineType());
}
}
private void setBorderRadiusSpinner(ThemedWidgetStyle widgetStyle) {
if (borderRadiusSpinner != null) {
borderRadiusSpinner.setValue(widgetStyle.getBorderStyle().getRadius());
}
}
private void setFontSizePane(ThemedWidgetStyle widgetStyle) {
if (fontSizePane != null) {
fontSizePane.setValue(widgetStyle.getFontSizeStyle().getFontSize());
}
}
private void setFrFontPane(ThemedWidgetStyle widgetStyle) {
if (frFontPane != null) {
frFontPane.populateBean(widgetStyle.getFontStyle().getFont());
}
}
private void setButtonStyleDefinedPane(ThemedWidgetStyle widgetStyle) {
if (buttonStyleDefinedPane != null) {
buttonStyleDefinedPane.populate(ButtonBackground.create(widgetStyle.getButtonBackgroundStyle()));
}
}
private void setDefaultStyle() {
if (colorSelectBox != null) {
colorSelectBox.setSelectObject(WidgetThemeDisplayConstants.DEFAULT_COLOR);

1
designer-form/src/main/java/com/fr/design/widgettheme/LabelSettingPane.java

@ -26,7 +26,6 @@ public class LabelSettingPane<T extends Widget> extends BaseStyleSettingPane<T>
LabelTheme widgetTheme = initLabelTheme(t);
if (widgetTheme.isFollowTheme()) {
styleSettingHead.setSelectedIndex(0);
// todo 参数面板里的控件样式跟随改变
} else {
styleSettingHead.setSelectedIndex(1);
FRFont font = ((Label) t).getFont();

1
designer-form/src/main/java/com/fr/design/widgettheme/common/ButtonSettingPane.java

@ -62,7 +62,6 @@ public class ButtonSettingPane<T extends Widget> extends BaseStyleSettingPane<T>
protected void populateButtonBean(ButtonTheme buttonTheme) {
if (buttonTheme.isFollowTheme()) {
styleSettingHead.setSelectedIndex(0);
// todo 参数面板里的控件样式跟随改变
} else {
styleSettingHead.setSelectedIndex(1);
colorSelectBox.setSelectObject(buttonTheme.getThemeColor());

1
designer-form/src/main/java/com/fr/design/widgettheme/common/EditorSettingPane.java

@ -71,7 +71,6 @@ public class EditorSettingPane<T extends Widget> extends BaseStyleSettingPane<T>
protected void populateEditorBean(EditorTheme editorTheme) {
if (editorTheme.isFollowTheme()) {
styleSettingHead.setSelectedIndex(0);
// todo 参数面板里的控件样式跟随改变
} else {
styleSettingHead.setSelectedIndex(1);
colorSelectBox.setSelectObject(editorTheme.getThemeColor());

1
designer-form/src/main/java/com/fr/design/widgettheme/common/NormalButtonSettingPane.java

@ -58,7 +58,6 @@ public class NormalButtonSettingPane<T extends Widget> extends BaseStyleSettingP
protected void populateNormalButtonBean(NormalButtonTheme widgetTheme) {
if (widgetTheme.isFollowTheme()) {
styleSettingHead.setSelectedIndex(0);
// todo 参数面板里的控件样式跟随改变
} else {
styleSettingHead.setSelectedIndex(1);
lineComboBox.setSelectedLineStyle(widgetTheme.getBorderStyle().getLineType());

1
designer-form/src/main/java/com/fr/design/widgettheme/common/TreeEditorSettingPane.java

@ -54,7 +54,6 @@ public class TreeEditorSettingPane<T extends TreeEditor> extends BaseStyleSettin
protected void populateTreeBean(TreeTheme treeTheme) {
if (treeTheme.isFollowTheme()) {
styleSettingHead.setSelectedIndex(0);
// todo 参数面板里的控件样式跟随改变
} else {
styleSettingHead.setSelectedIndex(1);
colorSelectBox.setSelectObject(treeTheme.getThemeColor());

40
designer-form/src/main/java/com/fr/design/widgettheme/processor/WidgetThemeCreatorPaneAcceptor.java

@ -25,7 +25,10 @@ import com.fr.design.widgettheme.common.EditorSettingPane;
import com.fr.design.widgettheme.common.NormalButtonSettingPane;
import com.fr.design.widgettheme.common.TreeEditorSettingPane;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
/**
* 控件主题窗口创建处理类
@ -44,6 +47,32 @@ public class WidgetThemeCreatorPaneAcceptor<T> {
//
}
/**
* editor相关处理类
*/
private final Set<Class> editorSet = new HashSet<>(Arrays.asList(
TextArea.class,
TextEditor.class,
NumberEditor.class,
Password.class,
ComboBox.class,
ComboCheckBox.class,
DateEditor.class,
TreeComboBoxEditor.class
));
/**
* normal相关处理类
*/
private final Set<Class> normalSet = new HashSet<>(Arrays.asList(
AppendRowButton.class,
FreeButton.class,
DeleteRowButton.class,
FormSubmitButton.class,
TreeNodeToggleButton.class,
Button.class
));
/**
* 遍历判断当前控件creator类型将符合条件的窗口添加到extraPaneList中
*
@ -65,11 +94,7 @@ public class WidgetThemeCreatorPaneAcceptor<T> {
private void acceptEditor(Class creator, List<BasicBeanPane<T>> extraPaneList) {
boolean accept = WidgetThemeDesignerUtils.enableWidgetEnhance()
&& (creator == TextArea.class || creator == TextEditor.class
|| creator == NumberEditor.class || creator == Password.class
|| creator == ComboBox.class || creator == ComboCheckBox.class
|| creator == DateEditor.class || creator == TreeComboBoxEditor.class)
|| WidgetThemeDesignerUtils.isNewComboBoxTreeEditor(creator);
&& (WidgetThemeDesignerUtils.isNewComboBoxTreeEditor(creator) || editorSet.contains(creator));
if (accept) {
insertShortCut(extraPaneList, new EditorSettingPane<>());
}
@ -92,10 +117,7 @@ public class WidgetThemeCreatorPaneAcceptor<T> {
}
private void acceptNormal(Class creator, List<BasicBeanPane<T>> extraPaneList) {
boolean accept = WidgetThemeDesignerUtils.enableWidgetEnhance()
&& (creator == AppendRowButton.class || creator == FreeButton.class
|| creator == DeleteRowButton.class || creator == FormSubmitButton.class
|| creator == TreeNodeToggleButton.class || creator == Button.class);
boolean accept = WidgetThemeDesignerUtils.enableWidgetEnhance() && normalSet.contains(creator);
if (accept) {
insertShortCut(extraPaneList, new NormalButtonSettingPane<>());
}

4
designer-form/src/main/java/com/fr/design/widgettheme/processor/WidgetThemeXCreaterPaneAcceptor.java → designer-form/src/main/java/com/fr/design/widgettheme/processor/WidgetThemeParaCreatorPaneAcceptor.java

@ -32,9 +32,9 @@ import java.util.List;
* @since 11.0
* Created on 2023/11/13
*/
public class WidgetThemeXCreaterPaneAcceptor<T> {
public class WidgetThemeParaCreatorPaneAcceptor<T> {
public WidgetThemeXCreaterPaneAcceptor() {
public WidgetThemeParaCreatorPaneAcceptor() {
}
/**
Loading…
Cancel
Save