diff --git a/designer-form/src/main/java/com/fr/design/widgettheme/processor/WidgetThemeCreatorPaneAdder.java b/designer-form/src/main/java/com/fr/design/widgettheme/processor/WidgetThemeCreatorPaneAdder.java index 1e36b42e0e..b2e3b70a86 100644 --- a/designer-form/src/main/java/com/fr/design/widgettheme/processor/WidgetThemeCreatorPaneAdder.java +++ b/designer-form/src/main/java/com/fr/design/widgettheme/processor/WidgetThemeCreatorPaneAdder.java @@ -1,8 +1,11 @@ package com.fr.design.widgettheme.processor; -import com.fr.design.widgettheme.common.SelectEditorSettingPane; -import com.fr.widgettheme.util.WidgetThemeDesignerUtils; import com.fr.design.beans.BasicBeanPane; +import com.fr.design.widgettheme.common.ButtonSettingPane; +import com.fr.design.widgettheme.common.EditorSettingPane; +import com.fr.design.widgettheme.common.NormalButtonSettingPane; +import com.fr.design.widgettheme.common.SelectEditorSettingPane; +import com.fr.design.widgettheme.common.TreeEditorSettingPane; import com.fr.form.parameter.FormSubmitButton; import com.fr.form.ui.Button; import com.fr.form.ui.CheckBox; @@ -21,10 +24,7 @@ import com.fr.form.ui.TreeEditor; import com.fr.report.web.button.form.TreeNodeToggleButton; import com.fr.report.web.button.write.AppendRowButton; import com.fr.report.web.button.write.DeleteRowButton; -import com.fr.design.widgettheme.common.ButtonSettingPane; -import com.fr.design.widgettheme.common.EditorSettingPane; -import com.fr.design.widgettheme.common.NormalButtonSettingPane; -import com.fr.design.widgettheme.common.TreeEditorSettingPane; +import com.fr.widgettheme.util.WidgetThemeDesignerUtils; import com.fr.widgettheme.utils.WidgetThemeServerUtils; import java.util.Arrays; @@ -97,7 +97,7 @@ public class WidgetThemeCreatorPaneAdder { } private static void acceptEditor(Class creator, List> extraPaneList) { - boolean accept = WidgetThemeServerUtils.isNewComboBoxTreeEditor(creator) || EDITOR_SET.contains(creator); + boolean accept = EDITOR_SET.contains(creator); if (accept) { insertShortCut(extraPaneList, new EditorSettingPane<>()); } @@ -126,7 +126,7 @@ public class WidgetThemeCreatorPaneAdder { } private static void acceptSelect(Class creator, List> extraPaneList) { - boolean accept = SELECT_SET.contains(creator); + boolean accept = WidgetThemeServerUtils.isNewComboBoxTreeEditor(creator) || SELECT_SET.contains(creator); if (accept) { insertShortCut(extraPaneList, new SelectEditorSettingPane<>()); }