Pull request #5570: REPORT-58188 & REPORT-58038 & REPORT-58209

Merge in DESIGN/design from ~STARRYI/design:feature/x to feature/x

* commit 'c9118e0becd0d12bc4864a582031b3ad1e8e01e5':
  REPORT-58209 【主题切换】配色编辑修改一个配色，会同时改变两列模板预览的配色内容
  REPORT-58038 【主题切换】模板打开，模板应用的主题修改后，右侧面板有一个快速切换的效果
  REPORT-58188 【主题切换】tab设置边框色以后，tab标题栏没了

designer-base/src/main/java/com/fr/design/mainframe/theme/edit/ui/ColorListPane.java

@@ -1,5 +1,6 @@
 package com.fr.design.mainframe.theme.edit.ui;
 
+import com.fr.base.FineColor;
 import com.fr.base.background.ColorBackground;
 import com.fr.design.event.UIObserver;
 import com.fr.design.event.UIObserverListener;
@@ -160,7 +161,9 @@ public class ColorListPane extends JPanel implements UIObserver {
             colorPane.addChangeListener(new ChangeListener() {
                 public void stateChanged(ChangeEvent e) {
                     hidePopupMenu();
-                    color = ((NewColorSelectPane) e.getSource()).getColor();
+                    FineColor fineColor = ((NewColorSelectPane) e.getSource()).getColor();
+                    // 不要直接使用原始的FineColor对象，它的值会变化，这里实际需要的内部的真实颜色
+                    color = fineColor.getColor();
                     fireDisplayComponent(ColorBackground.getInstance(color));
                     ColorListPane.ColorButton.this.fireStateChanged();
                 }

designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardLayout.java

@@ -406,15 +406,10 @@ public class XWCardLayout extends XLayoutContainer {
 
     private void initBorderTitleStyle(BorderPacker style) {
         //初始化默认标题样式
-        if (!initFlag) {
-            return;
-        }
-
         style.setType(LayoutBorderStyle.TITLE);
         style.setBorder(Constants.LINE_THIN);
         TitlePacker widgetTitle = style.getTitle();
         widgetTitle.setBackground(ColorBackground.getInstance(TITLE_COLOR));
-        initFlag = false;
     }
 
     //隐藏或显示标题部分

designer-form/src/main/java/com/fr/design/mainframe/JForm.java

@@ -1190,12 +1190,12 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm<F
 
         getTarget().setTemplateTheme(newTheme, compatible);
 
+        fireTargetModified(shouldCreateUndoState);
         formDesign.refreshRoot();
         FormHierarchyTreePane.getInstance().refreshRoot();
         if (this.index != FORM_TAB) {
             refreshToolArea();
         }
-        fireTargetModified(shouldCreateUndoState);
 
         super.setTemplateTheme(newTheme, compatible);
     }