diff --git a/designer-form/src/main/java/com/fr/design/widgettheme/BaseStyleSettingPane.java b/designer-form/src/main/java/com/fr/design/widgettheme/BaseStyleSettingPane.java index 3a6297b26f..0acee5550e 100644 --- a/designer-form/src/main/java/com/fr/design/widgettheme/BaseStyleSettingPane.java +++ b/designer-form/src/main/java/com/fr/design/widgettheme/BaseStyleSettingPane.java @@ -299,6 +299,6 @@ public abstract class BaseStyleSettingPane extends BasicBeanPa labelMap.put(StyleSetting.LINE_TYPE, new UILabel(Toolkit.i18nText("Fine-Design_Widget_Theme_Border_Line"))); labelMap.put(StyleSetting.BORDER_RADIUS, new UILabel(Toolkit.i18nText("Fine-Design_Widget_Theme_Border_Radius"))); labelMap.put(StyleSetting.BTN_BACKGROUND, new UILabel(Toolkit.i18nText("Fine-Design_Theme_Widget_Background"))); - labelMap.put(StyleSetting.SELECT_COLOR, new UILabel(Toolkit.i18nText("下拉面板色"))); + labelMap.put(StyleSetting.SELECT_COLOR, new UILabel(Toolkit.i18nText("Fine-Design_Widget_Background_Select_Box"))); } } diff --git a/designer-realize/src/main/java/com/fr/design/webattr/FToolBar.java b/designer-realize/src/main/java/com/fr/design/webattr/FToolBar.java index 06f7eebf5d..df697b19ac 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/FToolBar.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/FToolBar.java @@ -12,7 +12,7 @@ public class FToolBar { private Background background = null; private boolean isDefault = true; - private boolean isBgColorLight = true; + private boolean buttonBgColorLight = true; public List getButtonlist() { return buttonlist; } @@ -54,11 +54,11 @@ public class FToolBar { } public boolean isBgColorLight() { - return isBgColorLight; + return buttonBgColorLight; } public void setBgColorLight(boolean bgColorLight) { - this.isBgColorLight = bgColorLight; + this.buttonBgColorLight = bgColorLight; } public ToolBar getToolBar() { @@ -69,7 +69,7 @@ public class FToolBar { ToolBar toolBar = new ToolBar(n); toolBar.setBackground(this.background); toolBar.setDefault(this.isDefault); - toolBar.setButtonBgColorLight(this.isBgColorLight); + toolBar.setButtonBgColorLight(this.buttonBgColorLight); return toolBar; } } \ No newline at end of file