Merge branch 'release/11.0' of ssh://code.fineres.com:7999/~tommy/design into release/11.0

designer-base/src/main/java/com/fr/design/actions/help/TutorialAction.java

@@ -1,5 +1,6 @@
 package com.fr.design.actions.help;
 
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.login.AbstractDesignerSSO;
 import com.fr.design.menu.MenuKeySet;
 import com.fr.general.CloudCenter;
@@ -52,6 +53,10 @@ public class TutorialAction extends AbstractDesignerSSO {
         }
     }
 
+    public String getOffLineWarnMessage() {
+        return Toolkit.i18nText("Fine-Design_Offline_Helptutorial_Msg");
+    }
+
     public static final MenuKeySet HELP_TUTORIAL = new MenuKeySet() {
         @Override
         public char getMnemonic() {

designer-base/src/main/java/com/fr/design/gui/ibutton/UIColorButton.java

@@ -136,6 +136,7 @@ public class UIColorButton extends UIButton implements PopupHider, UIObserver, G
         }
 
         popupWin = this.getColorControlWindow();
+        popupWin.setColor(color);
 
         GUICoreUtils.showPopupMenu(popupWin, this, POPUP_MENU_SHIFT, this.getSize().height);
     }

designer-base/src/main/java/com/fr/design/login/AbstractDesignerSSO.java

@@ -6,6 +6,9 @@ import com.fr.design.actions.UpdateAction;
 import com.fr.design.login.utils.DesignerLoginUtils;
 import com.fr.design.os.impl.SupportOSImpl;
 import com.fr.design.utils.BrowseUtils;
+import com.fr.log.FineLoggerFactory;
+import com.fr.stable.StringUtils;
+
 import java.awt.event.ActionEvent;
 import java.util.HashMap;
 import java.util.Map;
