Pull request #5686: REPORT-58667 & CHART-20536 & REPORT-58539

Merge in DESIGN/design from ~STARRYI/design:release/11.0 to release/11.0

* commit 'a2c89df2d535ea06afdb74975ec129316ac19ac5':
  REPORT-58520 FR11-二轮回归-模板-纸张背景-背景设置显示不全
  REPORT-58539 【主题切换】悬浮元素-样式窗口ui优化
  CHART-20536 图表预定义配色，升级兼容后，主题配色面板内容固定不变
  REPORT-58667 【主题切换】修改模板主题管理的tab名称、窗口名称

designer-base/src/main/java/com/fr/design/mainframe/theme/dialog/TemplateThemeManageDialog.java

@@ -70,8 +70,8 @@ public class TemplateThemeManageDialog extends TemplateThemeDialog  {
             reportThemesManagerPane = TemplateThemeManagePane.createReportThemesManagerPane();
             reportThemesManagerPane.startListenThemeConfig();
 
-            tabbedPane.addTab(Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Manager_Dialog_FORM_TAB"), formThemesManagerPane);
+            tabbedPane.addTab(Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Manager_Dialog_Form_Tab"), formThemesManagerPane);
-            tabbedPane.addTab(Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Manager_Dialog_REPORT_TAB"), reportThemesManagerPane);
+            tabbedPane.addTab(Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Manager_Dialog_Report_Tab"), reportThemesManagerPane);
 
             tabbedPane.setSelectedIndex(0);
             JTemplate<?,?> template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();

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

@@ -66,10 +66,7 @@ public class ColorListExtendedPane extends JPanel implements MouseListener {
     public void populate(List<Color> colors) {
         if (colors.size() > 0) {
             colorList.clear();
-            for (int i = 0; i < colorCount; i++) {
+            colorList.addAll(colors);
-                Color color = colors.get(i % colorCount);
-                colorList.add(color);
-            }
             repaint();
         }
     }
@@ -132,7 +129,7 @@ public class ColorListExtendedPane extends JPanel implements MouseListener {
         super.paint(g);
         Color oldColor = g.getColor();
 
-        for (int i = 0; i < colorList.size(); i++) {
+        for (int i = 0; i < colorCount; i++) {
             int x = i * (boxSize + boxGap);
             for (int j = 0; j < extendedCount; j++) {
                 Color color = extendedColorComputer.computeExtendedColor(colorList.get(i), j, extendedCount);

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

@@ -88,10 +88,13 @@ public class ColorListPane extends JPanel implements UIObserver {
     }
 
     public void populate(List<Color> colors) {
-        for (int i = 0; i < colors.size() && i < colorList.size(); i++) {
+        colorList.clear();
-            Color color = colors.get(i % colorCount);
+        for (int i = 0; i < colors.size(); i++) {
-            colorList.set(i, color);
+            Color color = colors.get(i);
-            colorButtons.get(i).setSelectObject(color);
+            colorList.add(color);
+            if (i < colorCount) {
+                colorButtons.get(i).setSelectObject(color);
+            }
         }
     }
 

designer-base/src/main/java/com/fr/design/style/AlignmentPane.java

@@ -5,6 +5,7 @@ package com.fr.design.style;
 
 import com.fr.base.BaseUtils;
 import com.fr.base.Style;
+import com.fr.design.border.UITitledBorder;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.ibutton.UIRadioButton;
 import com.fr.design.gui.icheckbox.UICheckBox;
@@ -86,7 +87,7 @@ public class AlignmentPane extends BasicPane {
         //richer:文本控制和图片布局
         JPanel textDirectionPanel = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane();
         contentPane.add(textDirectionPanel);
-        textDirectionPanel.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation"), null));
+        textDirectionPanel.setBorder(UITitledBorder.createBorderWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation")));
         JPanel isVerticalTextPanel = FRGUIPaneFactory.createMediumHGapFlowInnerContainer_M_Pane();
         textDirectionPanel.add(isVerticalTextPanel);
         initVerticalPane(isVerticalTextPanel);
@@ -131,7 +132,7 @@ public class AlignmentPane extends BasicPane {
 
     private void initSpacingPane (JPanel spacingPane) {
         spacingPane.setLayout(new GridLayout(1, 3));
-        spacingPane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Spacing") + ":"));
+        spacingPane.setBorder(UITitledBorder.createBorderWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Spacing") + ":"));
 
         spacingBeforeSpinner = new UIBasicSpinner(new SpinnerNumberModel(new Integer(0), new Integer(0), null, new Integer(1)));
         spacingBeforeSpinner.addChangeListener(changeListener);
@@ -153,7 +154,7 @@ public class AlignmentPane extends BasicPane {
     private JPanel getIndentPane() {
         JPanel indentPane = FRGUIPaneFactory.createMediumHGapFlowInnerContainer_M_Pane();
 
-        indentPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Sytle_Indentation"), null));
+        indentPane.setBorder(UITitledBorder.createBorderWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Sytle_Indentation")));
         Comparable maximum = null;
         leftIndentSpinner = new UIBasicSpinner(new SpinnerNumberModel(new Integer(0), new Integer(0), maximum, new Integer(1)));
         leftIndentSpinner.addChangeListener(changeListener);

designer-base/src/main/java/com/fr/design/style/BorderPane.java

@@ -7,6 +7,7 @@ import com.fr.base.BaseUtils;
 import com.fr.base.CellBorderStyle;
 import com.fr.base.GraphHelper;
 import com.fr.base.Style;
+import com.fr.design.border.UITitledBorder;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icombobox.LineComboBox;
@@ -96,7 +97,7 @@ public class BorderPane extends BasicPane {
 
 		JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
 
-		centerPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview"), null));
+		centerPane.setBorder(UITitledBorder.createBorderWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview")));
 		JPanel borderAllControlPane = FRGUIPaneFactory.createCenterFlowInnerContainer_S_Pane();
 		centerPane.add(borderAllControlPane, BorderLayout.NORTH);
 		borderAllControlPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 4, 0));
@@ -147,7 +148,7 @@ public class BorderPane extends BasicPane {
 
 		JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
 
-		northPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Line"), null));
+		northPane.setBorder(UITitledBorder.createBorderWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Line")));
 		JPanel rightTopPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
 		northPane.add(rightTopPane, BorderLayout.NORTH);
 		JPanel first = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();

designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java

@@ -213,7 +213,7 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
                 }
             }
         }
-        if (standardColors == null || standardColors.size() != 8) {
+        if (standardColors == null || standardColors.size() < 8) {
             return;
         }
 

designer-realize/src/main/java/com/fr/design/report/NewReportBackgroundPane.java

@@ -140,11 +140,11 @@ public class NewReportBackgroundPane extends BasicPane {
                 }
             });
 
-            JPanel contentContainer = FRGUIPaneFactory.createBorderLayout_S_Pane();
+            JPanel contentContainer = new JPanel(new BorderLayout(IntervalConstants.INTERVAL_L6, 0));
             contentContainer.setBorder(BorderFactory.createEmptyBorder());
             contentContainer.setBorder(BorderFactory.createEmptyBorder());
             contentContainer.setPreferredSize(new Dimension(600, 540));
-            contentContainer.add(createLeftPane(), BorderLayout.WEST);
+            contentContainer.add(createLeftPane(), BorderLayout.CENTER);
             contentContainer.add(createRightPane(), BorderLayout.EAST);
 
             addAttributeChangeListener(new AttributeChangeListener() {