Pull request #14932: REPORT-136088 - 【fr-fbp回归】模板主题控件样式tab，布局问题

Merge in DESIGN/design from ~RENEKTON/design:fbp/release to fbp/release

* commit 'fbaa15f962a62bf5733df2ba7597d5defbb53468':
  修改拖拽条颜色
  去除html标签

designer-base/src/main/java/com/fine/theme/light/ui/FineSliderUI.java

@@ -50,6 +50,11 @@ public class FineSliderUI extends FlatSliderUI {
         defaultLabelHeight = FineUIUtils.getAndScaleInt("Slider.labelHeight", DEFAULT_LABEL_HEIGHT);
     }
 
+    @Override
+    protected Color getTrackColor() {
+        return trackColor;
+    }
+
     @Override
     protected void calculateLabelRect() {
 

designer-base/src/main/java/com/fr/widgettheme/theme/edit/widget/WidgetStyleEditPane.java

@@ -5,6 +5,7 @@ import com.fr.base.theme.TemplateTheme;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.designer.IntervalConstants;
 import com.fr.design.gui.frpane.FontSizeComboPane;
+import com.fr.design.gui.frpane.UINumberDragPaneWithPercent;
 import com.fr.design.gui.frpane.UIPercentDragPane;
 import com.fr.design.gui.ibutton.UIColorButton;
 import com.fr.design.gui.ibutton.UIToggleButton;
@@ -67,7 +68,7 @@ public class WidgetStyleEditPane<T extends TemplateTheme> extends BasicBeanPane<
      * 控件背景和透明度配置面板
      */
     protected NewColorSelectBox widgetBgColorSelectBox;
-    protected UIPercentDragPane widgetBgAlphaDragPane;
+    protected UINumberDragPaneWithPercent widgetBgAlphaDragPane;
     /**
      * 图标颜色
      */
@@ -130,7 +131,7 @@ public class WidgetStyleEditPane<T extends TemplateTheme> extends BasicBeanPane<
         colorSelectBox = new NewColorSelectBox(WidgetThemeDisplayConstants.THEME_WIDGET_COMPONENT_WIDTH, true);
         colorSelectBox.setSelectObject(WidgetThemeDisplayConstants.DEFAULT_THEME_COLOR);
         widgetBgColorSelectBox = new NewColorSelectBox(WidgetThemeDisplayConstants.THEME_WIDGET_COMPONENT_WIDTH, true);
-        widgetBgAlphaDragPane = new UIPercentDragPane();
+        widgetBgAlphaDragPane = new UINumberDragPaneWithPercent(0, 100, 1);
         initLineBox();
         borderRadiusSpinner = new UISpinner(0, Integer.MAX_VALUE, 1);
         iconColorSelectBox = new NewColorSelectBox(WidgetThemeDisplayConstants.THEME_WIDGET_COMPONENT_WIDTH, true);

designer-base/src/main/resources/com/fine/theme/light/ui/laf/FineLightLaf.properties

@@ -147,6 +147,7 @@ tooltip.normal=#3F506A
 tooltip.disabled=#A3ADBD
 hover.deep=#e2fbe6
 fill.deep=#F6F9FE
+track.normal=#DADEE7
 
 #---- Button ----
 
@@ -731,7 +732,7 @@ Slider.trackWidth = 2
 Slider.thumbSize = 12,12
 Slider.focusWidth=0
 Slider.trackValueColor=$brand.normal
-Slider.trackColor=$border.divider
+Slider.trackColor=$track.normal
 Slider.thumbColor=$fill.normal
 Slider.thumbBorderColor=$border.divider
 Slider.tickColor = @disabledForeground