@@ -21,6 +24,10 @@ public abstract class AbstractDesignerSSO extends UpdateAction {
     public void actionPerformed(ActionEvent event) {
         String url = getJumpUrl();
         if (!DesignerLoginUtils.isOnline()) {
+            String message = getOffLineWarnMessage();
+            if (StringUtils.isNotEmpty(message)) {
+                FineLoggerFactory.getLogger().warn(message);
+            }
             BrowseUtils.browser(url);
             return;
         }
@@ -47,4 +54,8 @@ public abstract class AbstractDesignerSSO extends UpdateAction {
     }
 
     public abstract String getJumpUrl();
+
+    public String getOffLineWarnMessage() {
+        return StringUtils.EMPTY;
+    }
 }

designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java

@@ -54,6 +54,7 @@ import com.fr.design.menu.NameSeparator;
 import com.fr.design.menu.ShortCut;
 import com.fr.design.preview.PagePreview;
 import com.fr.design.ui.util.UIUtil;
+import com.fr.design.utils.DesignUtils;
 import com.fr.design.worker.save.CallbackSaveWorker;
 import com.fr.design.worker.save.EmptyCallBackSaveWorker;
 import com.fr.design.write.submit.DBManipulationInWidgetEventPane;
@@ -1145,7 +1146,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
     public boolean isOldDesigner() {
         String xmlDesignerVersion = getTarget().getXMLDesignerVersion();
         if (isHigherThanCurrent(xmlDesignerVersion)) {
-            String infor = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_Version_Not_Match", StringUtils.parseVersion(xmlDesignerVersion));
+            String infor = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_Version_Not_Match", DesignUtils.parseVersion(xmlDesignerVersion));
             String moreInfo = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Server_Version_Tip_More_Info");
             new InformationWarnPane(infor, moreInfo, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips")).show();
             return true;

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/mainframe/theme/preview/ComponentPreviewPane.java

@@ -6,7 +6,6 @@ import com.fr.base.background.ImageBackground;
 import com.fr.base.theme.FormTheme;
 import com.fr.base.theme.settings.ThemedComponentStyle;
 import com.fr.design.border.UIRoundedBorder;
-import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.form.ui.Label;
 import com.fr.form.ui.LayoutBorderStyle;
@@ -20,15 +19,20 @@ import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import javax.swing.SwingConstants;
 import javax.swing.border.Border;
+import javax.swing.border.LineBorder;
 import java.awt.AlphaComposite;
+import java.awt.BasicStroke;
 import java.awt.BorderLayout;
+import java.awt.Color;
 import java.awt.Component;
 import java.awt.Composite;
 import java.awt.Dimension;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.Image;
+import java.awt.RenderingHints;
 import java.awt.Shape;
+import java.awt.Stroke;
 import java.awt.geom.Rectangle2D;
 import java.awt.geom.RoundRectangle2D;
 
@@ -67,7 +71,11 @@ public abstract class ComponentPreviewPane extends UINoOpaquePanel implements Th
         ThemedComponentStyle componentStyle = theme.getComponentStyle();
 
         style = componentStyle.getStyle();
-        setBorder(new UIRoundedBorder(style.getBorder(), style.getColor(), style.getBorderRadius()));
+        if (style.getBorder() == 0) {
+            setBorder(null);
+        } else {
+            setBorder(new UIRoundedBorder(style.getBorder(), style.getColor(), style.getBorderRadius()));
+        }
 
         int paddingTop = componentStyle.getPaddingTop();
         int paddingBottom = componentStyle.getPaddingBottom();
@@ -116,8 +124,10 @@ public abstract class ComponentPreviewPane extends UINoOpaquePanel implements Th
             data.setInsetImagePadding(titlePacker.getInsetImagePadding());
             data.setInsetRelativeTextLeft(titlePacker.isInsetRelativeTextLeft());
             data.setInsetRelativeTextRight(titlePacker.isInsetRelativeTextRight());
+            this.setBorder(new BottomLineBorder(componentStyle.getStyle().getColor(), componentStyle.getStyle().getBorder()));
         }
 
+
         @Override
         public void paintComponent(Graphics g) {
             super.paintComponent(g);
@@ -145,6 +155,32 @@ public abstract class ComponentPreviewPane extends UINoOpaquePanel implements Th
 
     }
 
+    public static class BottomLineBorder extends LineBorder {
+
+        private BottomLineBorder(Color color, int thickness) {
+            super(color, thickness);
+        }
+
+        @Override
+        public void paintBorder(Component c, Graphics g, int x, int y, int width, int height) {
+            Graphics2D g2d = (Graphics2D) g;
+
+            Color oldColor = g2d.getColor();
+            Stroke oldStroke = g2d.getStroke();
+
+            g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+
+            g2d.setColor(getLineColor());
+            g2d.setStroke(new BasicStroke(getThickness() * 2));
+            g2d.drawLine(0, height, width, height);
+
+            g2d.setStroke(oldStroke);
+            g2d.setColor(oldColor);
+            g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
+        }
+    }
+
+
     private static class Utils {
         private static void paintBackground(Graphics2D g2d, Background background, Shape shape, float opacity) {
             if (background != null) {

designer-base/src/main/java/com/fr/design/mainframe/theme/preview/ecpreview/cell/AbstractPreviewCell.java

@@ -1,8 +1,6 @@
 package com.fr.design.mainframe.theme.preview.ecpreview.cell;
 
-import com.fr.base.ScreenResolution;
 import com.fr.base.Style;
-
 import javax.swing.JComponent;
 import java.awt.Dimension;
 import java.awt.Graphics;
@@ -10,6 +8,8 @@ import java.awt.Graphics2D;
 
 public abstract class AbstractPreviewCell extends JComponent {
     protected Style style = Style.DEFAULT_STYLE;
+    private static final int NO_SCALE_RESOLUTION = 100;
+
 
     public void refresh(Style style) {
         this.style = style;
@@ -17,9 +17,8 @@ public abstract class AbstractPreviewCell extends JComponent {
 
     public void paint(Graphics g) {
         Graphics2D g2d = (Graphics2D) g;
-        int resolution = ScreenResolution.getScreenResolution();
         Style.paintBackground(g2d, style, getWidth(), getHeight());
-        paintContent(g2d, resolution);
+        paintContent(g2d, NO_SCALE_RESOLUTION);
         Style.paintBorder(g2d, style, getWidth(), getHeight());
     }
 

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

@@ -40,7 +40,6 @@ public abstract class AbstractSelectBox<T> extends AbstractPopBox implements Mou
 
 		displayComponent = new BackgroundJComponent();
 		displayComponent.setEmptyBackground();
-		displayComponent.setBorder(new TriggleLineBorder());
 		triggleButton = new UIButton(UIConstants.ARROW_DOWN_ICON) {
 			public boolean shouldResponseChangeListener() {
 				return false;

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/background/BackgroundJComponent.java

@@ -1,10 +1,12 @@
 package com.fr.design.style.background;
 
+import java.awt.Color;
 import java.awt.Graphics;
+import java.awt.Insets;
 import java.awt.geom.Rectangle2D;
 
 import javax.swing.JComponent;
-
+import com.fr.design.border.UIRoundedBorder;
 import com.fr.general.Background;
 
 /**
@@ -18,7 +20,7 @@ public class BackgroundJComponent extends JComponent {
 	protected Background background ;
 	
 	public BackgroundJComponent() {
-		
+		this.setBorder(new UIRoundedBorder(Color.decode("#999999"), 2, 2));
 	}
 	
 	public BackgroundJComponent(Background background) {
@@ -29,16 +31,23 @@ public class BackgroundJComponent extends JComponent {
     	super.paint(g);
     	
     	if(background != null && this.getSize().getWidth() > 0 && this.getSize().getHeight() > 0) {
-    		background.paint(g, new Rectangle2D.Double(1, 1, this.getSize().getWidth() - 2, 
+    		background.paint(g, new Rectangle2D.Double(2, 2, this.getSize().getWidth() - 4,
-    				this.getSize().getHeight() - 2));
+    				this.getSize().getHeight() - 4));
-    	} 
+    	}
+
     }
-    
+
-    public void setEmptyBackground() {
+
+	public void setEmptyBackground() {
     	this.background = null;
     }
     
     public void setSelfBackground(Background background) {
     	this.background = background;
     }
+
+	@Override
+	public Insets getInsets() {
+		return new Insets(0,0,0,0);
+	}
 }

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

@@ -38,6 +38,10 @@ public abstract class ColorControlWindow extends JPopupMenu {
         return selectionPopupPane.getColor();
     }
 
+    public void setColor(Color color) {
+        selectionPopupPane.setColor(color);
+    }
+
     public PopupHider getPopupHider() {
         return popupHider;
     }

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

@@ -39,6 +39,11 @@ public abstract class ColorControlWindowWithAuto extends ColorControlWindow {
         return selectionPopupPaneWithAuto.getColor();
     }
 
+    public void setColor(Color color) {
+        selectionPopupPaneWithAuto.setColor(color);
+    }
+
+
     protected void initSelectionPopupPane(boolean isSupportTransparent) {
         selectionPopupPaneWithAuto = new ColorSelectionPopupPaneWithAuto(isSupportTransparent);
         this.add(selectionPopupPaneWithAuto, BorderLayout.CENTER);

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

@@ -1,6 +1,7 @@
 package com.fr.design.style.color;
 
 import com.fr.base.FineColor;
+import com.fr.base.theme.FineColorDeriveState;
 import com.fr.base.theme.TemplateTheme;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.border.UIRoundedBorder;
@@ -37,8 +38,11 @@ import java.util.List;
  */
 public class NewColorSelectPane extends BasicPane implements ColorSelectable {
     private static final long serialVersionUID = -8634152305687249392L;
-    private static final float BRIGHTNESS_VALUE = 0.15F;
+
-    private static final float PURITY_VALUE = 0.1F;
+    private static final int WIDTH = 197;
+    private static final int HEIGHT = 250;
+    //颜色衍生的数量
+    private static final int DEFAULT_DERIVE_COUNT = 5;
 
     private FineColor color = null; // color
     // color setting action.
@@ -49,15 +53,12 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
 
     private boolean isSupportThemeColor;
 
-    public final static int TRANSPARENT_WINDOW_HEIGHT = 165;
-    public final static int WINDOW_HEIGHT = 150;
-
     // 最近使用颜色
     private final NewUsedColorPane usedColorPane;
     private final JPanel menuColorPane;
     private ColorCell[][] themeColorCellGrid;
 
-    public static NewColorSelectPane createColorSelectPaneWithTheme(boolean supportTheme){
+    public static NewColorSelectPane createColorSelectPaneWithTheme(boolean supportTheme) {
         return new NewColorSelectPane(true, supportTheme);
     }
 
@@ -80,14 +81,16 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
         initSelectButton(isSupportTransparent);
         // center
         JPanel centerPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane();
-        centerPane.setBorder(BorderFactory.createEmptyBorder(10, 4, 0 ,4));
+        centerPane.setBorder(BorderFactory.createEmptyBorder(10, 4, 0, 4));
         this.add(centerPane, BorderLayout.CENTER);
 
         menuColorPane = getMenuColorPane();
-        centerPane.add(menuColorPane);
+
-        if(isSupportThemeColor){
+        if (isSupportThemeColor) {
-            initThemeColorPane();
+            JPanel themePane = initThemeColorPane();
-        }else {
+            centerPane.add(themePane);
+        } else {
+            centerPane.add(menuColorPane);
             initMenuColorPane();
         }
 
@@ -129,7 +132,7 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
         centerPane.add(centerPane1);
     }
 
-    private JPanel createStandardColorPane(){
+    private JPanel createStandardColorPane() {
         JPanel jPanel = new JPanel(new GridLayout(1, 10, 3, 0));
         Color[] colorArray = ColorFactory.STANDARD_COLORS;
         for (int i = 0; i < colorArray.length; i++) {
@@ -138,19 +141,21 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
         return jPanel;
     }
 
-    private void initThemeColorPane(){
+    private JPanel initThemeColorPane() {
         menuColorPane.removeAll();
+        JPanel themeColorPane = new JPanel(new BorderLayout(0, 5));
+        themeColorPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+        themeColorPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Theme_Color")), BorderLayout.CENTER);
+
+        themeColorPane.add(menuColorPane, BorderLayout.SOUTH);
+
         menuColorPane.setLayout(new BorderLayout(0, 10));
         JPanel northPane = new JPanel(new GridLayout(1, 8, 3, 0));
         JPanel centerPane = new JPanel(new GridLayout(1, 8, 3, 0));
         menuColorPane.add(northPane, BorderLayout.NORTH);
         menuColorPane.add(centerPane, BorderLayout.CENTER);
 
-        Color[] colorArray = new Color[] {
+        Color[] colorArray = new Color[]{
-                // 2列灰度色
-                Color.decode("#B3B3B3"),
-                Color.decode("#808080"),
-
                 // 8列主题色
                 Color.decode("#FFFFFF"),
                 Color.decode("#CCCCCC"),
@@ -160,20 +165,22 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
                 Color.decode("#CCCCCC"),
                 Color.decode("#FFFFFF"),
                 Color.decode("#CCCCCC"),
+
+                // 2列灰度色
+                Color.decode("#333333"),
+                Color.decode("#FFFFFF"),
         };
 
         if (themeColorCellGrid == null) {
-            themeColorCellGrid = new ColorCell[colorArray.length][5];
+            themeColorCellGrid = new ColorCell[colorArray.length][DEFAULT_DERIVE_COUNT];
             for (int i = 0; i < colorArray.length; i++) {
-                ColorCell[] colorCellColumn = new ColorCell[5];
+                ColorCell[] colorCellColumn = new ColorCell[DEFAULT_DERIVE_COUNT];
-                boolean isDefaultColor = (i == 0 || i == 1);
+                boolean isDefaultColor = (i == colorArray.length - 1 || i == colorArray.length - 2);
                 Color color = colorArray[i];
-                colorCellColumn[0] = createFineColorCell(color, isDefaultColor, i, 2);
+                Color[] deriveColorArr = FineColorDeriveState.getDeriveColorArr(color, isDefaultColor, DEFAULT_DERIVE_COUNT);
-                colorCellColumn[2] = createFineColorCell(color = saturationDown(color, isDefaultColor, true), isDefaultColor, i, 1);
+                for (int j = 0; j < deriveColorArr.length; j++) {
-                colorCellColumn[1] = createFineColorCell(saturationDown(color, isDefaultColor, true), isDefaultColor, i, 0);
+                    colorCellColumn[j] = createFineColorCell(deriveColorArr[j], isDefaultColor, i, j);
-                color = colorArray[i];
+                }
-                colorCellColumn[3] = createFineColorCell(color = saturationDown(color, isDefaultColor, false), isDefaultColor, i, 3);
-                colorCellColumn[4] = createFineColorCell(saturationDown(color, isDefaultColor, false), isDefaultColor, i, 4);
                 themeColorCellGrid[i] = colorCellColumn;
             }
         }
@@ -182,15 +189,15 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
             northPane.add(themeColorCellGrid[i][0]);
         }
         for (int i = 0; i < colorArray.length; i++) {
-            JPanel columnPane = new JPanel(new GridLayout(4, 1, 0, 3));
+            JPanel columnPane = new JPanel(new GridLayout(DEFAULT_DERIVE_COUNT - 1, 1, 0, 3));
-            columnPane.add(themeColorCellGrid[i][1]);
+            for (int j = 1; j < DEFAULT_DERIVE_COUNT; j++) {
-            columnPane.add(themeColorCellGrid[i][2]);
+                columnPane.add(themeColorCellGrid[i][j]);
-            columnPane.add(themeColorCellGrid[i][3]);
+            }
-            columnPane.add(themeColorCellGrid[i][4]);
             centerPane.add(columnPane);
         }
 
         refreshThemeMenuColorPane();
+        return themeColorPane;
     }
 
     private void refreshThemeMenuColorPane() {
@@ -198,7 +205,7 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
         if (TemplateThemeProfileDialog.isEditingTheme()) {
             standardColors = TemplateThemeProfileDialog.getEditingColorScheme();
         } else {
-            JTemplate<?,?> template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+            JTemplate<?, ?> template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
             if (template != null) {
                 TemplateTheme theme = template.getTemplateTheme();
                 if (theme != null) {
@@ -206,43 +213,24 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
                 }
             }
         }
-        if (standardColors == null || standardColors.size() != 8) {
+        if (standardColors == null || standardColors.size() < 8) {
             return;
         }
 
-        for (int i = 2; i < themeColorCellGrid.length; i++) {
+        for (int i = 0; i < themeColorCellGrid.length - 2; i++) {
-            Color color = standardColors.get(i - 2);
+            Color color = standardColors.get(i);
-
+            Color[] deriveColorArr = FineColorDeriveState.getDeriveColorArr(color, false, DEFAULT_DERIVE_COUNT);
-            themeColorCellGrid[i][0].setColor(color);
+            for (int j = 0; j < deriveColorArr.length; j++) {
-            themeColorCellGrid[i][2].setColor(color = saturationDown(color, false, true));
+                themeColorCellGrid[i][j].setColor(deriveColorArr[j]);
-            themeColorCellGrid[i][1].setColor(saturationDown(color, false, true));
+            }
-
-            color = standardColors.get(i - 2);
-            themeColorCellGrid[i][3].setColor(color = saturationDown(color, false, false));
-            themeColorCellGrid[i][4].setColor(saturationDown(color, false, false));
         }
     }
 
 
     private FineColorCell createFineColorCell(Color color, boolean isDefaultColor, int x, int y) {
-        return isDefaultColor ? new FineColorCell(color, this) : new FineColorCell(color, this, x - 2, y);
+        return isDefaultColor ? new FineColorCell(color, this) : new FineColorCell(color, this, x, y);
     }
 
-    /**
-     * 调整明度和纯度，默认色只调整明度
-     * @param color
-     * @param isDefaultColor
-     * @return
-     */
-    public static Color saturationDown(Color color, boolean isDefaultColor, boolean isLight) {
-        float[] hsb = Color.RGBtoHSB(color.getRed(), color.getGreen(), color.getBlue(), new float[3]);
-        if (!isDefaultColor) {
-            hsb[1] = isLight ? Math.max(0, hsb[1] - PURITY_VALUE) : Math.min(1, hsb[1] + PURITY_VALUE);
-        }
-        hsb[2] = isLight ? Math.min(1, hsb[2] + BRIGHTNESS_VALUE) : Math.max(0, hsb[2] - BRIGHTNESS_VALUE);
-        Color color1 =  Color.getHSBColor(hsb[0], hsb[1], hsb[2]);
-        return color1;
-    }
 
     private void initMenuColorPane() {
         menuColorPane.setLayout(new GridLayout(5, 8, 3, 3));
@@ -266,7 +254,7 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
         return true;
     }
 
-    protected void initSelectButton(boolean isSupportTransparent){
+    protected void initSelectButton(boolean isSupportTransparent) {
         this.isSupportTransparent = isSupportTransparent;
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
         this.setBorder(new UIRoundedBorder(UIConstants.TOOLBAR_BORDER_COLOR, 1, 5));
@@ -280,6 +268,7 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
 
     /**
      * 添加监听
+     *
      * @param changeListener 监听
      */
     public void addChangeListener(ChangeListener changeListener) {
@@ -332,7 +321,7 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
         setFineColor(fineColor);
     }
 
-    private void setFineColor(FineColor fineColor){
+    private void setFineColor(FineColor fineColor) {
         this.color = fineColor;
 
         // fire color change.
@@ -343,7 +332,9 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
                 changeListener.stateChanged(evt);
             }
         }
-        DesignerEnvManager.getEnvManager().getColorConfigManager().addToColorQueue(color);
+        if (color != null) {
+            DesignerEnvManager.getEnvManager().getColorConfigManager().addToColorQueue(color.getColor());
+        }
         this.repaint();
     }
 
@@ -375,10 +366,14 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
 
     @Override
     public Dimension getPreferredSize() {
+        int height = HEIGHT;
         if (isSupportTransparent) {
-            return new Dimension(197, 265);
+            height += 15;
+        }
+        if (isSupportThemeColor) {
+            height += 25;
         }
-        return new Dimension(197, 250);
+        return new Dimension(WIDTH, height);
     }
 
     /**
@@ -400,12 +395,12 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
 
         private boolean setColorRealTime;
 
-        public JPanel getPane(){
+        public JPanel getPane() {
             return this.pane;
         }
 
 
-        public NewUsedColorPane(int columns, ColorSelectable selectable, boolean setColorRealTime){
+        public NewUsedColorPane(int columns, ColorSelectable selectable, boolean setColorRealTime) {
             this.columns = columns;
             this.selectable = selectable;
             this.setColorRealTime = setColorRealTime;
@@ -436,7 +431,7 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
          * 更新最近使用颜色
          */
         public void updateUsedColor() {
-            int total = columns ;
+            int total = columns;
             Color[] colors = DesignerEnvManager.getEnvManager().getColorConfigManager().getColors();
             int size = colors.length;
             for (int i = 0; i < total; i++) {
@@ -452,4 +447,5 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
         }
     }
 
+
 }

designer-base/src/main/java/com/fr/design/utils/DesignUtils.java

@@ -425,4 +425,17 @@ public class DesignUtils {
         return true;
     }
 
+    /**
+     * FR25.0版本出来需要进行适配下
+     *
+     * @param xmlDesignerVersion
+     * @return
+     */
+    public static String parseVersion(String xmlDesignerVersion) {
+        if (StringUtils.isNotEmpty(xmlDesignerVersion)) {
+            return String.valueOf(xmlDesignerVersion.charAt(0) - 'A');
+        }
+        return xmlDesignerVersion;
+    }
+
 }

designer-base/src/test/java/com/fr/design/utils/DesignUtilsTest.java

@@ -3,6 +3,7 @@ package com.fr.design.utils;
 
 import com.fr.general.ComparatorUtils;
 import junit.framework.TestCase;
+import org.junit.Assert;
 import org.junit.Test;
 
 import java.net.ServerSocket;
@@ -29,4 +30,10 @@ public class DesignUtilsTest extends TestCase {
         assertTrue(DesignUtils.isPortOccupied());
     }
 
+    @Test
+    public void testParseVersion() {
+        Assert.assertEquals("10", DesignUtils.parseVersion("KAA"));
+        Assert.assertEquals("11", DesignUtils.parseVersion("LAA"));
+    }
+
 }

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() {