Merge pull request #1577 in DESIGN/design from ~STARRYI/design:release/10.0 to release/10.0

* commit '82d69aa9cbc91db3f9bacde151531a7c7fde922b':
  MOBILE-26514 侧边导航设置了透明会导致保存失败
  MOBILE-26509 联排tab的标题背景色设置了"透明"，但在移动端上看是白色的，应该显示tab背景色

designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/SidebarMobileBookMarkStyleCustomDefinePane.java

@@ -358,9 +358,7 @@ public class SidebarMobileBookMarkStyleCustomDefinePane extends BasicBeanPane<Mo
         style.setGap((int) buttonGapSpinner.getValue());
         style.setBorderRadius((int) buttonBorderRadiusSpinner.getValue());
 
-        if (normalBackgroundColorBox.getSelectObject() != null) {
+        style.setBackgroundColor(normalBackgroundColorBox.getSelectObject());
-            style.setBackgroundColor(normalBackgroundColorBox.getSelectObject());
-        }
         style.setOpacity((int) normalOpacitySpinner.getValue());
         style.setBorderLineStyle(normalBorderWidthComBox.getSelectedLineStyle());
         style.setBorderColor(normalBorderColorBox.getSelectObject());
@@ -374,9 +372,7 @@ public class SidebarMobileBookMarkStyleCustomDefinePane extends BasicBeanPane<Mo
         style.setFontItalic(normalFontItalicButton.isSelected());
         style.setFontBold(normalFontBoldButton.isSelected());
 
-        if (selectedBackgroundColorBox.getSelectObject() != null) {
+        style.setSelectedBackgroundColor(selectedBackgroundColorBox.getSelectObject());
-            style.setSelectedBackgroundColor(selectedBackgroundColorBox.getSelectObject());
-        }
         style.setSelectedOpacity((int) selectedOpacitySpinner.getValue());
         style.setSelectedBorderLineStyle(selectedBorderWidthComBox.getSelectedLineStyle());
         style.setSelectedBorderColor(selectedBorderColorBox.getSelectObject());

designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/UniteStyleDefinePane.java

@@ -12,6 +12,7 @@ import com.fr.design.mainframe.widget.MobileTabFontConfPane;
 import com.fr.design.mainframe.widget.UITitleSplitLine;
 import com.fr.design.mainframe.widget.preview.MobileTemplatePreviewPane;
 import com.fr.design.style.color.ColorSelectBox;
+import com.fr.design.style.color.NewColorSelectBox;
 import com.fr.form.ui.container.cardlayout.WCardTagLayout;
 import com.fr.general.cardtag.mobile.MobileTemplateStyle;
 import com.fr.general.cardtag.mobile.TabFontConfig;
@@ -33,8 +34,8 @@ public class UniteStyleDefinePane extends MobileTemplateStyleDefinePane {
     private UnsignedIntUISpinner paddingLeftSpinner;
     private UnsignedIntUISpinner paddingRightSpinner;
 
-    private ColorSelectBox initialBackgroundColorBox;
+    private NewColorSelectBox initialBackgroundColorBox;
-    private ColorSelectBox selectedBackgroundColorBox;
+    private NewColorSelectBox selectedBackgroundColorBox;
 
     private LineComboBox borderWidthComboBox;
     private ColorSelectBox borderColorBox;
@@ -96,9 +97,9 @@ public class UniteStyleDefinePane extends MobileTemplateStyleDefinePane {
     }
 
     private JPanel createBackgroundColorConfPanel() {
-        this.initialBackgroundColorBox = new ColorSelectBox(LINE_COMPONENT_WIDTH);
+        this.initialBackgroundColorBox = new NewColorSelectBox(LINE_COMPONENT_WIDTH);
         this.initialBackgroundColorBox.setPreferredSize(new Dimension(LINE_COMPONENT_WIDTH, LINE_COMPONENT_HEIGHT));
-        this.selectedBackgroundColorBox = new ColorSelectBox(LINE_COMPONENT_WIDTH);
+        this.selectedBackgroundColorBox = new NewColorSelectBox(LINE_COMPONENT_WIDTH);
         this.selectedBackgroundColorBox.setPreferredSize(new Dimension(LINE_COMPONENT_WIDTH, LINE_COMPONENT_HEIGHT));
 
         UILabel initialBackgroundColorLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Mobile_Init_Fill") + ":", SwingConstants.RIGHT);