diff --git a/designer-base/src/main/java/com/fr/widgettheme/widget/mobile/pane/DisplayEnhanceMobileStyleDefinePane.java b/designer-base/src/main/java/com/fr/widgettheme/widget/mobile/pane/DisplayEnhanceMobileStyleDefinePane.java index 66aa578c5..a17f51874 100644 --- a/designer-base/src/main/java/com/fr/widgettheme/widget/mobile/pane/DisplayEnhanceMobileStyleDefinePane.java +++ b/designer-base/src/main/java/com/fr/widgettheme/widget/mobile/pane/DisplayEnhanceMobileStyleDefinePane.java @@ -44,8 +44,6 @@ import java.awt.Font; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; -import static com.fr.widgettheme.theme.widget.theme.WidgetThemeDisplayConstants.THEME_MOBILE_WIDGET_BACKGROUND_WIDTH; - /** *

开启控件显示增强后替换原通用属性面板 *

参考{@link com.fr.design.mainframe.mobile.ui.MobileStyleDefinePane} @@ -211,7 +209,7 @@ public class DisplayEnhanceMobileStyleDefinePane extends BasicBeanPane extends BasicBeanPa paneMap.put(StyleSetting.FONT, frFontPane); paneMap.put(StyleSetting.BTN_BACKGROUND, buttonStyleDefinedPane); paneMap.put(StyleSetting.SELECT_COLOR, selectBgColorBox); - paneMap.put(StyleSetting.WIDGET_BACKGROUND, WidgetStyleComponentCombiner.combineWidgetBackgroundComponent(widgetBgColorSelectBox, widgetBgAlphaDragPane, THEME_PC_WIDGET_BACKGROUND_WIDTH)); + paneMap.put(StyleSetting.WIDGET_BACKGROUND, WidgetStyleComponentCombiner.combineWidgetBackgroundComponent(widgetBgColorSelectBox, widgetBgAlphaDragPane, WidgetThemeDisplayConstants.THEME_PC_WIDGET_BACKGROUND_WIDTH)); paneMap.put(StyleSetting.ICON_COLOR, iconColorSelectBox); } diff --git a/designer-form/src/main/java/com/fr/design/widgettheme/ParaEditorSettingPane.java b/designer-form/src/main/java/com/fr/design/widgettheme/ParaEditorSettingPane.java index eb891a6b1..5a67090bc 100644 --- a/designer-form/src/main/java/com/fr/design/widgettheme/ParaEditorSettingPane.java +++ b/designer-form/src/main/java/com/fr/design/widgettheme/ParaEditorSettingPane.java @@ -2,20 +2,13 @@ package com.fr.design.widgettheme; import com.fr.design.widgettheme.common.EditorSettingPane; import com.fr.form.ui.Widget; -import com.fr.util.ColorUtils; import com.fr.widgettheme.theme.widget.style.ThemeTextStyle; import com.fr.widgettheme.theme.widget.theme.ParaEditorTheme; import com.fr.widgettheme.theme.widget.theme.cell.EditorTheme; -import com.fr.widgettheme.util.WidgetThemeDesignerUtils; -import java.awt.Color; import java.util.Arrays; import java.util.List; -import static com.fr.widgettheme.theme.widget.theme.WidgetThemeDisplayConstants.COLOR_091E40_HEX; -import static com.fr.widgettheme.theme.widget.theme.WidgetThemeDisplayConstants.COLOR_FFFFFF_HEX; - - /** * 设计器控件属性的“高级”设置增加主题样式设置项,包括: * 文本控件/数字控件/密码控件/文本域控件/下拉框控件/下拉复选框控件/下拉树控件/日期控件 diff --git a/designer-form/src/main/java/com/fr/design/widgettheme/ParaNormalButtonSettingPane.java b/designer-form/src/main/java/com/fr/design/widgettheme/ParaNormalButtonSettingPane.java index f083c7dc5..c50c6207e 100644 --- a/designer-form/src/main/java/com/fr/design/widgettheme/ParaNormalButtonSettingPane.java +++ b/designer-form/src/main/java/com/fr/design/widgettheme/ParaNormalButtonSettingPane.java @@ -1,6 +1,5 @@ package com.fr.design.widgettheme; -import com.fr.util.ColorUtils; import com.fr.widgettheme.theme.widget.style.FontStyle; import com.fr.design.widgettheme.common.NormalButtonSettingPane; import com.fr.form.ui.FreeButton; @@ -11,7 +10,6 @@ import com.fr.widgettheme.theme.widget.theme.cell.NormalButtonTheme; import java.util.Arrays; -import static com.fr.widgettheme.theme.widget.theme.WidgetThemeDisplayConstants.COLOR_FFFFFF_HEX; /** * 参数面板常规按钮设置窗口 *