Merge branch 'release/10.0' of https://code.fineres.com/scm/~qinghui.liu/design into release/10.0

designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java

@@ -5,6 +5,7 @@ import com.fr.design.data.DesignTableDataManager;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.dialog.FineJOptionPane;
+import com.fr.design.dialog.link.MessageWithLink;
 import com.fr.design.env.DesignerWorkspaceGenerator;
 import com.fr.design.env.DesignerWorkspaceInfo;
 import com.fr.design.env.DesignerWorkspaceType;
@@ -18,7 +19,10 @@ import com.fr.design.mainframe.JTemplate;
 import com.fr.design.utils.DesignUtils;
 import com.fr.env.CheckServiceDialog;
 import com.fr.env.EnvListPane;
+import com.fr.env.RemoteWorkspaceURL;
+import com.fr.env.TestConnectionResult;
 import com.fr.exit.DesignerExiter;
+import com.fr.general.ComparatorUtils;
 import com.fr.general.GeneralUtils;
 import com.fr.invoke.Reflect;
 import com.fr.json.JSONArray;
@@ -40,6 +44,7 @@ import com.fr.workspace.connect.WorkspaceConnectionInfo;
 import com.fr.workspace.engine.base.FineObjectPool;
 import com.fr.workspace.engine.channel.http.FunctionalHttpRequest;
 import com.fr.workspace.engine.exception.WorkspaceAuthException;
+import com.fr.workspace.engine.exception.WorkspaceCheckException;
 import com.fr.workspace.engine.exception.WorkspaceConnectionException;
 import com.fr.workspace.engine.rpc.WorkspaceProxyPool;
 
@@ -145,21 +150,28 @@ public class EnvChangeEntrance {
             strategy.showTip(new PopTip() {
                 @Override
                 public void show() {
-                    FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Basic_Switch_Workspace_Failed"),
-                            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Error"), ERROR_MESSAGE, UIManager.getIcon("OptionPane.errorIcon"));
+                    FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
+                                                      Toolkit.i18nText("Fine-Design_Basic_Switch_Workspace_Failed"),
+                                                      Toolkit.i18nText("Fine-Design_Basic_Error"),
+                                                      ERROR_MESSAGE,
+                                                      UIManager.getIcon("OptionPane.errorIcon"));
                 }
             });
             return false;
+        } catch (WorkspaceCheckException e) {
+            handleWorkspaceCheckException(e, strategy, connectionInfo);
+            return false;
         } catch (Exception exception) {
-            FineLoggerFactory.getLogger().error(exception.getMessage(), exception);
-            strategy.showTip(new PopTip() {
-                @Override
-                public void show() {
-                    FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Basic_Switch_Workspace_Failed"),
-                            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Error"), ERROR_MESSAGE, UIManager.getIcon("OptionPane.errorIcon"));
-                }
-            });
-
+            if (exception.getCause() instanceof WorkspaceCheckException) {
+                handleWorkspaceCheckException((WorkspaceCheckException) exception.getCause(), strategy, connectionInfo);
+            } else {
+                FineLoggerFactory.getLogger().error(exception.getMessage(), exception);
+                strategy.showTip(() -> FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
+                                                                         Toolkit.i18nText("Fine-Design_Basic_Switch_Workspace_Failed"),
+                                                                         Toolkit.i18nText("Fine-Design_Basic_Error"),
+                                                                         ERROR_MESSAGE,
+                                                                         UIManager.getIcon("OptionPane.errorIcon")));
+            }
             return false;
         }
         TemplateTreePane.getInstance().refreshDockingView();
@@ -170,6 +182,24 @@ public class EnvChangeEntrance {
         return true;
     }
 
+    private void handleWorkspaceCheckException(WorkspaceCheckException e, PopTipStrategy strategy, WorkspaceConnectionInfo info) {
+        TestConnectionResult result = TestConnectionResult.parseByException(e);
+        FineLoggerFactory.getLogger().error(e.getMessage(), e);
+        if (ComparatorUtils.equals(result, TestConnectionResult.AUTH_FAILED)) {
+            strategy.showTip(() -> FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
+                                                                     Toolkit.i18nText("Fine-Design_Basic_Switch_Workspace_Failed"),
+                                                                     Toolkit.i18nText("Fine-Design_Basic_Error"),
+                                                                     ERROR_MESSAGE,
+                                                                     UIManager.getIcon("OptionPane.errorIcon")));
+        } else {
+            strategy.showTip(() -> FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
+                                                                     new MessageWithLink(result.getText(), Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Modify_PassWord"), info.getUrl() + RemoteWorkspaceURL.SYSTEM_LOGIN_PATH),
+                                                                     Toolkit.i18nText("Fine-Design_Basic_Error"),
+                                                                     ERROR_MESSAGE,
+                                                                     UIManager.getIcon("OptionPane.errorIcon")));
+        }
+    }
+
     /**
      * 这个功能留着，可能会加回来，先做注释处理
      * 切换远程环境之前，进行版本检测，当版本不一致的时候，提示。

designer-base/src/main/java/com/fr/design/data/datapane/TableDataTree.java

@@ -113,6 +113,11 @@ public class TableDataTree extends UserObjectRefreshJTree<TableDataSourceOP> {
                         break;
                     }
                     new_nodes[ci].setExpanded(cTreeNode.isExpanded());
+                    // REPORT-41299 如果建立的是错误的数据集(没有Child的情况)且这个错误数据集处于isExpanded状态，会在后面的if语句中调用getFirstChild()产生异常，因此这里判断一下
+                    if (cTreeNode.isExpanded() && cTreeNode.getChildCount() == 0) {
+                        new_nodes[ci].setExpanded(false);
+                        break;
+                    }
                     if (cTreeNode.getFirstChild() instanceof ExpandMutableTreeNode && cTreeNode.isExpanded()) {
                         checkChildNodes(cTreeNode, new_nodes[ci]);
                     }
@@ -242,4 +247,4 @@ public class TableDataTree extends UserObjectRefreshJTree<TableDataSourceOP> {
 
         treeModel.reload(root);
     }
-}
+}

designer-base/src/main/java/com/fr/design/dialog/link/MessageWithLink.java

@@ -0,0 +1,55 @@
+package com.fr.design.dialog.link;
+
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.log.FineLoggerFactory;
+import com.fr.stable.StringUtils;
+import java.awt.Color;
+import java.awt.Desktop;
+import java.awt.Font;
+import java.net.URI;
+import javax.swing.JEditorPane;
+import javax.swing.event.HyperlinkEvent;
+
+/**
+ * 用来构建JOptionPane带超链的消息提示
+ *
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2020/10/23
+ */
+public class MessageWithLink extends JEditorPane {
+
+    public MessageWithLink(String message, String linkName, String link) {
+        super("text/html", "<html><body style=\"" + getStyle() + "\">" + message + "<a href=\"" + link + "\">" + linkName + "</a>" + "</body></html>");
+        addHyperlinkListener(e -> {
+            if (e.getEventType().equals(HyperlinkEvent.EventType.ACTIVATED)) {
+                try {
+                    Desktop.getDesktop().browse(URI.create(link));
+                } catch (Exception exception) {
+                    FineLoggerFactory.getLogger().error(exception.getMessage(), exception);
+                }
+            }
+        });
+        setEditable(false);
+        setBorder(null);
+    }
+
+    public MessageWithLink(String linkName, String link ) {
+        this(StringUtils.EMPTY, linkName, link);
+    }
+
+    private static StringBuilder getStyle() {
+        // 构建和相同风格样式
+        UILabel label = new UILabel();
+        Font font = label.getFont();
+        Color color = label.getBackground();
+
+        StringBuilder style = new StringBuilder("font-family:" + font.getFamily() + ";");
+        style.append("font-weight:").append(font.isBold() ? "bold" : "normal").append(";");
+        style.append("font-size:").append(font.getSize()).append("pt;");
+        style.append("background-color: rgb(").append(color.getRed()).append(",").append(color.getGreen()).append(",").append(color.getBlue()).append(");");
+
+        return style;
+    }
+
+}

designer-base/src/main/java/com/fr/design/env/RemoteDesignerWorkspaceInfo.java

@@ -169,7 +169,8 @@ public class RemoteDesignerWorkspaceInfo implements DesignerWorkspaceInfo {
             return result;
         }
         try {
-            result = WorkContext.getConnector().testConnection(connection);
+             WorkContext.getConnector().validateVT(connection);
+             result = true;
         } catch (Exception e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
             return result;

designer-base/src/main/java/com/fr/design/gui/icombobox/ColorSchemeComboBox.java

@@ -1,11 +1,9 @@
-package com.fr.design.chartx.component.combobox;
+package com.fr.design.gui.icombobox;
 
 import com.fr.base.ChartColorMatching;
 import com.fr.base.ChartPreStyleConfig;
 import com.fr.cert.token.lang.Collections;
 import com.fr.chart.base.ChartConstants;
-import com.fr.design.gui.icombobox.UIComboBox;
-import com.fr.design.gui.icombobox.UIComboBoxRenderer;
 import com.fr.design.i18n.Toolkit;
 import com.fr.general.GeneralUtils;
 
@@ -36,11 +34,18 @@ public class ColorSchemeComboBox extends UIComboBox {
 
     private Map<String, ColorInfo> colorSchemes;
 
+    private boolean preDefined;
+
     public ColorSchemeComboBox() {
-        this(null);
+        this(null, false);
     }
 
     public ColorSchemeComboBox(Map<String, ColorInfo> colorSchemes) {
+        this(colorSchemes, false);
+    }
+
+    public ColorSchemeComboBox(Map<String, ColorInfo> colorSchemes, boolean preDefined) {
+        this.preDefined = preDefined;
         //通过配色方案的集合初始化下拉控件，如果参数为null，从配置中读取配色方案。
         if (colorSchemes == null) {
             colorSchemes = getColorSchemesFromConfig();
@@ -59,22 +64,26 @@ public class ColorSchemeComboBox extends UIComboBox {
         //所有的样式名称
         Iterator names = config.names();
 
-        //添加默认的方案和第一个方案
-        String defaultName = config.getCurrentStyle();
-        ChartColorMatching defaultStyle = (ChartColorMatching) config.getPreStyle(defaultName);
-        if (names.hasNext()) {
-            Object firstName = names.next();
-            ChartColorMatching firstStyle = (ChartColorMatching) config.getPreStyle(firstName);
-            if (defaultStyle == null) {
-                defaultStyle = firstStyle;
-            }
-            colorSchemes.put(Toolkit.i18nText("Fine-Design_Report_Default"), colorMatchingToColorInfo(defaultStyle));
-            colorSchemes.put(firstStyle.getId(), colorMatchingToColorInfo(firstStyle));
+        if (preDefined) {
+            colorSchemes.put(Toolkit.i18nText("Fine-Design_Chart_Predefined"), null);
         } else {
-            ColorInfo colorInfo = new ColorInfo();
-            colorInfo.setGradient(false);
-            colorInfo.setColors(Collections.arrayToList(ChartConstants.CHART_COLOR_ARRAY));
-            colorSchemes.put(Toolkit.i18nText("Fine-Design_Report_Default"), colorInfo);
+            //添加默认的方案和第一个方案
+            String defaultName = config.getCurrentStyle();
+            ChartColorMatching defaultStyle = (ChartColorMatching) config.getPreStyle(defaultName);
+            if (names.hasNext()) {
+                Object firstName = names.next();
+                ChartColorMatching firstStyle = (ChartColorMatching) config.getPreStyle(firstName);
+                if (defaultStyle == null) {
+                    defaultStyle = firstStyle;
+                }
+                colorSchemes.put(Toolkit.i18nText("Fine-Design_Report_Default"), colorMatchingToColorInfo(defaultStyle));
+                colorSchemes.put(firstStyle.getId(), colorMatchingToColorInfo(firstStyle));
+            } else {
+                ColorInfo colorInfo = new ColorInfo();
+                colorInfo.setGradient(false);
+                colorInfo.setColors(Collections.arrayToList(ChartConstants.CHART_COLOR_ARRAY));
+                colorSchemes.put(Toolkit.i18nText("Fine-Design_Report_Default"), colorInfo);
+            }
         }
 
         //添加其他的配色方案

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

@@ -55,7 +55,7 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
     private static final int ANGEL = 90;
     private static final int GAP = 23;
     private static final int VERGAP = 3;
-    private static final Dimension SPINNER_DIMENSION = new Dimension(75, 20);
+    private static final Dimension SPINNER_DIMENSION = new Dimension(70, 20);
     private static final String[] TEXT = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Wrap_Text"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Single_Line"),
             com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Single_Line(Adjust_Font)"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Multi_Line(Adjust_Font)")};
 

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

@@ -28,7 +28,7 @@ public class BackgroundNoImagePane extends BackgroundPane{
                 fireStateChanged();
             }
         });
-        GradientBackgroundQuickPane gradientPane = new GradientBackgroundQuickPane();
+        GradientBackgroundQuickPane gradientPane = createGradientBackgroundQuickPane();
 
         gradientPane.registerChangeListener(new UIObserverListener() {
             @Override
@@ -42,4 +42,8 @@ public class BackgroundNoImagePane extends BackgroundPane{
                 gradientPane
         };
     }
-}
+
+    protected GradientBackgroundQuickPane createGradientBackgroundQuickPane(){
+        return new GradientBackgroundQuickPane();
+    }
+}

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

@@ -71,7 +71,7 @@ public class BackgroundPane extends AbstractBasicStylePane {
         double p = TableLayout.PREFERRED;
         Component[][] components = new Component[][]{
                 new Component[]{null, null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Fill") + "     ", SwingConstants.LEFT),typeComboBox},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Fill"), SwingConstants.LEFT),typeComboBox},
                 new Component[]{null, centerPane}
         };
         double[] rowSize = {p, p, p};
@@ -89,7 +89,7 @@ public class BackgroundPane extends AbstractBasicStylePane {
         kinds.add(new TextureBackgroundQuickPane());
         kinds.add(new PatternBackgroundQuickPane());
         kinds.add(new ImageBackgroundQuickPane());
-        kinds.add(new GradientBackgroundQuickPane());
+        kinds.add(createGradientBackgroundQuickPane());
         Set<BackgroundQuickUIProvider> providers = ExtraDesignClassManager.getInstance().getArray(BackgroundQuickUIProvider.MARK_STRING);
         for (BackgroundQuickUIProvider provider : providers) {
             kinds.add(provider.appearanceForBackground());
@@ -98,6 +98,10 @@ public class BackgroundPane extends AbstractBasicStylePane {
         return kinds.toArray(new BackgroundQuickPane[kinds.size()]);
     }
 
+    protected GradientBackgroundQuickPane createGradientBackgroundQuickPane(){
+        return new GradientBackgroundQuickPane();
+    }
+
 
     /**
      * 事件监听
@@ -172,4 +176,4 @@ public class BackgroundPane extends AbstractBasicStylePane {
         return style.deriveBackground(this.update());
     }
 
-}
+}

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

@@ -39,7 +39,7 @@ public class BackgroundSpecialPane extends BackgroundPane{
                 fireStateChanged();
             }
         });
-        GradientBackgroundQuickPane gradientPane = new GradientBackgroundQuickPane();
+        GradientBackgroundQuickPane gradientPane = createGradientBackgroundQuickPane();
         gradientPane.registerChangeListener(new UIObserverListener() {
             @Override
             public void doChange() {
@@ -48,12 +48,12 @@ public class BackgroundSpecialPane extends BackgroundPane{
         });
         //hugh:表单支持背景接口
         List<BackgroundQuickPane> kinds = new ArrayList<BackgroundQuickPane>();
-        
+
         kinds.add(new NullBackgroundQuickPane());
         kinds.add(colorBackgroundPane);
         kinds.add(imageBackgroundPane);
         kinds.add(gradientPane);
-        
+
         Set<BackgroundQuickUIProvider> providers = ExtraDesignClassManager.getInstance().getArray(BackgroundQuickUIProvider.MARK_STRING);
         for (BackgroundQuickUIProvider provider : providers) {
         	BackgroundQuickPane newTypePane = provider.appearanceForBackground();
@@ -65,7 +65,11 @@ public class BackgroundSpecialPane extends BackgroundPane{
             });
             kinds.add(newTypePane);
         }
-        
+
         return kinds.toArray(new BackgroundQuickPane[kinds.size()]);
     }
-}
+
+    protected GradientBackgroundQuickPane createGradientBackgroundQuickPane(){
+        return new GradientBackgroundQuickPane();
+    }
+}

designer-base/src/main/java/com/fr/design/layout/FRGUIPaneFactory.java

@@ -152,6 +152,20 @@ public class FRGUIPaneFactory {
         return jp;
     }
 
+    /**
+     * 创建一个无间隔带标题边框面板
+     *
+     * @param string 边框标题
+     * @return JPanel对象
+     */
+    public static JPanel createTitledBorderNoGapPane(String string) {
+        JPanel jp = new JPanel();
+        UITitledBorder explainBorder = UITitledBorder.createBorderWithTitle(string);
+        jp.setBorder(explainBorder);
+        jp.setLayout(new FlowLayout(FlowLayout.LEFT, 0, 0));
+        return jp;
+    }
+
     /**
      * 创建一个带标题边框面板，垂直居左布局
      *
@@ -304,6 +318,21 @@ public class FRGUIPaneFactory {
         return jp;
     }
 
+    /**
+     * 创建一个靠左的水平流式布局
+     * @param firstGap 首元素和边框间距
+     * @param hgap 水平间距
+     * @param vgap 竖直间距
+     * @return JPanel对象
+     */
+    public static JPanel createBoxFlowInnerContainer_S_Pane(int firstGap, int hgap, int vgap) {
+        JPanel jp = new JPanel();
+        jp.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+        jp.setLayout(new FRLeftFlowLayout(firstGap, hgap, vgap));
+        return jp;
+    }
+
+
     /**
      * 创建一个靠左流式布局，流式内嵌，首元素距离左边0
      *
@@ -315,6 +344,21 @@ public class FRGUIPaneFactory {
         return jp;
     }
 
+    /**
+     * 创建一个靠左的水平流式布局
+     * @param hgap 水平间距
+     * @param vgap 竖直间距
+     * @return JPanel对象
+     */
+    public static JPanel createBoxFlowInnerContainer_S_Pane(int hgap, int vgap) {
+        JPanel jp = new JPanel();
+        jp.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+        jp.setLayout(new FlowLayout(FlowLayout.LEFT, hgap, vgap));
+        return jp;
+    }
+
+
+
     /**
      * 创建一个靠右面板
      *
@@ -469,6 +513,8 @@ public class FRGUIPaneFactory {
         return jp;
     }
 
+
+
     /**
      * 创建垂直流布局面板
      *

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

@@ -6,6 +6,7 @@ import com.fr.base.Parameter;
 import com.fr.base.ScreenResolution;
 import com.fr.base.io.BaseBook;
 import com.fr.base.iofile.attr.DesignBanCopyAttrMark;
+import com.fr.base.iofile.attr.PredefinedStyleAttrMark;
 import com.fr.base.iofile.attr.TemplateIdAttrMark;
 import com.fr.base.vcs.DesignerMode;
 import com.fr.design.DesignModelAdapter;
@@ -38,6 +39,9 @@ import com.fr.design.gui.itree.filetree.TemplateFileTree;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.chart.info.ChartInfoCollector;
+import com.fr.design.mainframe.predefined.info.PredefinedStyleInfoCollector;
+import com.fr.design.mainframe.predefined.ui.ReportPredefinedStylePane;
+import com.fr.design.mainframe.predefined.ui.dialog.ReportPredefinedStyleDialog;
 import com.fr.design.mainframe.template.info.TemplateInfoCollector;
 import com.fr.design.mainframe.template.info.TemplateProcessInfo;
 import com.fr.design.mainframe.template.info.TimeConsumeTimer;
@@ -47,6 +51,7 @@ import com.fr.design.menu.MenuDef;
 import com.fr.design.menu.NameSeparator;
 import com.fr.design.menu.ShortCut;
 import com.fr.design.preview.PagePreview;
+import com.fr.design.utils.DesignUtils;
 import com.fr.design.write.submit.DBManipulationInWidgetEventPane;
 import com.fr.design.write.submit.DBManipulationPane;
 import com.fr.file.FILE;
@@ -55,6 +60,7 @@ import com.fr.file.MemFILE;
 import com.fr.form.ui.NoneWidget;
 import com.fr.form.ui.Widget;
 import com.fr.general.ComparatorUtils;
+import com.fr.locale.InterProviderFactory;
 import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.context.PluginContext;
 import com.fr.plugin.context.PluginRuntime;
@@ -73,13 +79,17 @@ import com.fr.stable.StringUtils;
 import com.fr.stable.core.UUID;
 import com.fr.workspace.WorkContext;
 import com.fr.workspace.server.lock.TplOperator;
-
 import javax.swing.BorderFactory;
 import javax.swing.Icon;
 import javax.swing.JComponent;
 import javax.swing.JOptionPane;
+import javax.swing.SwingConstants;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.undo.UndoManager;
+import java.awt.Dimension;
+import java.awt.FontMetrics;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Set;
@@ -90,6 +100,8 @@ import java.awt.BorderLayout;
  * 报表设计和表单设计的编辑区域(设计器编辑的IO文件)
  */
 public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>> extends TargetComponent<T> implements ToolBarMenuDockPlus, DesignerProxy {
+
+    private static final int PREDEFINED_ICON_WIDTH = 27;
     // TODO ALEX_SEP editingFILE这个属性一定要吗?如果非要不可,有没有可能保证不为null
     private static final int PREFIX_NUM = 3000;
     private FILE editingFILE = null;
@@ -142,8 +154,21 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
 
         consumeTimer.setEnabled(shouldInitForCollectInfo(isNewFile));
         initAndStartPlugin();
+
+        setPredefinedInfo(isNewFile);
+    }
+
+    private void setPredefinedInfo(boolean isNewFile){
+        if (this.template.getAttrMark(PredefinedStyleAttrMark.XML_TAG) == null) {
+            PredefinedStyleAttrMark attrMark =  PredefinedStyleAttrMark.createDefaultStyleMark();
+            if (!isNewFile || !DesignUtils.checkDesignerRemoteVersion()) {
+                attrMark.setPreferenceStyleName(InterProviderFactory.getProvider().getLocText("Fine-Engine_Predefined_Style_Compatibility"));
+            }
+            this.template.addAttrMark(attrMark);
+        }
     }
 
+
     private void initAndStartPlugin() {
         initPluginPane();
         startListenPlugin();
@@ -796,7 +821,9 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         if (editingFILE == null || editingFILE instanceof MemFILE) {
             return false;
         }
+        PredefinedStyleInfoCollector.getInstance().collectUseNumber(this.getTemplatePredefinedStyle());
         try {
+            this.getTarget().setPredefinedStyleName(this.getTemplatePredefinedStyle(), false);
             this.getTarget().export(editingFILE.asOutputStream());
         } catch (Exception e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
@@ -1296,10 +1323,60 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         for (DesignerFrameUpButtonProvider provider : providers) {
             uiButtons = ArrayUtils.addAll(uiButtons, provider.getUpButtons(getMenuState()));
         }
-
+        UIButton predefinedBtn = createPreDefinedButton();
+        if (predefinedBtn != null) {
+            uiButtons = ArrayUtils.addAll(uiButtons, new UIButton[]{predefinedBtn});
+        }
         return uiButtons;
     }
 
+    private UIButton createPreDefinedButton() {
+        UIButton preferenceButton = new UIButton(BaseUtils.readIcon("/com/fr/design/icon/icon_predefined_style.png"));
+        preferenceButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Predefined_Template_Style"));
+        preferenceButton.setText(getTemplatePredefinedStyle());
+        preferenceButton.setAlignmentX(SwingConstants.LEFT);
+        setPredefinedButtonSize(preferenceButton);
+        preferenceButton.set4ToolbarButton();
+        preferenceButton.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                DesignerFrame designerFrame = DesignerContext.getDesignerFrame();
+                ReportPredefinedStylePane stylePane = new ReportPredefinedStylePane(JTemplate.this, preferenceButton);
+                ReportPredefinedStyleDialog dialog = new ReportPredefinedStyleDialog(designerFrame, stylePane);
+                PredefinedStyleInfoCollector.getInstance().collectClickNumber();
+                dialog.setVisible(true);
+
+            }
+        });
+        preferenceButton.setEnabled(DesignUtils.checkDesignerRemoteVersion());
+        return preferenceButton;
+    }
+
+
+
+    private void setPredefinedButtonSize(UIButton predefinedBtn) {
+        String text = predefinedBtn.getText();
+        FontMetrics metrics = predefinedBtn.getFontMetrics(predefinedBtn.getFont());
+        predefinedBtn.setPreferredSize(new Dimension(Math.min(metrics.stringWidth(text) + PREDEFINED_ICON_WIDTH, 100), 20));
+    }
+
+    public void resetPredefinedStyle(String styleName, UIButton predefinedBtn) {
+        this.getTarget().setPredefinedStyleName(styleName, true);
+        predefinedBtn.setText(getTemplatePredefinedStyle());
+        setPredefinedButtonSize(predefinedBtn);
+        this.fireTargetModified();
+        this.repaint();
+    }
+
+    public String getTemplatePredefinedStyle(){
+        PredefinedStyleAttrMark attrMark = this.getTarget().getAttrMark(PredefinedStyleAttrMark.XML_TAG);
+        if (attrMark == null){
+            attrMark = PredefinedStyleAttrMark.createDefaultStyleMark();
+        }
+        return attrMark.getPreferenceStyleName();
+    }
+
+
     /**
      * 由于老版本的模板没有模板ID，当勾选使用参数模板时候，就加一个模板ID attr
      *

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

@@ -0,0 +1,22 @@
+package com.fr.design.mainframe;
+
+/**
+ * @Author: Yuan.Wang
+ * @Date: 2020/10/27
+ */
+public class JTemplateActionListenerAdapter implements JTemplateActionListener {
+    @Override
+    public void templateOpened(JTemplate<?, ?> jt) {
+
+    }
+
+    @Override
+    public void templateSaved(JTemplate<?, ?> jt) {
+
+    }
+
+    @Override
+    public void templateClosed(JTemplate<?, ?> jt) {
+
+    }
+}

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

@@ -0,0 +1,103 @@
+package com.fr.design.mainframe.backgroundpane;
+
+import com.fr.base.background.GradientBackground;
+import com.fr.design.event.UIObserverListener;
+import com.fr.design.gui.ibutton.UIButtonGroup;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.layout.TableLayout;
+import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.style.background.gradient.FixedGradientBar;
+import com.fr.general.Background;
+
+import javax.swing.JPanel;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.BorderLayout;
+import java.awt.Component;
+
+/**
+ * 渐变色设置界面，bar无法拖拽
+ */
+public class VanChartGradientPane extends GradientBackgroundQuickPane {
+    protected static final int CHART_GRADIENT_WIDTH = 150;
+    private static final long serialVersionUID = 256594362341221087L;
+
+    private FixedGradientBar gradientBar;
+    private UIButtonGroup<Integer> directionPane;
+
+    public VanChartGradientPane() {
+        constructPane();
+    }
+
+    protected void constructPane(){
+        String[] textArray = {com.fr.design.i18n.Toolkit.i18nText("FIne-Design_Report_Utils_Left_To_Right"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Top_To_Bottom")};
+        Integer[] valueArray = {GradientBackground.LEFT2RIGHT, GradientBackground.TOP2BOTTOM};
+        directionPane = new UIButtonGroup<Integer>(textArray, valueArray);
+        directionPane.setSelectedIndex(0);
+        gradientBar = new FixedGradientBar(4, CHART_GRADIENT_WIDTH);
+
+        double p = TableLayout.PREFERRED;
+        double f = TableLayout.FILL;
+        double[] columnSize = {p, f};
+        double[] rowSize = {p, p, p};
+
+        Component[][] components = new Component[][]{
+                new Component[]{gradientBar, null},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gradient_Direction")),directionPane},
+        };
+        JPanel Gradient = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
+        this.setLayout(new BorderLayout());
+        this.add(Gradient, BorderLayout.CENTER);
+    }
+
+    public void populateBean(Background background) {
+        GradientBackground bg = (GradientBackground) background;
+        this.gradientBar.getSelectColorPointBtnP1().setColorInner(bg.getStartColor());
+        this.gradientBar.getSelectColorPointBtnP2().setColorInner(bg.getEndColor());
+        directionPane.setSelectedItem(bg.getDirection());
+        this.gradientBar.repaint();
+    }
+
+    public GradientBackground updateBean() {
+        GradientBackground gb = new GradientBackground(gradientBar.getSelectColorPointBtnP1().getColorInner(), gradientBar.getSelectColorPointBtnP2().getColorInner());
+        gb.setDirection(directionPane.getSelectedItem());
+
+        return gb;
+    }
+
+    /**
+     * 给组件登记一个观察者监听事件
+     *
+     * @param listener 观察者监听事件
+     */
+    public void registerChangeListener(final UIObserverListener listener) {
+        gradientBar.addChangeListener(new ChangeListener() {
+            public void stateChanged(ChangeEvent e) {
+                listener.doChange();
+            }
+        });
+        directionPane.addChangeListener(new ChangeListener() {
+            public void stateChanged(ChangeEvent e) {
+                listener.doChange();
+            }
+        });
+    }
+
+    /**
+     * 是否接受
+     * @param background     背景
+     * @return    是则返回true
+     */
+    public boolean accept(Background background) {
+        return background instanceof GradientBackground;
+    }
+
+    /**
+     * 名称
+     * @return     名称
+     */
+    public String title4PopupWindow() {
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gradient_Color");
+    }
+
+}

designer-base/src/main/java/com/fr/design/mainframe/burying/point/AbstractPointCollector.java

@@ -3,7 +3,6 @@ package com.fr.design.mainframe.burying.point;
 import com.fr.base.FRContext;
 import com.fr.base.io.XMLReadHelper;
 import com.fr.design.DesignerEnvManager;
-import com.fr.design.mainframe.template.info.SendHelper;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.ProductConstants;
 import com.fr.stable.StableUtils;
@@ -20,25 +19,20 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * @author Bjorn
  * @version 10.0
  * Created by Bjorn on 2020-02-21
  */
-public abstract class AbstractPointCollector<T extends AbstractPointInfo> implements BasePointCollector {
+public abstract class AbstractPointCollector implements BasePointCollector {
+
 
-    protected Map<String, T> pointInfoMap;
 
     private static final int MAX_SIZE = 512 * 1024 * 1024;
 
     public AbstractPointCollector() {
-        pointInfoMap = new ConcurrentHashMap<>();
-        loadFromFile();
+
     }
 
     /**
@@ -48,34 +42,6 @@ public abstract class AbstractPointCollector<T extends AbstractPointInfo> implem
         return FileUtils.sizeOf(getInfoFile()) <= MAX_SIZE && DesignerEnvManager.getEnvManager().isJoinProductImprove() && FRContext.isChineseEnv();
     }
 
-    @Override
-    public void sendPointInfo() {
-
-        addIdleDayCount();
-
-        List<String> removeList = new ArrayList<>();
-        List<String> sendList = new ArrayList<>();
-
-        for (String key : pointInfoMap.keySet()) {
-            AbstractPointInfo pointInfo = pointInfoMap.get(key);
-            pointInfo.selectPoint(removeList, sendList);
-        }
-
-        // 发送记录
-        for (String key : sendList) {
-            if(SendHelper.sendPointInfo(pointInfoMap.get(key))){
-                removeList.add(key);
-            }
-        }
-
-        // 清空记录
-        for (String key : removeList) {
-            pointInfoMap.remove(key);
-        }
-
-        saveInfo();
-    }
-
     /**
      * 从文件中读取埋点信息
      */

designer-base/src/main/java/com/fr/design/mainframe/burying/point/AbstractTemplateInfoCollector.java

@@ -0,0 +1,56 @@
+package com.fr.design.mainframe.burying.point;
+
+import com.fr.design.mainframe.template.info.SendHelper;
+import com.fr.design.mainframe.template.info.TemplateProcessInfo;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * Created by kerry on 2020-09-04
+ */
+public abstract class AbstractTemplateInfoCollector<T extends AbstractPointInfo> extends AbstractPointCollector {
+    protected Map<String, T> pointInfoMap;
+
+    public AbstractTemplateInfoCollector() {
+        pointInfoMap = new ConcurrentHashMap<>();
+        loadFromFile();
+
+    }
+
+
+    /**
+     * 保存埋点的信息到本地
+     */
+    public abstract void collectInfo(String templateID, String originID, TemplateProcessInfo processInfo, int timeConsume);
+
+    @Override
+    public void sendPointInfo() {
+
+        addIdleDayCount();
+
+        List<String> removeList = new ArrayList<>();
+        List<String> sendList = new ArrayList<>();
+
+        for (String key : pointInfoMap.keySet()) {
+            BasePointInfo pointInfo = pointInfoMap.get(key);
+            pointInfo.selectPoint(removeList, sendList);
+        }
+
+        // 发送记录
+        for (String key : sendList) {
+            if(SendHelper.sendPointInfo(pointInfoMap.get(key))){
+                removeList.add(key);
+            }
+        }
+
+        // 清空记录
+        for (String key : removeList) {
+            pointInfoMap.remove(key);
+        }
+
+        saveInfo();
+    }
+
+}

designer-base/src/main/java/com/fr/design/mainframe/burying/point/BasePointCollector.java

@@ -1,6 +1,5 @@
 package com.fr.design.mainframe.burying.point;
 
-import com.fr.design.mainframe.template.info.TemplateProcessInfo;
 import com.fr.stable.xml.XMLReadable;
 import com.fr.stable.xml.XMLWriter;
 
@@ -16,8 +15,4 @@ public interface BasePointCollector extends XMLReadable, XMLWriter {
      */
     public void sendPointInfo();
 
-    /**
-     * 保存埋点的信息到本地
-     */
-    public void collectInfo(String templateID, String originID, TemplateProcessInfo processInfo, int timeConsume);
 }

designer-base/src/main/java/com/fr/design/mainframe/chart/info/ChartInfoCollector.java

@@ -4,7 +4,7 @@ import com.fr.base.io.BaseBook;
 import com.fr.chartx.attr.ChartProvider;
 import com.fr.chartx.config.info.AbstractConfig;
 import com.fr.chartx.config.info.constant.ConfigType;
-import com.fr.design.mainframe.burying.point.AbstractPointCollector;
+import com.fr.design.mainframe.burying.point.AbstractTemplateInfoCollector;
 import com.fr.design.mainframe.template.info.TemplateInfo;
 import com.fr.design.mainframe.template.info.TemplateProcessInfo;
 import com.fr.general.ComparatorUtils;
@@ -21,7 +21,7 @@ import java.util.Map;
  * @version 10.0
  * Created by Bjorn on 2020-02-18
  */
-public class ChartInfoCollector extends AbstractPointCollector<ChartInfo> {
+public class ChartInfoCollector extends AbstractTemplateInfoCollector<ChartInfo> {
     private static final String XML_TAG = "ChartInfoCollector";
     private static final String XML_LAST_EDIT_DAY = "lastEditDay";
 

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

@@ -0,0 +1,38 @@
+package com.fr.design.mainframe.predefined;
+
+import com.fr.config.predefined.PredefinedStyle;
+import com.fr.predefined.PredefinedPatternStyleManager;
+
+
+/**
+ * Created by kerry on 2020-08-31
+ */
+public enum PatternStyle {
+    DARK_STYLE(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Predefined_Dark_Pattern")) {
+        @Override
+        public PredefinedStyle getPredefinedStyle() {
+            return PredefinedPatternStyleManager.INSTANCE.getDarkMode();
+        }
+    },
+    LIGHT_STYLE(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Predefined_Light_Pattern")) {
+        @Override
+        public PredefinedStyle getPredefinedStyle() {
+            return PredefinedPatternStyleManager.INSTANCE.getLightMode();
+        }
+    };
+
+
+    private String name;
+
+
+    PatternStyle(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public abstract PredefinedStyle getPredefinedStyle();
+
+}

designer-base/src/main/java/com/fr/design/mainframe/predefined/info/PredefinedStyleInfoCollector.java

@@ -0,0 +1,140 @@
+package com.fr.design.mainframe.predefined.info;
+
+import com.fr.config.MarketConfig;
+import com.fr.design.DesignerEnvManager;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.mainframe.burying.point.AbstractPointCollector;
+import com.fr.design.mainframe.template.info.SendHelper;
+import com.fr.general.CloudCenter;
+import com.fr.general.ComparatorUtils;
+import com.fr.general.GeneralUtils;
+import com.fr.json.JSONObject;
+import com.fr.stable.xml.XMLPrintWriter;
+import com.fr.stable.xml.XMLableReader;
+import com.fr.third.joda.time.DateTime;
+
+/**
+ * Created by kerry on 2020-09-04
+ */
+public class PredefinedStyleInfoCollector extends AbstractPointCollector {
+    //每三天上传一次
+    private static final long DELTA = 3 * 24 * 3600 * 1000L;
+
+    private static final String SIMPLE_DATE_PATTERN = "yyyy-MM-dd";
+    private static final String XML_TAG = "PredefinedStyleInfo";
+    private static final String XML_FILE_NAME = "predefinedStyle.info";
+    private static final String CLOUD_URL = CloudCenter.getInstance().acquireUrlByKind("design.collector") + "/single";
+
+    private static final String FUNCTION_NAME = "predefinedStyle";
+    private static final String FUNCTION_ID = "FR-F7003";
+
+    private static final String ATTR_FUNCTION_NAME = "functionName";
+    private static final String ATTR_FUNCTION_ID = "functionId";
+    private static final String ATTR_UUID = "uuid";
+    private static final String ATTR_UID = "uid";
+    private static final String ATTR_JAR_TIME = "jatTime";
+    private static final String ATTR_CLICK_NUMBER = "clickNumber";
+    private static final String ATTR_USE_NUMBER = "useNumber";
+    private static final String ATTR_TIME = "time";
+    private static final String XML_LAST_TIME = "lastSendTime";
+
+    /**
+     * 上一次的发送时间
+     */
+    private long lastSendTime;
+
+    private int clickNumber = 0;
+
+    private int useNumber = 0;
+
+    public int getClickNumber() {
+        return clickNumber;
+    }
+
+    public int getUseNumber() {
+        return useNumber;
+    }
+
+    private static class Holder {
+        private static PredefinedStyleInfoCollector collector = new PredefinedStyleInfoCollector();
+    }
+
+    private PredefinedStyleInfoCollector() {
+        loadFromFile();
+    }
+
+    public static PredefinedStyleInfoCollector getInstance() {
+        return Holder.collector;
+    }
+
+    public void collectClickNumber() {
+        clickNumber++;
+        saveInfo();
+    }
+
+    public void collectUseNumber(String predefinedName) {
+        if (!ComparatorUtils.equals(Toolkit.i18nText("Fine-Engine_Predefined_Style_Compatibility"), predefinedName) &&
+                !ComparatorUtils.equals(Toolkit.i18nText("Fine-Engine_Report_DEFAULT"), predefinedName)) {
+            useNumber++;
+        }
+        saveInfo();
+    }
+
+    @Override
+    protected String getInfoFilePath() {
+        return XML_FILE_NAME;
+    }
+
+    @Override
+    protected void addIdleDayCount() {
+
+    }
+
+    @Override
+    public void sendPointInfo() {
+        if (System.currentTimeMillis() - lastSendTime < DELTA) {
+            return;
+        }
+        String content = generateTotalInfo();
+        SendHelper.sendSinglePointInfo(CLOUD_URL, content);
+        this.lastSendTime = System.currentTimeMillis();
+        this.clickNumber = 0;
+        this.useNumber = 0;
+        saveInfo();
+    }
+
+    public String generateTotalInfo() {
+
+        JSONObject jo = JSONObject.create();
+        jo.put(ATTR_FUNCTION_NAME, FUNCTION_NAME);
+        jo.put(ATTR_FUNCTION_ID, FUNCTION_ID);
+        jo.put(ATTR_UUID, DesignerEnvManager.getEnvManager().getUUID());
+        jo.put(ATTR_UID, MarketConfig.getInstance().getBBSAttr().getBbsUid());
+        jo.put(ATTR_JAR_TIME, GeneralUtils.readFullVersionNO());
+        jo.put(ATTR_CLICK_NUMBER, this.clickNumber);
+        jo.put(ATTR_USE_NUMBER, this.useNumber);
+        jo.put(ATTR_TIME, DateTime.now().toString(SIMPLE_DATE_PATTERN));
+        return jo.toString();
+    }
+
+
+    @Override
+    public void readXML(XMLableReader reader) {
+        if (reader.isAttr()) {
+            String name = reader.getTagName();
+            if (XML_TAG.equals(name)) {
+                this.clickNumber = reader.getAttrAsInt(ATTR_CLICK_NUMBER, 0);
+                this.useNumber = reader.getAttrAsInt(ATTR_USE_NUMBER, 0);
+                this.lastSendTime = reader.getAttrAsLong(XML_LAST_TIME, System.currentTimeMillis());
+            }
+        }
+    }
+
+    @Override
+    public void writeXML(XMLPrintWriter writer) {
+        writer.startTAG(XML_TAG);
+        writer.attr(ATTR_CLICK_NUMBER, this.clickNumber).attr(ATTR_USE_NUMBER, this.useNumber)
+                .attr(XML_LAST_TIME, this.lastSendTime);
+        writer.end();
+    }
+}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/PredefinedStyleBlock.java

@@ -0,0 +1,142 @@
+package com.fr.design.mainframe.predefined.ui;
+
+import com.fr.base.BaseUtils;
+import com.fr.base.GraphHelper;
+import com.fr.config.predefined.PredefinedStyle;
+import com.fr.design.mainframe.predefined.ui.dialog.PredefinedStyleEditDialog;
+import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.mainframe.predefined.ui.preview.PredefinedStylePreviewPane;
+import com.fr.general.ComparatorUtils;
+import com.fr.general.IOUtils;
+import com.fr.stable.Constants;
+
+import javax.swing.BorderFactory;
+import javax.swing.Icon;
+import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Rectangle;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+
+/**
+ * Created by kerry on 2020-08-25
+ */
+public class PredefinedStyleBlock extends JPanel {
+    private PredefinedStyle previewObject;
+    private PredefinedStyleSelectPane parentPane;
+    private Icon markedMode = IOUtils.readIcon("/com/fr/design/form/images/marked.png");
+    private static final Color BORDER_COLOR = new Color(141, 194, 249);
+
+    private boolean mouseOver = false;
+
+    private MouseListener mouseListener = new MouseListener() {
+        @Override
+        public void mouseClicked(MouseEvent e) {
+            setSelect();
+        }
+
+        @Override
+        public void mousePressed(MouseEvent e) {
+
+        }
+
+        @Override
+        public void mouseReleased(MouseEvent e) {
+
+        }
+
+        @Override
+        public void mouseEntered(MouseEvent e) {
+            mouseOver = true;
+            PredefinedStyleBlock.this.repaint();
+        }
+
+        @Override
+        public void mouseExited(MouseEvent e) {
+            mouseOver = false;
+            PredefinedStyleBlock.this.repaint();
+        }
+    };
+
+
+    public PredefinedStyleBlock(PredefinedStyle previewObject, PredefinedStyleSelectPane selectPane, boolean supportEdit) {
+        this.previewObject = previewObject;
+        this.parentPane = selectPane;
+        initPane(supportEdit);
+        this.addMouseListener(mouseListener);
+    }
+
+    private void setSelect() {
+        this.parentPane.setSelectedPreviewPane(this);
+    }
+
+    @Override
+    public void paint(Graphics g) {
+        super.paint(g);
+        boolean isSelected = ComparatorUtils.equals(this, this.parentPane.getSelectedPreviewPane());
+        if (ComparatorUtils.equals(this.parentPane.getCurrentApplicateStyle(), this.previewObject.getStyleName())) {
+            markedMode.paintIcon(this, g, 176, 0);
+        }
+        if (isSelected || this.mouseOver) {
+            g.setColor(BORDER_COLOR);
+            Rectangle rectangle = new Rectangle(1, 1, this.getWidth() - 2, this.getHeight() - 2);
+            GraphHelper.draw(g, rectangle, Constants.LINE_MEDIUM);
+        }
+    }
+
+
+    private void initPane(boolean supportEdit) {
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        PredefinedStylePreviewPane content = new PredefinedStylePreviewPane(0.387, 0.384);
+        content.setPreferredSize(new Dimension(200, 180));
+        UILabel label = new UILabel(previewObject.getStyleName());
+        label.setToolTipText(previewObject.getStyleName());
+        label.setPreferredSize(new Dimension(167, 25));
+
+
+        JPanel panel = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        panel.setBorder(BorderFactory.createEmptyBorder(0,9,2,5));
+        panel.add(label, BorderLayout.WEST);
+        if (supportEdit) {
+            addEditButton(panel);
+        }
+
+        this.add(content, BorderLayout.CENTER);
+        this.add(panel, BorderLayout.SOUTH);
+        this.setPreferredSize(new Dimension(200, 210));
+        panel.setBackground(Color.WHITE);
+        this.setBackground(Color.WHITE);
+        content.refresh(this.previewObject);
+
+    }
+
+    private void addEditButton(JPanel panel) {
+        UIButton editButton = new UIButton(BaseUtils.readIcon("/com/fr/design/icon/icon_edit.png"));
+        editButton.setPreferredSize(new Dimension(24, 24));
+        editButton.setBorderPainted(false);
+        editButton.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                PredefinedStyleEditPane editPane = PredefinedStyleEditPane.createEditPane(parentPane);
+                PredefinedStyleEditDialog editDialog = new PredefinedStyleEditDialog(
+                        SwingUtilities.getWindowAncestor(PredefinedStyleBlock.this), editPane,  previewObject.isBuiltIn());
+                editPane.populate(PredefinedStyleBlock.this.previewObject);
+                editDialog.setVisible(true);
+            }
+        });
+        panel.add(editButton, BorderLayout.EAST);
+
+    }
+
+    public PredefinedStyle update() {
+        return this.previewObject;
+    }
+}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/PredefinedStyleEditPane.java

@@ -0,0 +1,359 @@
+package com.fr.design.mainframe.predefined.ui;
+
+import com.fr.base.ChartColorMatching;
+import com.fr.base.ChartPreStyleConfig;
+import com.fr.base.Style;
+import com.fr.base.background.ColorBackground;
+import com.fr.config.predefined.ColorFillStyle;
+import com.fr.config.predefined.PredefinedCellStyle;
+import com.fr.config.predefined.PredefinedCellStyleConfig;
+import com.fr.config.predefined.PredefinedColorStyle;
+import com.fr.config.predefined.PredefinedStyle;
+import com.fr.config.predefined.PredefinedStyleConfig;
+import com.fr.config.ServerPreferenceConfig;
+import com.fr.design.dialog.FineJOptionPane;
+import com.fr.design.gui.frpane.AbstractAttrNoScrollPane;
+import com.fr.design.gui.frpane.AttributeChangeListener;
+import com.fr.design.gui.frpane.UITabbedPane;
+import com.fr.design.gui.icontainer.UIScrollPane;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.gui.itextfield.UITextField;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.mainframe.predefined.ui.detail.ChartStyleSettingPane;
+import com.fr.design.mainframe.predefined.ui.detail.ColorFillStylePane;
+import com.fr.design.mainframe.predefined.ui.detail.PredefinedBackgroundSettingPane;
+import com.fr.design.mainframe.predefined.ui.detail.ComponentStyleSettingPane;
+import com.fr.design.mainframe.predefined.ui.detail.CellStyleListControlPane;
+import com.fr.design.mainframe.predefined.ui.preview.PredefinedStylePreviewPane;
+import com.fr.design.utils.DesignUtils;
+import com.fr.general.FRFont;
+import com.fr.log.FineLoggerFactory;
+import com.fr.stable.StringUtils;
+
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * Created by kerry on 2020-08-26
+ */
+public class PredefinedStyleEditPane extends AbstractAttrNoScrollPane {
+    private static final Color TIP_COLOR = Color.decode("#8F8F92");
+
+    private PredefinedStylePreviewPane previewPane;
+    private UITextField styleNameField;
+    private PredefinedBackgroundSettingPane backgroundSettingPane;
+    private CellStyleListControlPane cellStyleSettingPane;
+    private ComponentStyleSettingPane componentStyleSettingPane;
+    private ChartStyleSettingPane chartStyleSettingPane;
+    private PredefinedStyleSelectPane selectPane;
+    private ColorFillStylePane colorFillStylePane;
+    private boolean isPopulating = false;
+    private UITabbedPane uiTabbedPane;
+
+    private boolean isLightMode = true;
+
+    @Override
+    protected JPanel createContentPane() {
+        JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        jPanel.add(createLeftPane(), BorderLayout.WEST);
+        jPanel.add(createRightPane(), BorderLayout.CENTER);
+
+        this.addAttributeChangeListener(new AttributeChangeListener() {
+            @Override
+            public void attributeChange() {
+                if (!isPopulating) {
+                    valueChangeAction();
+                }
+            }
+        });
+        return jPanel;
+    }
+
+    public void valueChangeAction() {
+        boolean displayFormBackground = backgroundSettingPane.currentFormBackground() || uiTabbedPane.getSelectedIndex() == 3;
+        previewPane.refresh(this.update(), displayFormBackground);
+    }
+
+    @Override
+    public String title4PopupWindow() {
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Predefined_Style_Edit");
+    }
+
+    private PredefinedStyleEditPane(PredefinedStyleSelectPane selectPane, boolean newEditPane) {
+        this.selectPane = selectPane;
+        this.styleNameField.setEnabled(newEditPane);
+    }
+
+    public static PredefinedStyleEditPane createEditPane(PredefinedStyleSelectPane selectPane) {
+        return new PredefinedStyleEditPane(selectPane, false);
+    }
+
+    public static PredefinedStyleEditPane createNewEditPane(PredefinedStyleSelectPane selectPane) {
+        return new PredefinedStyleEditPane(selectPane, true);
+    }
+
+
+    private JPanel createLeftPane() {
+        JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        JPanel titlePane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Predefined_Overall_Preview"));
+        previewPane = new PredefinedStylePreviewPane();
+        previewPane.setPreferredSize(new Dimension(517, 500));
+
+        titlePane.add(previewPane);
+        jPanel.add(titlePane, BorderLayout.CENTER);
+        return jPanel;
+    }
+
+    private JPanel createRightPane() {
+        JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        JPanel styleNamePane = createStyleNamePane();
+        jPanel.add(styleNamePane, BorderLayout.NORTH);
+
+        JPanel basicSettingPane = createBasicSettingPane();
+        jPanel.add(basicSettingPane, BorderLayout.CENTER);
+
+        JPanel customDetailPane = createCustomDetailPane();
+        jPanel.add(customDetailPane, BorderLayout.SOUTH);
+        return jPanel;
+    }
+
+    private JPanel createStyleNamePane() {
+        JPanel jPanel = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(5, 26, 8);
+        jPanel.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Predefined_Style_Name")));
+        this.styleNameField = new UITextField();
+        this.styleNameField.setPreferredSize(new Dimension(160, 20));
+        jPanel.add(this.styleNameField);
+        return jPanel;
+    }
+
+    private JPanel createBasicSettingPane() {
+        JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        JPanel titlePane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Predefined_Basic_Setting"));
+        JPanel contentPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        colorFillStylePane = new ColorFillStylePane();
+        contentPane.add(colorFillStylePane);
+        titlePane.add(contentPane);
+        jPanel.add(titlePane, BorderLayout.CENTER);
+        titlePane.setSize(new Dimension(348, 157));
+        return jPanel;
+    }
+
+    private JPanel createCustomDetailPane() {
+        JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        JPanel titlePane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Predefined_Custom_Detail"));
+        titlePane.setLayout(FRGUIPaneFactory.createLeftZeroLayout());
+        jPanel.add(titlePane, BorderLayout.CENTER);
+        uiTabbedPane = new UITabbedPane();
+        uiTabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Predefined_Template_Background"), createTemplateBackgroundSettingPane());
+        uiTabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Predefined_Cell_Style"), createCellStyleSettingPane());
+        uiTabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Predefined_Chart_Style"), createChartStyleSettingPane());
+        uiTabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Predefined_Component_Style"), createComponentStyleSettingPane());
+        uiTabbedPane.addChangeListener(new ChangeListener() {
+            @Override
+            public void stateChanged(ChangeEvent e) {
+                valueChangeAction();
+            }
+        });
+        titlePane.add(uiTabbedPane);
+        uiTabbedPane.setPreferredSize(new Dimension(323, 298));
+        titlePane.setPreferredSize(new Dimension(333, 320));
+        return jPanel;
+    }
+
+
+    private JPanel createTemplateBackgroundSettingPane() {
+        JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        jPanel.setBorder(BorderFactory.createEmptyBorder(10, 5, 10, 5));
+        this.backgroundSettingPane = new PredefinedBackgroundSettingPane();
+        jPanel.setPreferredSize(new Dimension(309, 248));
+        UIScrollPane scrollPane = new UIScrollPane(this.backgroundSettingPane);
+        scrollPane.setBorder(BorderFactory.createEmptyBorder());
+        jPanel.add(new UIScrollPane(this.backgroundSettingPane));
+        return jPanel;
+    }
+
+    private JPanel createCellStyleSettingPane() {
+        JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        jPanel.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 5));
+        this.cellStyleSettingPane = new CellStyleListControlPane();
+        jPanel.add(this.cellStyleSettingPane);
+        return jPanel;
+    }
+
+
+    private JPanel createChartStyleSettingPane() {
+        JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        jPanel.setBorder(BorderFactory.createEmptyBorder(10, 5, 10, 5));
+        this.chartStyleSettingPane = new ChartStyleSettingPane();
+        jPanel.add(this.chartStyleSettingPane);
+        return jPanel;
+    }
+
+
+    private JPanel createComponentStyleSettingPane() {
+        JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        jPanel.setLayout(new BorderLayout(0, 5));
+        jPanel.setBorder(BorderFactory.createEmptyBorder(10, 5, 10, 5));
+        this.componentStyleSettingPane = new ComponentStyleSettingPane();
+        UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Predefined_ComponentStyle_Setting_Tip"));
+        label.setForeground(TIP_COLOR);
+        jPanel.add(label, BorderLayout.NORTH);
+        jPanel.add(this.componentStyleSettingPane, BorderLayout.CENTER);
+        return jPanel;
+    }
+
+
+    public void populate(PredefinedStyle previewObject) {
+        isPopulating = true;
+        isLightMode = previewObject.isLightMode();
+        styleNameField.setText(previewObject.getStyleName());
+        this.backgroundSettingPane.populateBean(previewObject.getPredefinedBackground());
+        this.cellStyleSettingPane.populateBean(previewObject.getCellStyleConfig());
+        this.componentStyleSettingPane.populateBean(previewObject.getComponentStyle());
+        this.colorFillStylePane.populateBean(previewObject.getPredefinedColorStyle());
+        this.chartStyleSettingPane.populateBean(previewObject.getPredefinedChartStyle());
+        previewPane.refresh(previewObject);
+        isPopulating = false;
+    }
+
+    public PredefinedStyle update() {
+        PredefinedStyle predefinedStyle = new PredefinedStyle();
+        predefinedStyle.setLightMode(isLightMode);
+        predefinedStyle.setStyleName(this.styleNameField.getText());
+        PredefinedCellStyleConfig cellStyleConfig = this.cellStyleSettingPane.updateBean();
+        predefinedStyle.setCellStyleConfig(cellStyleConfig);
+
+        predefinedStyle.setPredefinedBackground(this.backgroundSettingPane.updateBean());
+        predefinedStyle.setComponentStyle(this.componentStyleSettingPane.updateBean());
+
+        PredefinedColorStyle colorStyle = this.colorFillStylePane.update();
+        updateCellStyleByColorStyle(colorStyle, cellStyleConfig);
+        predefinedStyle.setPredefinedColorStyle(colorStyle);
+        predefinedStyle.setPredefinedChartStyle(this.chartStyleSettingPane.updateBean());
+        return predefinedStyle;
+    }
+
+    private void updateCellStyleByColorStyle(PredefinedColorStyle colorStyle, PredefinedCellStyleConfig cellStyleConfig) {
+        PredefinedCellStyle headerStyle = cellStyleConfig.getStyle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Predefined_Style_Header"));
+        PredefinedCellStyle highlightStyle = cellStyleConfig.getStyle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Predefined_Style_Highlight_Text"));
+        ColorFillStyle colorFillStyle = colorStyle.getColorFillStyle();
+        List<Color> colorList = new ArrayList<>();
+        if (colorFillStyle == null || colorFillStyle.getColorList().size() == 0){
+            ChartPreStyleConfig config = ChartPreStyleConfig.getInstance();
+            String defaultName = config.getCurrentStyle();
+            ChartColorMatching defaultStyle = (ChartColorMatching) config.getPreStyle(defaultName);
+            if (defaultStyle != null) {
+                colorList = defaultStyle.getColorList();
+            }
+        } else {
+            colorList = colorFillStyle.getColorList();
+        }
+        if (colorList.size() < 2) {
+            return;
+        }
+        if (headerStyle != null) {
+            Style style = headerStyle.getStyle();
+            Color color = colorList.get(0);
+            headerStyle.setStyle(style.deriveBackground(ColorBackground.getInstance(color)));
+        }
+        if (highlightStyle != null) {
+            Style style = highlightStyle.getStyle();
+            Color color = colorList.get(1);
+            FRFont font = style.getFRFont();
+            font.setForeground(color);
+            highlightStyle.setStyle(style.deriveFRFont(font));
+        }
+    }
+
+    public boolean saveStyle() {
+        PredefinedStyle previewObject;
+        try {
+            previewObject = update();
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+            return false;
+        }
+        if (this.styleNameField.isEnabled() && !validateRepeat(previewObject.getStyleName())) {
+            return false;
+        }
+        if (!saveStyle(previewObject)) {
+            return false;
+        }
+        DesignUtils.refreshDesignerFrame();
+        return true;
+    }
+
+    private boolean saveStyle(PredefinedStyle previewObject) {
+        PredefinedStyleConfig config = ServerPreferenceConfig.getInstance().getPreferenceStyleConfig();
+        if (StringUtils.isEmpty(previewObject.getStyleName())) {
+            FineJOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(PredefinedStyleEditPane.this),
+                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Predefined_Style_Name_Cannot_Empty"));
+
+            return false;
+        }
+        config.add(previewObject);
+        PredefinedStyleConfig sortedConfig = resortConfigStyles(previewObject, config);
+        ServerPreferenceConfig.getInstance().setPreferenceStyleConfig(sortedConfig);
+        selectPane.refreshPane();
+        return true;
+    }
+
+    public void saveAsNewStyle(String styleName) {
+        PredefinedStyle previewObject;
+        try {
+            previewObject = update();
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+            return;
+        }
+        previewObject.setStyleName(styleName);
+        if (validateRepeat(styleName)) {
+            saveStyle(previewObject);
+        }
+    }
+
+    private boolean validateRepeat(String styleName) {
+        PredefinedStyleConfig config = ServerPreferenceConfig.getInstance().getPreferenceStyleConfig();
+        if (config.getStyle(styleName) != null) {
+            FineJOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(PredefinedStyleEditPane.this),
+                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Predefined_Name_Repeat"));
+
+            return false;
+        }
+        return true;
+    }
+
+    private PredefinedStyleConfig resortConfigStyles(PredefinedStyle priorityStyle, PredefinedStyleConfig config){
+        PredefinedStyleConfig sortedConfig = new PredefinedStyleConfig();
+        PredefinedStyle defaultStyle = config.getDefaultPredefinedStyle();
+        if (defaultStyle != null) {
+            sortedConfig.add(defaultStyle);
+            config.removeStyle(defaultStyle.getStyleName());
+            sortedConfig.setDefaultPredefinedStyle(defaultStyle.getStyleName());
+        }
+        if (priorityStyle != null && !priorityStyle.isDefaultStyle()) {
+            sortedConfig.add(priorityStyle);
+            config.removeStyle(priorityStyle.getStyleName());
+        }
+        Iterator<PredefinedStyle> iterator = config.getPredefinedStyleIterator();
+        while (iterator.hasNext()) {
+            PredefinedStyle entry = iterator.next();
+            sortedConfig.add(entry);
+        }
+        sortedConfig.setCompatibleStyleName(config.getCompatibleStyleName());
+        return sortedConfig;
+    }
+
+
+
+
+}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/PredefinedStyleSelectPane.java

@@ -0,0 +1,102 @@
+package com.fr.design.mainframe.predefined.ui;
+
+import com.fr.config.ServerPreferenceConfig;
+import com.fr.config.predefined.PredefinedStyle;
+import com.fr.design.dialog.BasicPane;
+import com.fr.design.event.ChangeListener;
+import com.fr.design.gui.icontainer.UIScrollPane;
+import com.fr.design.layout.FRGUIPaneFactory;
+
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
+import java.util.Iterator;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+
+/**
+ * Created by kerry on 2020-08-26
+ */
+public class PredefinedStyleSelectPane extends BasicPane {
+    private PredefinedStyleBlock selectedBlock;
+    private boolean editable;
+    private JPanel contentPane;
+    private String currentApplicateStyle;
+    private ChangeListener changeListener;
+
+
+    public PredefinedStyleSelectPane(String currentApplicateStyle, boolean editable) {
+        this.editable = editable;
+        this.currentApplicateStyle = currentApplicateStyle;
+        initPane();
+    }
+
+    public void registerChangeListener(ChangeListener changeListener) {
+        this.changeListener = changeListener;
+
+    }
+
+
+    private void initPane() {
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        contentPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(5, 8);
+        createContentPane();
+        UIScrollPane scrollPane = new UIScrollPane(contentPane);
+        scrollPane.setPreferredSize(new Dimension(630, 480));
+        scrollPane.setBorder(BorderFactory.createEmptyBorder());
+        this.add(scrollPane, BorderLayout.CENTER);
+    }
+
+
+    public void createContentPane() {
+        contentPane.removeAll();
+        Iterator<PredefinedStyle> iterator = ServerPreferenceConfig.getInstance().getPreferenceStyleConfig().getPredefinedStyleIterator();
+        int rowCount = (ServerPreferenceConfig.getInstance().getPreferenceStyleConfig().getPredefinedSize() +2)/ 3;
+        contentPane.setPreferredSize(new Dimension(618, 220 * rowCount));
+        while (iterator.hasNext()) {
+            PredefinedStyle tmpStyle = iterator.next();
+
+            if (tmpStyle != null) {
+                PredefinedStyleBlock tmpPanel =
+                        new PredefinedStyleBlock(tmpStyle, this, this.editable);
+                contentPane.add(tmpPanel);
+            }
+        }
+    }
+
+
+    public String getCurrentApplicateStyle() {
+        return currentApplicateStyle;
+    }
+
+    public void refreshPane() {
+        createContentPane();
+        this.validate();
+        this.repaint();
+    }
+
+    @Override
+    protected String title4PopupWindow() {
+        return null;
+    }
+
+    public void setSelectedPreviewPane(PredefinedStyleBlock selectedPreviewPane) {
+        this.selectedBlock = selectedPreviewPane;
+        if (changeListener != null) {
+            changeListener.fireChanged(null);
+        }
+        this.repaint();
+    }
+
+    public PredefinedStyleBlock getSelectedPreviewPane() {
+        return selectedBlock;
+    }
+
+    public PredefinedStyle update() {
+        if (this.selectedBlock == null){
+            return null;
+        }
+        return this.selectedBlock.update();
+    }
+
+
+}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/PredefinedStyleSettingPane.java

@@ -0,0 +1,152 @@
+package com.fr.design.mainframe.predefined.ui;
+
+import com.fr.config.predefined.PredefinedNameStyleProvider;
+import com.fr.design.file.HistoryTemplateListCache;
+import com.fr.design.gui.frpane.AbstractAttrNoScrollPane;
+import com.fr.design.gui.frpane.AttributeChangeListener;
+import com.fr.design.gui.ibutton.UIRadioButton;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.mainframe.JTemplate;
+import com.fr.design.mainframe.predefined.ui.preview.StyleSettingPreviewPane;
+
+import javax.swing.ButtonGroup;
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.CardLayout;
+import java.awt.Dimension;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+/**
+ * Created by kerry on 2020-09-02
+ */
+public abstract class PredefinedStyleSettingPane<T> extends AbstractAttrNoScrollPane {
+    protected StyleSettingPreviewPane previewPane;
+    protected UIRadioButton predefinedRadioBtn;
+    private UIRadioButton customRadioBtn;
+    private JPanel customDetailPane;
+    private JPanel predefinedSettingPane;
+    private CardLayout tabbedPane;
+    private JPanel center;
+    private boolean isPopulating = false;
+
+
+    public void setPopulating(boolean populating) {
+        isPopulating = populating;
+    }
+
+    protected void initContentPane() {
+        leftContentPane = createContentPane();
+        this.add(leftContentPane, BorderLayout.CENTER);
+    }
+
+    @Override
+    protected JPanel createContentPane() {
+        JPanel contentPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        previewPane = createPreviewPane();
+        JPanel previewTitlePane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview"));
+        if (previewPane != null) {
+            previewTitlePane.setPreferredSize(new Dimension(407, 527));
+            previewTitlePane.add(previewPane);
+            contentPane.add(previewTitlePane, BorderLayout.WEST);
+        }
+
+        customDetailPane = createCustomDetailPane();
+        predefinedSettingPane = createPredefinedSettingPane();
+
+        JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        JPanel jPanel = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(10, 20, 10);
+        jPanel.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style")));
+        predefinedRadioBtn = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preference_Predefined"));
+        customRadioBtn = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom"));
+
+        tabbedPane = new CardLayout();
+        center = new JPanel(tabbedPane);
+        center.add(predefinedSettingPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preference_Predefined"));
+        center.add(customDetailPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom"));
+        predefinedRadioBtn.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                tabbedPane.show(center, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preference_Predefined"));
+            }
+        });
+        customRadioBtn.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                tabbedPane.show(center, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom"));
+            }
+        });
+        jPanel.add(predefinedRadioBtn);
+        jPanel.add(customRadioBtn);
+
+        ButtonGroup layoutBG = new ButtonGroup();
+        layoutBG.add(predefinedRadioBtn);
+        layoutBG.add(customRadioBtn);
+        centerPane.add(jPanel, BorderLayout.NORTH);
+        centerPane.add(center, BorderLayout.CENTER);
+        contentPane.add(centerPane, BorderLayout.CENTER);
+        this.addAttributeChangeListener(new AttributeChangeListener() {
+            @Override
+            public void attributeChange() {
+                if (isPopulating) {
+                    return;
+                }
+                if (previewPane != null) {
+                    previewPane.refresh();
+                }
+            }
+        });
+        return contentPane;
+    }
+
+
+    protected abstract StyleSettingPreviewPane createPreviewPane();
+
+    protected abstract JPanel createCustomDetailPane();
+
+    protected JPanel createPredefinedSettingPane() {
+        return new JPanel();
+    }
+
+    protected void populate(PredefinedNameStyleProvider nameStyle) {
+        this.predefinedRadioBtn.setSelected(nameStyle.usePredefinedStyle());
+        this.customRadioBtn.setSelected(!nameStyle.usePredefinedStyle());
+        if (nameStyle.usePredefinedStyle()) {
+            tabbedPane.show(center, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preference_Predefined"));
+        } else {
+            tabbedPane.show(center, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom"));
+        }
+
+    }
+
+    protected String getPredefinedStyleName() {
+        JTemplate template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+        return template.getTemplatePredefinedStyle();
+    }
+
+    /**
+     * 展示数据
+     *
+     * @param ob 待展示的对象
+     */
+    public abstract void populateBean(T ob);
+
+    /**
+     * 保存数据
+     *
+     * @return 待保存的对象
+     */
+    public abstract T updateBean();
+
+    /**
+     * 保存数据
+     *
+     * @param ob 待保存的对象
+     */
+    public void updateBean(T ob) {
+
+    }
+
+
+}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/ReportPredefinedStylePane.java

@@ -0,0 +1,53 @@
+package com.fr.design.mainframe.predefined.ui;
+
+import com.fr.config.predefined.PredefinedStyle;
+import com.fr.design.dialog.BasicPane;
+import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.mainframe.JTemplate;
+
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.FlowLayout;
+
+/**
+ * Created by kerry on 2020-08-28
+ */
+public class ReportPredefinedStylePane extends BasicPane {
+    private PredefinedStyleSelectPane selectPane;
+    private JTemplate currentTemplate;
+    private UIButton preferenceBtn;
+
+    public ReportPredefinedStylePane(JTemplate jTemplate, UIButton preferenceButton) {
+        this.currentTemplate = jTemplate;
+        this.preferenceBtn = preferenceButton;
+        initPane();
+    }
+
+    private void initPane() {
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        JPanel jPanel = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Predefined_Style_Select"));
+        jPanel.setLayout(new FlowLayout(FlowLayout.LEFT, 0, 0));
+        JPanel subPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        this.selectPane = new PredefinedStyleSelectPane(currentTemplate.getTemplatePredefinedStyle(), false);
+        subPanel.add(this.selectPane, BorderLayout.CENTER);
+        jPanel.add(subPanel, BorderLayout.CENTER);
+        this.add(jPanel, BorderLayout.CENTER);
+    }
+
+    public void update() {
+        PredefinedStyle style = selectPane.update();
+        if (style != null) {
+            currentTemplate.resetPredefinedStyle(style.getStyleName(), preferenceBtn);
+        }
+    }
+
+    public void refresh() {
+        this.selectPane.refreshPane();
+    }
+
+    @Override
+    protected String title4PopupWindow() {
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Predefined_Template_Style");
+    }
+}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/ServerPredefinedStylePane.java

@@ -0,0 +1,208 @@
+package com.fr.design.mainframe.predefined.ui;
+
+
+import com.fr.base.BaseUtils;
+import com.fr.config.predefined.PredefinedStyle;
+import com.fr.config.predefined.PredefinedStyleConfig;
+import com.fr.config.ServerPreferenceConfig;
+import com.fr.design.actions.UpdateAction;
+import com.fr.design.event.ChangeEvent;
+import com.fr.design.event.ChangeListener;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.mainframe.predefined.PatternStyle;
+import com.fr.design.dialog.BasicPane;
+import com.fr.design.dialog.FineJOptionPane;
+import com.fr.design.gui.itoolbar.UIToolbar;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.icon.IconPathConstants;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.mainframe.predefined.ui.dialog.PredefinedStyleEditDialog;
+import com.fr.design.menu.MenuDef;
+import com.fr.design.menu.ToolBarDef;
+import com.fr.design.utils.DesignUtils;
+import com.fr.stable.StringUtils;
+
+import javax.swing.BorderFactory;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JSeparator;
+import javax.swing.SwingUtilities;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+
+/**
+ * Created by kerry on 2020-08-25
+ */
+public class ServerPredefinedStylePane extends BasicPane {
+
+    private static final Color TIP_COLOR = Color.decode("#8F8F92");
+    private RemoveAction removeAction;
+
+    private PredefinedStyleSelectPane selectPane;
+
+
+    public ServerPredefinedStylePane() {
+        initPane();
+    }
+
+    private void initPane() {
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        JPanel jPanel = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Predefined_Style_Manager"));
+        jPanel.setLayout(new FlowLayout(FlowLayout.LEFT, 0, 0));
+        jPanel.setLayout(FRGUIPaneFactory.createLeftZeroLayout());
+        JPanel subPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        subPanel.add(createControlPane(), BorderLayout.NORTH);
+        PredefinedStyle style = ServerPreferenceConfig.getInstance().getPreferenceStyleConfig().getDefaultPredefinedStyle();
+
+        this.selectPane = new PredefinedStyleSelectPane(style == null ? StringUtils.EMPTY : style.getStyleName(), true);
+        this.selectPane.registerChangeListener(new ChangeListener() {
+            @Override
+            public void fireChanged(ChangeEvent event) {
+                PredefinedStyle selectStyle = selectPane.getSelectedPreviewPane().update();
+                removeAction.setEnabled(!selectStyle.isBuiltIn());
+            }
+        });
+        this.selectPane.addMouseListener(new MouseListener() {
+            @Override
+            public void mouseClicked(MouseEvent e) {
+                if (selectPane.getSelectedPreviewPane() != null) {
+                    removeAction.setEnabled(true);
+                }
+            }
+
+            @Override
+            public void mousePressed(MouseEvent e) {
+
+            }
+
+            @Override
+            public void mouseReleased(MouseEvent e) {
+
+            }
+
+            @Override
+            public void mouseEntered(MouseEvent e) {
+
+            }
+
+            @Override
+            public void mouseExited(MouseEvent e) {
+
+            }
+        });
+        JSeparator jSeparator = new JSeparator();
+        subPanel.add(jSeparator, BorderLayout.CENTER);
+        subPanel.add(this.selectPane, BorderLayout.SOUTH);
+        jPanel.add(subPanel);
+        this.add(jPanel, BorderLayout.CENTER);
+        this.repaint();
+    }
+
+
+    private JPanel createControlPane() {
+        MenuDef addMenuDef = new MenuDef(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Add"));
+        addMenuDef.setIconPath(IconPathConstants.ADD_POPMENU_ICON_PATH);
+        createAddMenuDef(addMenuDef);
+        ToolBarDef toolbarDef = new ToolBarDef();
+        removeAction = new RemoveAction();
+        removeAction.setEnabled(false);
+        toolbarDef.addShortCut(addMenuDef, removeAction);
+        UIToolbar toolBar = ToolBarDef.createJToolBar();
+        toolBar.setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0));
+        toolbarDef.updateToolBar(toolBar);
+        JPanel toolbarPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        toolbarPane.add(toolBar, BorderLayout.CENTER);
+        UILabel tipLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Predefined_Style_Manager_Tip"));
+        tipLabel.setForeground(TIP_COLOR);
+        tipLabel.setHorizontalTextPosition(UILabel.RIGHT);
+        toolbarPane.add(tipLabel, BorderLayout.EAST);
+        toolbarPane.setPreferredSize(new Dimension(620, 30));
+        return toolbarPane;
+    }
+
+    private void createAddMenuDef(MenuDef addMenuDef) {
+        addMenuDef.setRePaint(true);
+        addMenuDef.addShortCut(new CreateStyleAction(PatternStyle.DARK_STYLE));
+        addMenuDef.addShortCut(new CreateStyleAction(PatternStyle.LIGHT_STYLE));
+
+    }
+
+
+    public void update() {
+        PredefinedStyle style = selectPane.update();
+        if (style != null) {
+            PredefinedStyleConfig config = ServerPreferenceConfig.getInstance().getPreferenceStyleConfig();
+            config.setDefaultPredefinedStyle(style.getStyleName());
+            ServerPreferenceConfig.getInstance().setPreferenceStyleConfig(config);
+            DesignUtils.refreshDesignerFrame();
+        }
+
+    }
+
+
+    @Override
+    protected String title4PopupWindow() {
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Predefined_Server_Style");
+    }
+
+    private class RemoveAction extends UpdateAction {
+
+        public RemoveAction() {
+            this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"));
+            this.setMnemonic('R');
+            this.setSmallIcon(BaseUtils.readIcon(IconPathConstants.TD_REMOVE_ICON_PATH));
+        }
+
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            PredefinedStyle previewObject = ServerPredefinedStylePane.this.selectPane.update();
+            int selVal = FineJOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(ServerPredefinedStylePane.this),
+                    Toolkit.i18nText("Fine-Design_Predefined_Remove_Style_Confirm", previewObject.getStyleName()),
+                    Toolkit.i18nText("Fine-Design_Basic_Delete"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
+            if (selVal == JOptionPane.YES_OPTION) {
+                removeStyle(previewObject.getStyleName());
+                ServerPredefinedStylePane.this.selectPane.refreshPane();
+            }
+        }
+    }
+
+
+    private class CreateStyleAction extends UpdateAction {
+        private PatternStyle style;
+
+        public CreateStyleAction(PatternStyle style) {
+            this.style = style;
+            this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Predefined_Create_Parttern_Style") + style.getName());
+            this.setMnemonic('R');
+        }
+
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            createNewPatternStylePane();
+        }
+
+        private void createNewPatternStylePane() {
+            PredefinedStyleEditPane editPane = PredefinedStyleEditPane.createNewEditPane(selectPane);
+            PredefinedStyleEditDialog editDialog = new PredefinedStyleEditDialog(
+                    SwingUtilities.getWindowAncestor(ServerPredefinedStylePane.this), editPane);
+            PredefinedStyle predefinedStyle = style.getPredefinedStyle();
+            predefinedStyle.setStyleName(StringUtils.EMPTY);
+            editPane.populate(predefinedStyle);
+            editDialog.setVisible(true);
+        }
+    }
+
+
+    private void removeStyle(String name) {
+        PredefinedStyleConfig config = ServerPreferenceConfig.getInstance().getPreferenceStyleConfig();
+        config.removeStyle(name);
+        ServerPreferenceConfig.getInstance().setPreferenceStyleConfig(config);
+        DesignUtils.refreshDesignerFrame();
+    }
+
+}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/CellStyleListControlPane.java

@@ -0,0 +1,287 @@
+package com.fr.design.mainframe.predefined.ui.detail;
+
+import com.fr.base.BaseUtils;
+import com.fr.base.Style;
+import com.fr.config.predefined.PredefinedCellStyle;
+import com.fr.config.predefined.PredefinedCellStyleConfig;
+import com.fr.design.actions.UpdateAction;
+import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.dialog.BasicPane;
+import com.fr.design.dialog.FineJOptionPane;
+import com.fr.design.gui.NameInspector;
+import com.fr.design.gui.controlpane.JListControlPane;
+import com.fr.design.gui.controlpane.NameObjectCreator;
+import com.fr.design.gui.controlpane.NameableCreator;
+import com.fr.design.gui.controlpane.ShortCut4JControlPane;
+import com.fr.design.gui.controlpane.UnrepeatedNameHelper;
+import com.fr.design.gui.ilist.ListModelElement;
+import com.fr.design.gui.ilist.ModNameActionListener;
+import com.fr.design.gui.style.AlignmentPane;
+import com.fr.design.gui.style.FormatPane;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.mainframe.predefined.ui.detail.cell.CustomPredefinedStylePane;
+import com.fr.design.menu.ShortCut;
+import com.fr.general.ComparatorUtils;
+import com.fr.general.NameObject;
+import com.fr.log.FineLoggerFactory;
+import com.fr.stable.Nameable;
+import com.fr.stable.StringUtils;
+
+import javax.swing.BorderFactory;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JSeparator;
+import javax.swing.SwingConstants;
+import javax.swing.SwingUtilities;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.event.ActionEvent;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * Created by kerry on 2020-09-27
+ */
+public class CellStyleListControlPane extends JListControlPane {
+    private boolean namePermitted = true;
+
+    public CellStyleListControlPane() {
+        super();
+        this.addModNameActionListener(new ModNameActionListener() {
+            public void nameModed(int index, String oldName, String newName) {
+                if (ComparatorUtils.equals(oldName, newName) || ComparatorUtils.equals(newName, NameInspector.ILLEGAL_NAME_HOLDER)) {
+                    return;
+                }
+                namePermitted = true;
+                String[] allNames = nameableList.getAllNames();
+                allNames[index] = StringUtils.EMPTY;
+                if (StringUtils.isEmpty(newName)) {
+                    showTipDialogAndReset(Toolkit.i18nText("Fine-Design_Basic_Predefined_Style_Empty_Name"), index);
+                    return;
+                }
+                if (isNameRepeated(new List[]{Arrays.asList(allNames)}, newName)) {
+                    showTipDialogAndReset(Toolkit.i18nText("Fine-Design_Basic_Predefined_Style_Duplicate_Name", newName), index);
+                    return;
+                }
+                populateSelectedValue();
+            }
+        });
+    }
+
+    private void showTipDialogAndReset(String content, int index) {
+        nameableList.stopEditing();
+
+        FineJOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(CellStyleListControlPane.this),
+                content,
+                Toolkit.i18nText("Fine-Design_Basic_Alert"),
+                JOptionPane.WARNING_MESSAGE);
+        setIllegalIndex(index);
+        namePermitted = false;
+    }
+
+    @Override
+    public NameableCreator[] createNameableCreators() {
+        return new NameableCreator[]{
+                new CellStyleNameObjectCreator(Toolkit.i18nText("Fine-Design_Predefined_Cell_New_Style"),
+                        PredefinedCellStyle.class, CustomPredefinedStylePaneNoBorder.class) {
+                    @Override
+                    public boolean acceptDefaultNameObject(Object ob) {
+                        return ((PredefinedCellStyle) ob).isDefaultStyle();
+                    }
+                },
+                new CellStyleNameObjectCreator(Toolkit.i18nText("Fine-Design_Predefined_Cell_New_Style"),
+                        PredefinedCellStyle.class, CustomPredefinedStylePane.class)};
+    }
+
+    @Override
+    protected String title4PopupWindow() {
+        return StringUtils.EMPTY;
+    }
+
+    protected void initComponentPane() {
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        this.setCreators(this.createNameableCreators());
+        initCardPane();
+        JPanel leftPane = getLeftPane();
+        JSeparator jSeparator = new JSeparator(SwingConstants.VERTICAL);
+        leftPane.setPreferredSize(new Dimension(70, 0));
+        jSeparator.setPreferredSize(new Dimension(2, 0));
+        cardPane.setPreferredSize(new Dimension(238, 0));
+        cardPane.setBorder(BorderFactory.createEmptyBorder(5, 0, 0, 0));
+        JPanel mainSplitPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        mainSplitPane.add(leftPane, BorderLayout.WEST);
+        mainSplitPane.add(jSeparator, BorderLayout.CENTER);
+        mainSplitPane.add(cardPane, BorderLayout.EAST);
+
+        this.add(mainSplitPane, BorderLayout.CENTER);
+        this.checkButtonEnabled();
+    }
+
+    protected ShortCut4JControlPane[] createShortcuts() {
+        return new ShortCut4JControlPane[]{
+                createAddItemShortCut4JControlPane(),
+                new RemoveItemShortCut4JControlPane(new RemoveItemAction())
+        };
+    }
+
+
+    private static class CustomPredefinedStylePaneNoBorder extends CustomPredefinedStylePane {
+        @Override
+        protected List<BasicPane> initPaneList() {
+            paneList = new ArrayList<BasicPane>();
+            paneList.add(new FormatPane());
+            paneList.add(new AlignmentPane());
+            return paneList;
+        }
+
+    }
+
+
+    private ShortCut4JControlPane createAddItemShortCut4JControlPane (){
+        ShortCut shortCut =  shortCutFactory.createAddItemUpdateAction(new NameableCreator[]{
+                new CellStyleNameObjectCreator(Toolkit.i18nText("Fine-Design_Predefined_Cell_New_Style"),
+                        PredefinedCellStyle.class, CustomPredefinedStylePane.class)});
+        return new AddItemShortCut4JControlPane(shortCut);
+    }
+
+    private class AddItemShortCut4JControlPane extends ShortCut4JControlPane{
+        AddItemShortCut4JControlPane(ShortCut shortCut) {
+            this.shortCut = shortCut;
+        }
+
+
+        @Override
+        public void checkEnable() {
+            this.shortCut.setEnabled(true);
+        }
+    }
+
+
+    private class RemoveItemShortCut4JControlPane extends ShortCut4JControlPane {
+        RemoveItemShortCut4JControlPane(ShortCut shortCut) {
+            this.shortCut = shortCut;
+        }
+
+        @Override
+        public void checkEnable() {
+            ListModelElement selectModel = CellStyleListControlPane.this.getSelectedValue();
+            if (selectModel != null) {
+                NameObject selectNameObject = (NameObject) selectModel.wrapper;
+                PredefinedCellStyle cellStyle = (PredefinedCellStyle) (selectNameObject.getObject());
+                this.shortCut.setEnabled(!cellStyle.isBuiltIn() && !cellStyle.isDefaultStyle());
+            } else {
+                this.shortCut.setEnabled(false);
+            }
+
+        }
+    }
+
+
+    private class RemoveItemAction extends UpdateAction {
+        RemoveItemAction() {
+            this.setName(com.fr.design.i18n.Toolkit.i18nText(("Fine-Design_Basic_Action_Remove")));
+            this.setMnemonic('R');
+            this.setSmallIcon(BaseUtils
+                    .readIcon("/com/fr/base/images/cell/control/remove.png"));
+        }
+
+        @Override
+        public void actionPerformed(ActionEvent evt) {
+            CellStyleListControlPane.this.onRemoveItem();
+        }
+    }
+
+
+    class CellStyleNameObjectCreator extends NameObjectCreator {
+        public CellStyleNameObjectCreator(String menuName, Class clazz, Class<? extends BasicBeanPane> updatePane) {
+            super(menuName, clazz, updatePane);
+        }
+
+        public Nameable createNameable(UnrepeatedNameHelper helper) {
+            Constructor<? extends PredefinedCellStyle> constructor = null;
+            try {
+                constructor = clazzOfInitCase.getConstructor();
+                PredefinedCellStyle cellStyle = constructor.newInstance();
+
+                cellStyle.setName(menuName);
+                cellStyle.setStyle(Style.getInstance());
+                return new NameObject(helper.createUnrepeatedName(this.menuName()), cellStyle);
+
+            } catch (NoSuchMethodException e) {
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
+            } catch (IllegalAccessException e) {
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
+            } catch (InstantiationException e) {
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
+            } catch (InvocationTargetException e) {
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
+            }
+            return null;
+        }
+        /**
+         *
+         * @param ob
+         * @return
+         */
+        public Object acceptObject2Populate(Object ob) {
+            if (ob instanceof NameObject) {
+                ob = ((NameObject) ob).getObject();
+            }
+            if (clazzOfObject != null && clazzOfObject.isInstance(ob) && acceptDefaultNameObject(ob)) {
+                doSthChanged4Icon(ob);
+                return ob;
+            }
+            return null;
+        }
+
+        public boolean acceptDefaultNameObject(Object ob) {
+            return !((PredefinedCellStyle) ob).isDefaultStyle();
+        }
+    }
+
+
+    /**
+     * Populate
+     */
+    public void populateBean(PredefinedCellStyleConfig ob) {
+        if (ob == null) {
+            return;
+        }
+
+        List nameStyleList = new ArrayList();
+
+        Iterator styleNameIterator = ob.getStyleNameIterator();
+        while (styleNameIterator.hasNext()) {
+            String name = (String) styleNameIterator.next();
+            PredefinedCellStyle tmpStyle = ob.getStyle(name);
+
+            if (tmpStyle != null) {
+                nameStyleList.add(new NameObject(name, tmpStyle));
+            }
+        }
+
+        NameObject[] nameObjects = new NameObject[nameStyleList.size()];
+        nameStyleList.toArray(nameObjects);
+
+        populate(nameObjects);
+    }
+
+
+    public PredefinedCellStyleConfig updateBean() {
+        Nameable[] nameables = this.update();
+        PredefinedCellStyleConfig styleConfig = new PredefinedCellStyleConfig();
+        for (int i = 0; i < nameables.length; i++) {
+            PredefinedCellStyle tmpStyle = (PredefinedCellStyle) ((NameObject) nameables[i]).getObject();
+            tmpStyle.setName(nameables[i].getName());
+            styleConfig.addStyle(tmpStyle);
+        }
+        return styleConfig;
+    }
+
+
+}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/ChartStyleSettingPane.java

@@ -0,0 +1,94 @@
+package com.fr.design.mainframe.predefined.ui.detail;
+
+import com.fr.config.predefined.PredefinedChartStyle;
+import com.fr.design.dialog.BasicPane;
+import com.fr.design.dialog.MultiTabPane;
+import com.fr.design.mainframe.predefined.ui.detail.chart.ChartAxisStylePane;
+import com.fr.design.mainframe.predefined.ui.detail.chart.ChartBackgroundStylePane;
+import com.fr.design.mainframe.predefined.ui.detail.chart.ChartDataSheetStylePane;
+import com.fr.design.mainframe.predefined.ui.detail.chart.ChartLabelStylePane;
+import com.fr.design.mainframe.predefined.ui.detail.chart.ChartLegendStylePane;
+import com.fr.design.mainframe.predefined.ui.detail.chart.ChartTitleStylePane;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Bjorn
+ * @version 10.0
+ * Created by Bjorn on 2020-09-16
+ */
+public class ChartStyleSettingPane extends MultiTabPane<PredefinedChartStyle> {
+
+    private ChartTitleStylePane chartTitleStylePane;
+    private ChartLegendStylePane chartLegendStylePane;
+    private ChartLabelStylePane chartLabelPane;
+    private ChartAxisStylePane chartAxisStylePane;
+    private ChartDataSheetStylePane chartDataSheetStylePane;
+    private ChartBackgroundStylePane chartBackgroundStylePane;
+
+    public ChartStyleSettingPane() {
+    }
+
+    @Override
+    protected void initLayout() {
+        super.initLayout();
+    }
+
+    @Override
+    protected List<BasicPane> initPaneList() {
+        this.chartTitleStylePane = new ChartTitleStylePane();
+        this.chartLegendStylePane = new ChartLegendStylePane();
+        this.chartLabelPane = new ChartLabelStylePane();
+        this.chartAxisStylePane = new ChartAxisStylePane();
+        this.chartDataSheetStylePane = new ChartDataSheetStylePane();
+        this.chartBackgroundStylePane = new ChartBackgroundStylePane();
+        paneList = new ArrayList<>();
+        paneList.add(this.chartTitleStylePane);
+        paneList.add(this.chartLegendStylePane);
+        paneList.add(this.chartLabelPane);
+        paneList.add(this.chartAxisStylePane);
+        paneList.add(this.chartDataSheetStylePane);
+        paneList.add(this.chartBackgroundStylePane);
+        return paneList;
+    }
+
+    @Override
+    public void populateBean(PredefinedChartStyle ob) {
+        chartTitleStylePane.populate(ob);
+        chartLegendStylePane.populate(ob);
+        chartLabelPane.populate(ob);
+        chartAxisStylePane.populate(ob);
+        chartDataSheetStylePane.populate(ob);
+        chartBackgroundStylePane.populate(ob);
+    }
+
+    @Override
+    public void updateBean(PredefinedChartStyle ob) {
+
+    }
+
+
+    @Override
+    public PredefinedChartStyle updateBean() {
+        PredefinedChartStyle chartStyle = new PredefinedChartStyle();
+        chartTitleStylePane.update(chartStyle);
+        chartLegendStylePane.update(chartStyle);
+        chartLabelPane.update(chartStyle);
+        chartAxisStylePane.update(chartStyle);
+        chartDataSheetStylePane.update(chartStyle);
+        chartBackgroundStylePane.update(chartStyle);
+        return chartStyle;
+    }
+
+
+    @Override
+    public boolean accept(Object ob) {
+        return false;
+    }
+
+    @Override
+    public void reset() {
+
+    }
+}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/ColorFillStylePane.java

@@ -0,0 +1,292 @@
+package com.fr.design.mainframe.predefined.ui.detail;
+
+import com.fr.base.ChartColorMatching;
+import com.fr.base.ChartPreStyleConfig;
+import com.fr.base.Utils;
+import com.fr.chart.base.ChartConstants;
+import com.fr.config.predefined.ColorFillStyle;
+import com.fr.config.predefined.PredefinedColorStyle;
+import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.constants.LayoutConstants;
+import com.fr.design.event.UIObserverListener;
+import com.fr.design.gui.icombobox.ColorSchemeComboBox;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.layout.TableLayout;
+import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.style.background.gradient.FixedGradientBar;
+import com.fr.design.style.color.ColorAdjustPane;
+import com.fr.stable.StringUtils;
+
+import javax.swing.JPanel;
+import java.util.Arrays;
+import java.util.List;
+import java.awt.BorderLayout;
+import java.awt.CardLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+/**
+ * @author Bjorn
+ * @version 10.0
+ * Created by Bjorn on 2020-09-15
+ */
+public class ColorFillStylePane extends BasicBeanPane<ColorFillStyle> {
+
+    private ColorSchemeComboBox styleSelectBox;
+    private JPanel customPane;
+    private JPanel changeColorSetPane;
+    private FixedGradientBar colorGradient;
+
+    private CardLayout cardLayout;
+
+    private ColorAdjustPane colorAdjustPane;
+
+    private Color[] gradientColors;
+    private Color[] accColors;
+
+    private boolean gradientSelect = false;
+
+    public ColorFillStylePane() {
+        this.setLayout(new BorderLayout());
+
+        styleSelectBox = createColorSchemeComboBox();
+        customPane = new JPanel(FRGUIPaneFactory.createBorderLayout()) {
+            @Override
+            public Dimension getPreferredSize() {
+                if (!customPane.isVisible()) {
+                    return new Dimension(0, 0);
+                }
+                if (!gradientSelect) {
+                    return colorAdjustPane.getPreferredSize();
+                }
+                return colorGradient.getPreferredSize();
+            }
+        };
+
+        changeColorSetPane = new JPanel(cardLayout = new CardLayout());
+        changeColorSetPane.add(colorGradient = new FixedGradientBar(4, 130), "gradient");
+        gradientColors = new Color[]{Color.WHITE, FixedGradientBar.NEW_CHARACTER};
+        changeColorSetPane.add(colorAdjustPane = new ColorAdjustPane(), "acc");
+        accColors = ColorAdjustPane.DEFAULT_COLORS;
+        cardLayout.show(changeColorSetPane, "acc");
+        customPane.add(changeColorSetPane, BorderLayout.CENTER);
+        initListener();
+        initLayout();
+
+    }
+
+    public ColorSchemeComboBox getStyleSelectBox() {
+        return styleSelectBox;
+    }
+
+    public JPanel getCustomPane() {
+        return customPane;
+    }
+
+    protected ColorSchemeComboBox createColorSchemeComboBox() {
+        return new ColorSchemeComboBox();
+    }
+
+    private void initListener() {
+        colorAdjustPane.registerChangeListener(new UIObserverListener() {
+            @Override
+            public void doChange() {
+                accColors = colorAdjustPane.getColors();
+                if (styleSelectBox.getSelectType() != ColorSchemeComboBox.SelectType.COMBINATION_COLOR) {
+                    styleSelectBox.setSelectType(ColorSchemeComboBox.SelectType.COMBINATION_COLOR);
+                }
+                ColorFillStylePane.this.revalidate();
+            }
+        });
+        colorGradient.registerChangeListener(new UIObserverListener() {
+            @Override
+            public void doChange() {
+                gradientColors[0] = colorGradient.getSelectColorPointBtnP1().getColorInner();
+                gradientColors[1] = colorGradient.getSelectColorPointBtnP2().getColorInner();
+                if (styleSelectBox.getSelectType() != ColorSchemeComboBox.SelectType.GRADATION_COLOR) {
+                    styleSelectBox.setSelectType(ColorSchemeComboBox.SelectType.GRADATION_COLOR);
+                }
+            }
+        });
+        styleSelectBox.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                styleSelectBoxChange();
+            }
+        });
+    }
+
+    protected void styleSelectBoxChange() {
+        switch (styleSelectBox.getSelectType()) {
+            case COMBINATION_COLOR:
+                colorAdjustPane.updateColor(accColors);
+                cardLayout.show(changeColorSetPane, "acc");
+                gradientSelect = false;
+                break;
+            case GRADATION_COLOR:
+                colorGradient.updateColor(gradientColors[0], gradientColors[1]);
+                cardLayout.show(changeColorSetPane, "gradient");
+                gradientSelect = true;
+                break;
+            default:
+                ColorSchemeComboBox.ColorInfo selectColorInfo = styleSelectBox.getSelectColorInfo();
+                if (selectColorInfo == null) {
+                    return;
+                }
+                if (selectColorInfo.isGradient()) {
+                    colorGradient.updateColor(selectColorInfo.getColors().get(0), selectColorInfo.getColors().get(1));
+                    cardLayout.show(changeColorSetPane, "gradient");
+                    gradientSelect = true;
+                } else {
+                    colorAdjustPane.updateColor(selectColorInfo.getColors().toArray(new Color[]{}));
+                    cardLayout.show(changeColorSetPane, "acc");
+                    gradientSelect = false;
+                }
+                break;
+        }
+        ColorFillStylePane.this.revalidate();
+    }
+
+    protected void initLayout() {
+        this.setLayout(new BorderLayout());
+        this.add(getContentPane(), BorderLayout.CENTER);
+    }
+
+    protected JPanel getContentPane() {
+        double p = TableLayout.PREFERRED;
+        double f = TableLayout.FILL;
+        double e = 155;
+        double[] columnSize = {f, e};
+        double[] rowSize = {p, p, p};
+
+        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(contentPaneComponents(), rowSize, columnSize, 12, LayoutConstants.VGAP_LARGE);
+        return panel;
+    }
+
+    protected Component[][] contentPaneComponents() {
+        return new Component[][]{
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Template_Color")), styleSelectBox},
+                new Component[]{null, customPane},
+
+        };
+    }
+
+    @Override
+    protected String title4PopupWindow() {
+        return Toolkit.i18nText("Fine-Design_Chart_Color");
+    }
+
+    public void populateBean(PredefinedColorStyle predefinedColorStyle) {
+        populateBean(predefinedColorStyle.getColorFillStyle());
+    }
+
+    @Override
+    public void populateBean(ColorFillStyle colorFillStyle) {
+        String fillStyleName = colorFillStyle == null ? "" : colorFillStyle.getFillStyleName();
+        if (StringUtils.isBlank(fillStyleName) || !styleSelectBox.getItems().contains(fillStyleName)) {
+            if (colorFillStyle == null || colorFillStyle.getColorStyle() == ChartConstants.COLOR_DEFAULT) {
+                styleSelectBox.setSelectType(ColorSchemeComboBox.SelectType.DEFAULT);//默认
+            } else {
+                int colorStyle = colorFillStyle.getColorStyle();
+                if (colorStyle == ChartConstants.COLOR_GRADIENT) {
+                    gradientColors[0] = colorFillStyle.getColorList().get(0);
+                    gradientColors[1] = colorFillStyle.getColorList().get(1);
+                    styleSelectBox.setSelectType(ColorSchemeComboBox.SelectType.GRADATION_COLOR);
+                } else {
+                    int colorSize = colorFillStyle.getColorList().size();
+                    accColors = new Color[colorSize];
+                    for (int i = 0; i < colorSize; i++) {
+                        accColors[i] = colorFillStyle.getColorList().get(i);
+                    }
+                    styleSelectBox.setSelectType(ColorSchemeComboBox.SelectType.COMBINATION_COLOR);
+                }
+            }
+        } else {
+            styleSelectBox.setSelectedItem(fillStyleName);
+        }
+    }
+
+    public PredefinedColorStyle update() {
+        PredefinedColorStyle predefinedColorStyle = new PredefinedColorStyle();
+        predefinedColorStyle.setColorFillStyle(updateBean());
+        return predefinedColorStyle;
+    }
+
+    @Override
+    public ColorFillStyle updateBean() {
+        switch (styleSelectBox.getSelectType()) {
+            case COMBINATION_COLOR:
+                return updateCombinationColor();
+            case GRADATION_COLOR:
+                return updateGradationColor();
+            case DEFAULT:
+                return updateDefaultColor();
+            default:
+                return updateNormalColor();
+        }
+    }
+
+    private ColorFillStyle updateCombinationColor() {
+        ColorFillStyle colorFillStyle = new ColorFillStyle();
+        List<Color> colorList = colorFillStyle.getColorList();
+        colorFillStyle.setColorStyle(ChartConstants.COLOR_ACC);
+        for (int i = 0, length = accColors.length; i < length; i++) {
+            colorList.add(accColors[i]);
+        }
+        colorFillStyle.setCustomFillStyle(true);
+        return colorFillStyle;
+    }
+
+    private ColorFillStyle updateGradationColor() {
+        ColorFillStyle colorFillStyle = new ColorFillStyle();
+        List<Color> colorList = colorFillStyle.getColorList();
+        colorFillStyle.setColorStyle(ChartConstants.COLOR_GRADIENT);
+        Color start = gradientColors[0];
+        Color end = gradientColors[1];
+        colorList.add(start);
+        colorList.add(end);
+        colorFillStyle.setCustomFillStyle(true);
+        return colorFillStyle;
+    }
+
+    private ColorFillStyle updateDefaultColor() {
+        ColorFillStyle colorFillStyle = new ColorFillStyle();
+        colorFillStyle.setColorStyle(ChartConstants.COLOR_DEFAULT);
+        return colorFillStyle;
+    }
+
+    private ColorFillStyle updateNormalColor() {
+        ChartPreStyleConfig manager = ChartPreStyleConfig.getInstance();
+        Object preStyle = manager.getPreStyle(styleSelectBox.getSelectedItem());
+        if (preStyle instanceof ChartColorMatching) {
+            ColorFillStyle colorFillStyle = new ColorFillStyle();
+            ChartColorMatching chartColorMatching = (ChartColorMatching) preStyle;
+            colorFillStyle.setColorStyle(chartColorMatching.getGradient() ? ChartConstants.COLOR_GRADIENT : ChartConstants.COLOR_ACC);
+            List<Color> colorList = chartColorMatching.getColorList();
+            if (colorList == null || colorList.size() == 0) {
+                colorList = Arrays.asList(ChartConstants.CHART_COLOR_ARRAY);
+            }
+            colorFillStyle.setColorList(colorList);
+            colorFillStyle.setFillStyleName(Utils.objectToString(styleSelectBox.getSelectedItem()));
+            return colorFillStyle;
+        } else {
+            return updateModifyColor();
+        }
+    }
+
+    private ColorFillStyle updateModifyColor() {
+        ColorFillStyle colorFillStyle = new ColorFillStyle();
+        ColorSchemeComboBox.ColorInfo selectColorInfo = styleSelectBox.getSelectColorInfo();
+        boolean isGradient = selectColorInfo.isGradient();
+        List<Color> colors = selectColorInfo.getColors();
+        colorFillStyle.setColorList(colors);
+        colorFillStyle.setCustomFillStyle(true);
+        colorFillStyle.setColorStyle(isGradient ? ChartConstants.COLOR_GRADIENT : ChartConstants.COLOR_ACC);
+        return colorFillStyle;
+    }
+}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/ComponentStyleSettingPane.java

@@ -0,0 +1,63 @@
+package com.fr.design.mainframe.predefined.ui.detail;
+
+import com.fr.config.predefined.PredefinedComponentStyle;
+import com.fr.design.dialog.BasicPane;
+import com.fr.design.dialog.MultiTabPane;
+import com.fr.design.mainframe.predefined.ui.detail.component.ComponentFrameStylePane;
+import com.fr.design.mainframe.predefined.ui.detail.component.ComponentTitleStylePane;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by kerry on 2020-09-01
+ */
+public class ComponentStyleSettingPane extends MultiTabPane<PredefinedComponentStyle> {
+    private ComponentFrameStylePane frameStylePane;
+    private ComponentTitleStylePane titleStylePane;
+
+    public ComponentStyleSettingPane() {
+    }
+
+
+    @Override
+    protected List<BasicPane> initPaneList() {
+        this.frameStylePane = new ComponentFrameStylePane();
+        this.titleStylePane = ComponentTitleStylePane.createPredefinedSettingPane();
+        paneList = new ArrayList<BasicPane>();
+        paneList.add(this.frameStylePane);
+        paneList.add(this.titleStylePane);
+        return paneList;
+    }
+
+    @Override
+    public void populateBean(PredefinedComponentStyle ob) {
+        this.frameStylePane.populate(ob);
+        this.titleStylePane.populate(ob);
+    }
+
+    @Override
+    public void updateBean(PredefinedComponentStyle ob) {
+
+    }
+
+
+    @Override
+    public PredefinedComponentStyle updateBean() {
+        PredefinedComponentStyle componentStyle = new PredefinedComponentStyle();
+        this.frameStylePane.update(componentStyle);
+        this.titleStylePane.update(componentStyle);
+        return componentStyle;
+    }
+
+
+    @Override
+    public boolean accept(Object ob) {
+        return false;
+    }
+
+    @Override
+    public void reset() {
+
+    }
+}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/PredefinedBackgroundSettingPane.java

@@ -0,0 +1,81 @@
+package com.fr.design.mainframe.predefined.ui.detail;
+
+import com.fr.config.predefined.PredefinedBackground;
+import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.gui.ibutton.UIButtonGroup;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.mainframe.predefined.ui.detail.background.BackgroundSettingPane;
+import com.fr.design.mainframe.predefined.ui.detail.background.BackgroundWithAlphaSettingPane;
+
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.CardLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+/**
+ * Created by kerry on 2020-08-31
+ */
+public class PredefinedBackgroundSettingPane extends BasicBeanPane<PredefinedBackground> {
+    private UIButtonGroup buttonGroup;
+    private BackgroundSettingPane reportBackgroundSettingPane;
+    private BackgroundWithAlphaSettingPane formBackgroundSettingPane;
+
+
+    public PredefinedBackgroundSettingPane() {
+        initPane();
+    }
+
+    private void initPane() {
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        reportBackgroundSettingPane = new BackgroundSettingPane();
+        formBackgroundSettingPane = new BackgroundWithAlphaSettingPane();
+        CardLayout tabbedPane = new CardLayout();
+        JPanel center = new JPanel(tabbedPane);
+        center.add(reportBackgroundSettingPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plain_Report"));
+        center.add(formBackgroundSettingPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Decision_Report"));
+        this.buttonGroup = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plain_Report"),
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Decision_Report")});
+        buttonGroup.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                if (buttonGroup.getSelectedIndex() == 0) {
+                    tabbedPane.show(center, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plain_Report"));
+                } else {
+                    tabbedPane.show(center, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Decision_Report"));
+                }
+            }
+        });
+
+
+        this.add(buttonGroup, BorderLayout.NORTH);
+
+        this.add(center, BorderLayout.CENTER);
+        this.buttonGroup.setSelectedIndex(0);
+    }
+
+    public boolean currentFormBackground() {
+        return buttonGroup.getSelectedIndex() == 1;
+    }
+
+    @Override
+    public void populateBean(PredefinedBackground predefinedBackground) {
+        reportBackgroundSettingPane.populateBean(predefinedBackground.getReportBackground());
+        formBackgroundSettingPane.populateBean(predefinedBackground.getFormBackground());
+    }
+
+    @Override
+    public PredefinedBackground updateBean() {
+        PredefinedBackground predefinedBackground = new PredefinedBackground();
+        predefinedBackground.setReportBackground(reportBackgroundSettingPane.updateBean());
+        predefinedBackground.setFormBackground(formBackgroundSettingPane.updateBean());
+        return predefinedBackground;
+    }
+
+    @Override
+    protected String title4PopupWindow() {
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Predefined_Background_Setting");
+    }
+
+
+}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/background/AbstractBackgroundDetailPane.java

@@ -0,0 +1,51 @@
+package com.fr.design.mainframe.predefined.ui.detail.background;
+
+import com.fr.design.event.UIObserverListener;
+import com.fr.design.mainframe.backgroundpane.BackgroundQuickPane;
+import com.fr.general.Background;
+
+import javax.swing.event.ChangeListener;
+
+/**
+ * Created by kerry on 2020-09-14
+ */
+public abstract class AbstractBackgroundDetailPane<T extends Background> extends BackgroundQuickPane {
+    @Override
+    public boolean accept(Background background) {
+        return false;
+    }
+
+    @Override
+    public void populateBean(Background background) {
+        this.populate((T) background);
+    }
+
+    @Override
+    public Background updateBean() {
+        return this.update();
+    }
+
+    @Override
+    public String title4PopupWindow() {
+        return null;
+    }
+
+    @Override
+    public void reset() {
+
+    }
+
+    @Override
+    public void registerChangeListener(UIObserverListener listener) {
+
+    }
+
+    public abstract void populate(T background);
+
+    public abstract T update();
+
+    public void addChangeListener(ChangeListener changeListener) {
+
+    }
+
+}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/background/BackgroundSettingPane.java

@@ -0,0 +1,135 @@
+package com.fr.design.mainframe.predefined.ui.detail.background;
+
+import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.event.UIObserverListener;
+import com.fr.design.gui.icombobox.UIComboBox;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.mainframe.backgroundpane.BackgroundQuickPane;
+import com.fr.general.Background;
+import com.fr.log.FineLoggerFactory;
+
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
+import javax.swing.event.ChangeListener;
+import java.awt.BorderLayout;
+import java.awt.CardLayout;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.util.ArrayList;
+
+/**
+ * Created by kerry on 2020-09-02
+ */
+public class BackgroundSettingPane extends BasicBeanPane<Background> {
+    private ChangeListener changeListener = null;
+    private UIComboBox headCombobox;
+    private BackgroundQuickPane[] paneList;
+
+    public BackgroundSettingPane() {
+        init();
+    }
+
+    private void init() {
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        this.add(createComboHeadPane(), BorderLayout.NORTH);
+        CardLayout cardlayout = new CardLayout();
+        paneList = supportKindsOfBackgroundUI();
+        final JPanel centerPane = new JPanel(cardlayout) {
+            @Override
+            public Dimension getPreferredSize() {// AUGUST:使用当前面板的的高度
+                int index = headCombobox.getSelectedIndex();
+                return new Dimension(super.getPreferredSize().width, paneList[index].getPreferredSize().height);
+            }
+        };
+        centerPane.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 0));
+        for (BackgroundQuickPane pane : paneList) {
+            headCombobox.addItem(pane.title4PopupWindow());
+            centerPane.add(pane, pane.title4PopupWindow());
+        }
+        headCombobox.addItemListener(new ItemListener() {
+            @Override
+            public void itemStateChanged(ItemEvent e) {
+                cardlayout.show(centerPane, (String) headCombobox.getSelectedItem());
+            }
+        });
+        this.add(centerPane, BorderLayout.CENTER);
+    }
+
+    public void addChangeListener(ChangeListener changeListener) {
+        this.changeListener = changeListener;
+    }
+
+
+    private JPanel createComboHeadPane() {
+        headCombobox = new UIComboBox();
+
+        JPanel jPanel = TableLayoutHelper.createGapTableLayoutPane(
+                new Component[][]{new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Fill")), headCombobox}},
+                TableLayoutHelper.FILL_NONE, 33, 5);
+        headCombobox.setPreferredSize(new Dimension(160, 20));
+        jPanel.setBorder(BorderFactory.createEmptyBorder(5, 10, 5, 10));
+        return jPanel;
+    }
+
+    protected BackgroundQuickPane[] supportKindsOfBackgroundUI() {
+        java.util.List<BackgroundQuickPane> kinds = new ArrayList<>();
+        kinds.add(new EmptyBackgroundPane());
+        kinds.add(new ColorDetailPane());
+        kinds.add(new TextureDetailObservePane());
+        kinds.add(new PatternDetailPane());
+        kinds.add(createImageSelectPane());
+        kinds.add(new GradientDetailPane());
+        return kinds.toArray(new BackgroundQuickPane[kinds.size()]);
+    }
+
+    protected ImageDetailPane createImageSelectPane() {
+        ImageDetailPane imageDetailPane = new ImageDetailPane();
+        imageDetailPane.registerChangeListener(new UIObserverListener() {
+            @Override
+            public void doChange() {
+                fireChangeListener();
+            }
+        });
+        return imageDetailPane;
+    }
+
+    protected void fireChangeListener() {
+        if (changeListener != null) {
+            changeListener.stateChanged(null);
+        }
+    }
+
+
+    @Override
+    public void populateBean(Background background) {
+        for (int i = 0; i < paneList.length; i++) {
+            BackgroundQuickPane pane = paneList[i];
+            if (pane.accept(background)) {
+                pane.populateBean(background);
+                headCombobox.setSelectedIndex(i);
+                return;
+            }
+        }
+    }
+
+    @Override
+    public Background updateBean() {
+        int selectIndex = this.headCombobox.getSelectedIndex();
+        try {
+            return paneList[selectIndex].updateBean();
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+        }
+        return null;
+    }
+
+    @Override
+    protected String title4PopupWindow() {
+        return null;
+    }
+
+}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/background/BackgroundWithAlphaSettingPane.java

@@ -0,0 +1,76 @@
+package com.fr.design.mainframe.predefined.ui.detail.background;
+
+import com.fr.config.predefined.BackgroundWithAlpha;
+import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.designer.IntervalConstants;
+import com.fr.design.gui.frpane.UINumberDragPane;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.layout.TableLayoutHelper;
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
+import javax.swing.event.ChangeListener;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Dimension;
+
+/**
+ * Created by kerry on 2020-09-04
+ */
+public class BackgroundWithAlphaSettingPane extends BasicBeanPane<BackgroundWithAlpha> {
+    private BackgroundSettingPane backgroundSettingPane;
+    //透明度
+    private UINumberDragPane numberDragPane;
+
+    private double maxNumber = 100;
+
+
+    public BackgroundWithAlphaSettingPane() {
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        backgroundSettingPane = new FormBackgroundSettingPane();
+
+        JPanel eastpane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(2, 0);
+        this.numberDragPane = new UINumberDragPane(0, 100);
+        this.numberDragPane.setPreferredSize(new Dimension(148, 20));
+        eastpane.add(numberDragPane);
+        eastpane.add(new UILabel("%"));
+        JPanel transparencyPane = TableLayoutHelper.createGapTableLayoutPane(
+                new Component[][]{new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget-Style_Alpha")),
+                        eastpane}}, TableLayoutHelper.FILL_LASTCOLUMN, 18, 5);
+        transparencyPane.setBorder(BorderFactory.createEmptyBorder(5, 10, 5, 10));
+
+
+        Component[][] components = new Component[][]{
+                new Component[]{backgroundSettingPane},
+                new Component[]{transparencyPane}};
+
+        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, TableLayoutHelper.FILL_NONE, IntervalConstants.INTERVAL_W2, IntervalConstants.INTERVAL_L1);
+        this.add(panel, BorderLayout.CENTER);
+    }
+
+
+    public void addChangeListener(ChangeListener changeListener) {
+        this.backgroundSettingPane.addChangeListener(changeListener);
+    }
+
+
+    @Override
+    public void populateBean(BackgroundWithAlpha ob) {
+        backgroundSettingPane.populateBean(ob.getBackground());
+        numberDragPane.populateBean(ob.getAlpha() * maxNumber);
+    }
+
+    @Override
+    public BackgroundWithAlpha updateBean() {
+        BackgroundWithAlpha backgroundWithAlpha = new BackgroundWithAlpha();
+        backgroundWithAlpha.setBackground(backgroundSettingPane.updateBean());
+        backgroundWithAlpha.setAlpha((float) (numberDragPane.updateBean() / maxNumber));
+        return backgroundWithAlpha;
+    }
+
+    @Override
+    protected String title4PopupWindow() {
+        return null;
+    }
+
+}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/background/ColorDetailPane.java

@@ -0,0 +1,103 @@
+package com.fr.design.mainframe.predefined.ui.detail.background;
+
+import com.fr.base.background.ColorBackground;
+import com.fr.design.event.UIObserver;
+import com.fr.design.event.UIObserverListener;
+import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.style.color.ColorSelectPane;
+import com.fr.general.Background;
+
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Dimension;
+
+/**
+ * Created by kerry on 2020-08-31
+ */
+public class ColorDetailPane extends AbstractBackgroundDetailPane<ColorBackground> {
+    private ColorBackgroundSelectPane selectPane;
+
+
+    public ColorDetailPane() {
+        this.selectPane = new ColorBackgroundSelectPane();
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        this.add(this.selectPane, BorderLayout.CENTER);
+    }
+
+    @Override
+    public void populate(ColorBackground background) {
+        this.selectPane.setColor(background.getColor());
+    }
+
+    @Override
+    public ColorBackground update() {
+        return ColorBackground.getInstance(selectPane.getColor());
+    }
+
+    public String title4PopupWindow() {
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Color");
+    }
+
+    @Override
+    public boolean accept(Background background) {
+        return background instanceof ColorBackground;
+    }
+
+    class ColorBackgroundSelectPane extends ColorSelectPane implements UIObserver {
+        protected UIObserverListener uiObserverListener;
+
+        protected void initialCompents(boolean isSupportTransparent) {
+            this.setLayout(FRGUIPaneFactory.createBorderLayout());
+            this.setBorder(BorderFactory.createEmptyBorder());
+            if (isSupportTransparent) {
+                this.add(createNorthPane(), BorderLayout.NORTH);
+            }
+            JPanel centerPane = createCenterPane();
+            this.add(centerPane, BorderLayout.CENTER);
+            this.addChangeListener(new ChangeListener() {
+                @Override
+                public void stateChanged(ChangeEvent e) {
+                    if (uiObserverListener != null) {
+                        uiObserverListener.doChange();
+                    }
+                }
+            });
+        }
+
+        private JPanel createNorthPane() {
+            UIButton transpanrentBtn = createTranspanrentButton();
+            transpanrentBtn.setPreferredSize(new Dimension(160, 20));
+            JPanel jPanel = TableLayoutHelper.createGapTableLayoutPane(
+                    new Component[][]{new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Color")),
+                            transpanrentBtn}}, TableLayoutHelper.FILL_NONE, 33, 5);
+            jPanel.setBorder(BorderFactory.createEmptyBorder(5, 0, 5, 10));
+            return jPanel;
+        }
+
+        protected JPanel createCenterPane() {
+            JPanel centerPane = super.createCenterPane();
+
+            JPanel jPanel = TableLayoutHelper.createGapTableLayoutPane(
+                    new Component[][]{new Component[]{new UILabel("    "), centerPane}}, TableLayoutHelper.FILL_NONE, 33, 5);
+            jPanel.setBorder(BorderFactory.createEmptyBorder(5, 0, 5, 10));
+            return jPanel;
+        }
+
+        @Override
+        public void registerChangeListener(UIObserverListener listener) {
+            this.uiObserverListener = listener;
+        }
+
+        @Override
+        public boolean shouldResponseChangeListener() {
+            return true;
+        }
+    }
+}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/background/EmptyBackgroundPane.java

@@ -0,0 +1,34 @@
+package com.fr.design.mainframe.predefined.ui.detail.background;
+
+import com.fr.general.Background;
+
+/**
+ * Created by kerry on 2020-09-01
+ */
+public class EmptyBackgroundPane extends AbstractBackgroundDetailPane {
+
+    @Override
+    public void populate(Background background) {
+
+    }
+
+    @Override
+    public Background update() {
+        return null;
+    }
+
+    /**
+     * 名称
+     *
+     * @return 名称
+     */
+    public String title4PopupWindow() {
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Null");
+    }
+
+    public boolean accept(Background background) {
+        return background == null;
+    }
+
+
+}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/background/FormBackgroundSettingPane.java

@@ -0,0 +1,48 @@
+package com.fr.design.mainframe.predefined.ui.detail.background;
+
+import com.fr.design.ExtraDesignClassManager;
+import com.fr.design.event.UIObserverListener;
+import com.fr.design.fun.BackgroundQuickUIProvider;
+import com.fr.design.mainframe.backgroundpane.BackgroundQuickPane;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Created by kerry on 2020-09-14
+ */
+public class FormBackgroundSettingPane extends BackgroundSettingPane {
+
+    public FormBackgroundSettingPane() {
+        super();
+    }
+
+    @Override
+    protected BackgroundQuickPane[] supportKindsOfBackgroundUI() {
+        ColorDetailPane colorDetailPane = new ColorDetailPane();
+        ImageDetailPane imageDetailPane = createImageSelectPane();
+        GradientDetailPane gradientPane = new GradientDetailPane();
+        //hugh:表单支持背景接口
+        List<BackgroundQuickPane> kinds = new ArrayList<BackgroundQuickPane>();
+
+        kinds.add(new EmptyBackgroundPane());
+        kinds.add(colorDetailPane);
+        kinds.add(imageDetailPane);
+        kinds.add(gradientPane);
+
+        Set<BackgroundQuickUIProvider> providers = ExtraDesignClassManager.getInstance().getArray(BackgroundQuickUIProvider.MARK_STRING);
+        for (BackgroundQuickUIProvider provider : providers) {
+            BackgroundQuickPane newTypePane = provider.appearanceForBackground();
+            newTypePane.registerChangeListener(new UIObserverListener() {
+                @Override
+                public void doChange() {
+                    fireChangeListener();
+                }
+            });
+            kinds.add(newTypePane);
+        }
+
+        return kinds.toArray(new BackgroundQuickPane[kinds.size()]);
+    }
+}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/background/GradientDetailPane.java

@@ -0,0 +1,159 @@
+package com.fr.design.mainframe.predefined.ui.detail.background;
+
+import com.fr.base.background.GradientBackground;
+import com.fr.design.designer.IntervalConstants;
+import com.fr.design.event.UIObserver;
+import com.fr.design.event.UIObserverListener;
+import com.fr.design.gui.ibutton.UIRadioButton;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.style.background.gradient.GradientBar;
+import com.fr.general.Background;
+
+import javax.swing.ButtonGroup;
+import javax.swing.JPanel;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.GridLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+/**
+ * 渐变色的面板，不是很pp，面板应用显得繁琐，有写可以写成控件类型，比如色彩选择的。。，可以做得花哨点
+ *
+ * @author ben
+ */
+public class GradientDetailPane extends AbstractBackgroundDetailPane<GradientBackground> implements UIObserver {
+    private static final long serialVersionUID = -6854603990673031897L;
+    private UIObserverListener listener;
+    private UIRadioButton left2right, top2bottom;
+    private GradientBar gradientBar;
+    private ChangeListener changeListener = null;
+
+    public GradientDetailPane() {
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
+
+        JPanel gradientPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        JPanel blankJp = new JPanel();
+        gradientBar = new GradientBar(4, 140);
+        blankJp.add(gradientBar);
+
+        gradientPanel.add(gradientBar, BorderLayout.SOUTH);
+
+        JPanel jp = new JPanel(new GridLayout(2, 1, 15, 10));
+
+
+        left2right = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Page_Setup_Horizontal"));
+        jp.add(left2right);
+        left2right.setSelected(true);
+        left2right.addActionListener(reviewListener);
+
+        top2bottom = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Page_Setup_Vertical"));
+        jp.add(top2bottom);
+        top2bottom.addActionListener(reviewListener);
+
+        ButtonGroup toggle = new ButtonGroup();
+        toggle.add(left2right);
+        toggle.add(top2bottom);
+
+        Component[][] components = new Component[][]{
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Gradient_Setting")), gradientPanel},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Gradient_Color")), jp}
+        };
+        JPanel contentPane = TableLayoutHelper.createGapTableLayoutPane(components, TableLayoutHelper.FILL_LASTCOLUMN,
+                IntervalConstants.INTERVAL_W4, IntervalConstants.INTERVAL_L1);
+        this.addChangeListener(new ChangeListener() {
+            @Override
+            public void stateChanged(ChangeEvent e) {
+                if (listener != null) {
+                    listener.doChange();
+                }
+            }
+        });
+
+
+        this.add(contentPane);
+    }
+
+    @Override
+    public boolean accept(Background background) {
+        return background instanceof GradientBackground;
+    }
+
+
+
+    public void populate(GradientBackground bg) {
+        this.gradientBar.getSelectColorPointBtnP1().setColorInner(bg.getStartColor());
+        this.gradientBar.getSelectColorPointBtnP2().setColorInner(bg.getEndColor());
+        if (bg.getDirection() == GradientBackground.LEFT2RIGHT) {
+            left2right.setSelected(true);
+        } else {
+            top2bottom.setSelected(true);
+        }
+        if (bg.isUseCell()) {
+            return;
+        }
+        double startValue = (double) bg.getBeginPlace();
+        double endValue = (double) bg.getFinishPlace();
+        gradientBar.setStartValue(startValue);
+        gradientBar.setEndValue(endValue);
+        this.gradientBar.repaint();
+    }
+
+    public GradientBackground update() {
+        GradientBackground gb = new GradientBackground(
+                gradientBar.getSelectColorPointBtnP1().getColorInner(),
+                gradientBar.getSelectColorPointBtnP2().getColorInner());
+        if (left2right.isSelected()) {
+            gb.setDirection(GradientBackground.LEFT2RIGHT);
+        } else {
+            gb.setDirection(GradientBackground.TOP2BOTTOM);
+        }
+        if (gradientBar.isOriginalPlace()) {
+            gb.setUseCell(true);
+        } else {
+            gb.setUseCell(false);
+            gb.setBeginPlace((float) gradientBar.getStartValue());
+            gb.setFinishPlace((float) gradientBar.getEndValue());
+        }
+        return gb;
+    }
+
+
+    ActionListener reviewListener = new ActionListener() {
+        public void actionPerformed(ActionEvent e) {
+            fireChagneListener();
+        }
+    };
+
+    public void addChangeListener(ChangeListener changeListener) {
+        this.changeListener = changeListener;
+        gradientBar.addChangeListener(changeListener);
+    }
+
+    public void fireChagneListener() {
+        if (this.changeListener != null) {
+            ChangeEvent evt = new ChangeEvent(this);
+            this.changeListener.stateChanged(evt);
+        }
+    }
+
+    @Override
+    public void registerChangeListener(UIObserverListener listener) {
+        this.listener = listener;
+    }
+
+    @Override
+    public boolean shouldResponseChangeListener() {
+        return true;
+    }
+
+    @Override
+    public String title4PopupWindow() {
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Gradient_Color");
+    }
+
+}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/background/ImageDetailPane.java

@@ -0,0 +1,215 @@
+package com.fr.design.mainframe.predefined.ui.detail.background;
+
+import com.fr.base.Style;
+import com.fr.base.background.ImageBackground;
+import com.fr.base.background.ImageFileBackground;
+import com.fr.design.designer.IntervalConstants;
+import com.fr.design.event.UIObserver;
+import com.fr.design.event.UIObserverListener;
+import com.fr.design.gui.frpane.ImgChooseWrapper;
+import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.gui.ibutton.UIRadioButton;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.style.background.image.ImageFileChooser;
+import com.fr.design.style.background.image.ImagePreviewPane;
+import com.fr.general.Background;
+import com.fr.stable.Constants;
+
+import javax.swing.BorderFactory;
+import javax.swing.ButtonGroup;
+import javax.swing.JPanel;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.GridLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+/**
+ * Image background pane.
+ */
+public class ImageDetailPane extends AbstractBackgroundDetailPane<ImageBackground> implements UIObserver {
+    private UIObserverListener listener;
+    protected ImagePreviewPane previewPane = null;
+    private Style imageStyle = null;
+    private ChangeListener changeListener = null;
+    private ImageFileChooser imageFileChooser = null;
+
+    private UIRadioButton defaultRadioButton = null;
+    private UIRadioButton tiledRadioButton = null;
+    private UIRadioButton extendRadioButton = null;
+    private UIRadioButton adjustRadioButton = null;
+
+
+    public ImageDetailPane() {
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        this.add(initSelectFilePane(), BorderLayout.CENTER);
+        imageFileChooser = new ImageFileChooser();
+        imageFileChooser.setMultiSelectionEnabled(false);
+        previewPane = new ImagePreviewPane();
+        this.addChangeListener(new ChangeListener() {
+            @Override
+            public void stateChanged(ChangeEvent e) {
+                if (listener != null) {
+                    listener.doChange();
+                }
+            }
+        });
+    }
+
+    public JPanel initSelectFilePane() {
+        JPanel selectFilePane = FRGUIPaneFactory.createBorderLayout_L_Pane();
+        selectFilePane.setBorder(BorderFactory.createEmptyBorder());
+        UIButton selectPictureButton = new UIButton(
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Image_Select"));
+        selectPictureButton.setMnemonic('S');
+        selectPictureButton.addActionListener(selectPictureActionListener);
+        selectPictureButton.setPreferredSize(new Dimension(160, 20));
+        //布局
+        defaultRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Layout_Default"));
+        tiledRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Layout_Image_Titled"));
+        extendRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Layout_Image_Extend"));
+        adjustRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Layout_Image_Adjust"));
+
+        defaultRadioButton.addActionListener(layoutActionListener);
+        tiledRadioButton.addActionListener(layoutActionListener);
+        extendRadioButton.addActionListener(layoutActionListener);
+        adjustRadioButton.addActionListener(layoutActionListener);
+
+        JPanel jp = new JPanel(new GridLayout(4, 1, 15, 10));
+        for (UIRadioButton button : imageLayoutButtons()) {
+            jp.add(button);
+        }
+
+        ButtonGroup layoutBG = new ButtonGroup();
+        layoutBG.add(defaultRadioButton);
+        layoutBG.add(tiledRadioButton);
+        layoutBG.add(extendRadioButton);
+        layoutBG.add(adjustRadioButton);
+
+        defaultRadioButton.setSelected(true);
+
+        Component[][] components = new Component[][]{
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Image")), selectPictureButton},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Fill_Mode")), jp}
+        };
+        JPanel centerPane = TableLayoutHelper.createGapTableLayoutPane(components, TableLayoutHelper.FILL_NONE,
+                IntervalConstants.INTERVAL_W4, IntervalConstants.INTERVAL_L1);
+        selectFilePane.add(centerPane, BorderLayout.CENTER);
+        return selectFilePane;
+    }
+
+    protected UIRadioButton[] imageLayoutButtons() {
+        return new UIRadioButton[]{
+                defaultRadioButton,
+                tiledRadioButton,
+                extendRadioButton,
+                adjustRadioButton
+        };
+    }
+
+    @Override
+    public boolean accept(Background background) {
+        return background instanceof ImageBackground;
+    }
+
+
+    /**
+     * Select picture.
+     */
+    ActionListener selectPictureActionListener = new ActionListener() {
+
+        public void actionPerformed(ActionEvent evt) {
+            int returnVal = imageFileChooser.showOpenDialog(ImageDetailPane.this);
+            setImageStyle();
+            ImgChooseWrapper.getInstance(previewPane, imageFileChooser, imageStyle, changeListener).dealWithImageFile(returnVal);
+        }
+    };
+
+    protected void setImageStyle() {
+        if (tiledRadioButton.isSelected()) {
+            imageStyle = Style.DEFAULT_STYLE.deriveImageLayout(Constants.IMAGE_TILED);
+        } else if (adjustRadioButton.isSelected()) {
+            imageStyle = Style.DEFAULT_STYLE.deriveImageLayout(Constants.IMAGE_ADJUST);
+        } else if (extendRadioButton.isSelected()) {
+            imageStyle = Style.DEFAULT_STYLE.deriveImageLayout(Constants.IMAGE_EXTEND);
+        } else {
+            imageStyle = Style.DEFAULT_STYLE.deriveImageLayout(Constants.IMAGE_CENTER);
+        }
+    }
+
+    ActionListener layoutActionListener = new ActionListener() {
+
+        @Override
+        public void actionPerformed(ActionEvent evt) {
+            setImageStyle();
+            changeImageStyle();
+        }
+
+        private void changeImageStyle() {
+            previewPane.setImageStyle(ImageDetailPane.this.imageStyle);
+            previewPane.repaint();
+        }
+    };
+
+    @Override
+    public void populate(ImageBackground imageBackground) {
+        if (imageBackground.getLayout() == Constants.IMAGE_CENTER) {
+            defaultRadioButton.setSelected(true);
+            imageStyle = Style.DEFAULT_STYLE.deriveImageLayout(Constants.IMAGE_CENTER);
+        } else if (imageBackground.getLayout() == Constants.IMAGE_EXTEND) {
+            extendRadioButton.setSelected(true);
+            imageStyle = Style.DEFAULT_STYLE.deriveImageLayout(Constants.IMAGE_EXTEND);
+        } else if (imageBackground.getLayout() == Constants.IMAGE_ADJUST) {
+            adjustRadioButton.setSelected(true);
+            imageStyle = Style.DEFAULT_STYLE.deriveImageLayout(Constants.IMAGE_ADJUST);
+        } else {
+            tiledRadioButton.setSelected(true);
+            imageStyle = Style.DEFAULT_STYLE.deriveImageLayout(Constants.IMAGE_TILED);
+        }
+        previewPane.setImageStyle(ImageDetailPane.this.imageStyle);
+        if (imageBackground.getImage() != null) {
+            previewPane.setImageWithSuffix(imageBackground.getImageWithSuffix());
+            previewPane.setImage(imageBackground.getImage());
+        }
+
+        fireChagneListener();
+    }
+
+    @Override
+    public ImageBackground update() {
+        ImageBackground imageBackground = new ImageFileBackground(previewPane.getImageWithSuffix());
+        setImageStyle();
+        imageBackground.setLayout(imageStyle.getImageLayout());
+        return imageBackground;
+    }
+
+    @Override
+    public void addChangeListener(ChangeListener changeListener) {
+        this.changeListener = changeListener;
+    }
+
+    private void fireChagneListener() {
+        if (this.changeListener != null) {
+            ChangeEvent evt = new ChangeEvent(this);
+            this.changeListener.stateChanged(evt);
+        }
+    }
+
+    @Override
+    public void registerChangeListener(UIObserverListener listener) {
+        this.listener = listener;
+    }
+
+
+    @Override
+    public String title4PopupWindow() {
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Image");
+    }
+
+
+}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/background/PatternDetailPane.java

@@ -0,0 +1,119 @@
+package com.fr.design.mainframe.predefined.ui.detail.background;
+
+import com.fr.base.background.PatternBackground;
+import com.fr.design.designer.IntervalConstants;
+import com.fr.design.event.UIObserver;
+import com.fr.design.event.UIObserverListener;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.style.background.impl.PatternBackgroundPane;
+import com.fr.design.style.color.ColorSelectBox;
+import com.fr.general.Background;
+import com.fr.log.FineLoggerFactory;
+
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
+import javax.swing.SwingConstants;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.GridLayout;
+import java.awt.LayoutManager;
+
+/**
+ * Created by kerry on 2020-08-31
+ */
+public class PatternDetailPane extends AbstractBackgroundDetailPane<PatternBackground> implements UIObserver {
+
+    private UIObserverListener listener;
+    private PatternNewBackgroundPane patternNewBackgroundPane;
+
+    public PatternDetailPane() {
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        patternNewBackgroundPane = new PatternNewBackgroundPane(6);
+        this.add(patternNewBackgroundPane, BorderLayout.CENTER);
+    }
+
+    @Override
+    public void registerChangeListener(UIObserverListener listener) {
+        this.listener = listener;
+    }
+
+    @Override
+    public void populate(PatternBackground background) {
+        this.patternNewBackgroundPane.populate(background);
+    }
+
+    @Override
+    public PatternBackground update() {
+        try {
+            return (PatternBackground) this.patternNewBackgroundPane.update();
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+        }
+        return null;
+    }
+    @Override
+    public String title4PopupWindow() {
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Pattern");
+    }
+
+
+    @Override
+    public boolean accept(Background background) {
+        return background instanceof PatternBackground;
+    }
+
+
+    @Override
+    public boolean shouldResponseChangeListener() {
+        return true;
+    }
+
+    class PatternNewBackgroundPane extends PatternBackgroundPane {
+        private PatternNewBackgroundPane(int nColumn) {
+            super(nColumn);
+        }
+
+        protected LayoutManager layoutOfTypePane(int nColumn) {
+            return new GridLayout(0, nColumn, 2, 2);
+        }
+
+        protected void initComponents(int nColumn) {
+            this.setLayout(FRGUIPaneFactory.createBorderLayout());
+            this.setBorder(BorderFactory.createEmptyBorder());
+            JPanel jPanel = new JPanel();
+            jPanel.setLayout(layoutOfTypePane(nColumn));
+            setChildrenOfTypePane(jPanel);
+
+            foregroundColorPane = new ColorSelectBox(80);
+            backgroundColorPane = new ColorSelectBox(80);
+            foregroundColorPane.setSelectObject(Color.lightGray);
+            backgroundColorPane.setSelectObject(Color.black);
+            UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Pattern"));
+            label.setVerticalAlignment(SwingConstants.TOP);
+            Component[][] components = new Component[][]{
+                    new Component[]{label, jPanel},
+                    new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_ForeBackground_Color")), foregroundColorPane},
+                    new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Pattern_Color")), backgroundColorPane}
+            };
+            JPanel centerPane = TableLayoutHelper.createGapTableLayoutPane(components, TableLayoutHelper.FILL_LASTCOLUMN,
+                    IntervalConstants.INTERVAL_W4, IntervalConstants.INTERVAL_L1);
+            JPanel jPanel1 = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane();
+            jPanel1.add(centerPane);
+            jPanel1.setBorder(BorderFactory.createEmptyBorder());
+            this.add(jPanel1, BorderLayout.NORTH);
+            this.addChangeListener(new ChangeListener() {
+                @Override
+                public void stateChanged(ChangeEvent e) {
+                    if (listener != null) {
+                        listener.doChange();
+                    }
+                }
+            });
+        }
+    }
+}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/background/TextureDetailObservePane.java

@@ -0,0 +1,97 @@
+package com.fr.design.mainframe.predefined.ui.detail.background;
+
+import com.fr.base.background.TextureBackground;
+import com.fr.design.event.UIObserver;
+import com.fr.design.event.UIObserverListener;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.style.background.texture.TextureDetailPane;
+import com.fr.general.Background;
+import com.fr.log.FineLoggerFactory;
+
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
+import javax.swing.SwingConstants;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Dimension;
+
+/**
+ * Created by kerry on 2020-09-02
+ */
+public class TextureDetailObservePane extends AbstractBackgroundDetailPane<TextureBackground> implements UIObserver {
+    private TextureDetailPane detailPane;
+
+    private UIObserverListener listener;
+
+    public TextureDetailObservePane() {
+
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        detailPane = TextureDetailPane.createMiniTextureDetailPane(6);
+
+        detailPane.setPreferredSize(new Dimension(160, 108));
+        UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture"));
+        label.setPreferredSize(new Dimension(24, 108));
+        label.setVerticalAlignment(SwingConstants.TOP);
+        JPanel jPanel = TableLayoutHelper.createGapTableLayoutPane(
+                new Component[][]{new Component[]{label, detailPane}}, TableLayoutHelper.FILL_LASTCOLUMN, 33, 5);
+        jPanel.setBorder(BorderFactory.createEmptyBorder(5, 0, 5, 10));
+
+
+        detailPane.addChangeListener(new ChangeListener() {
+            @Override
+            public void stateChanged(ChangeEvent e) {
+                if (listener != null) {
+                    listener.doChange();
+                }
+            }
+        });
+        this.add(jPanel, BorderLayout.CENTER);
+    }
+
+    @Override
+    public void registerChangeListener(UIObserverListener listener) {
+        this.listener = listener;
+
+    }
+
+    @Override
+    public boolean shouldResponseChangeListener() {
+        return true;
+    }
+
+    @Override
+    public void populate(TextureBackground background) {
+        this.detailPane.populate(background);
+    }
+
+    @Override
+    public TextureBackground update() {
+        try {
+            return (TextureBackground) this.detailPane.update();
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+        }
+        return null;
+    }
+
+
+    @Override
+    public String title4PopupWindow() {
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture");
+    }
+
+    @Override
+    public boolean accept(Background background) {
+        return background instanceof TextureBackground;
+    }
+
+
+    @Override
+    public void addChangeListener(ChangeListener changeListener) {
+
+    }
+}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/cell/CustomPredefinedStylePane.java

@@ -0,0 +1,211 @@
+package com.fr.design.mainframe.predefined.ui.detail.cell;
+
+import com.fr.base.ScreenResolution;
+import com.fr.base.Style;
+import com.fr.config.predefined.PredefinedCellStyle;
+import com.fr.design.constants.UIConstants;
+import com.fr.design.dialog.AttrScrollPane;
+import com.fr.design.dialog.BasicPane;
+import com.fr.design.dialog.BasicScrollPane;
+import com.fr.design.dialog.MultiTabPane;
+import com.fr.design.gui.frpane.AbstractAttrNoScrollPane;
+import com.fr.design.gui.frpane.AttributeChangeListener;
+import com.fr.design.gui.style.AbstractBasicStylePane;
+import com.fr.design.gui.style.AlignmentPane;
+import com.fr.design.gui.style.BorderPane;
+import com.fr.design.gui.style.FormatPane;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.utils.gui.GUICoreUtils;
+
+import javax.swing.BorderFactory;
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.GridLayout;
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * 哎，复杂的原型图导致复杂的画法。非我所愿也
+ *
+ * @author zhou
+ * @since 2012-5-24上午10:36:10
+ */
+public class CustomPredefinedStylePane extends MultiTabPane<PredefinedCellStyle> {
+    private PredefinedCellStyle cellStyle;
+    private PreviewArea previewArea;
+    private boolean populating;
+
+
+    public CustomPredefinedStylePane() {
+        super();
+        tabPane.setOneLineTab(true);
+        tabPane.setDrawLine(false);
+        tabPane.setBorder(BorderFactory.createLineBorder(UIConstants.SHADOW_GREY));
+        tabPane.setLayout(new GridLayout(1, 3, 0, 0));
+    }
+
+    /**
+     * @return
+     */
+    public String title4PopupWindow() {
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Custom_Style");
+    }
+
+
+    /**
+     *
+     */
+    public void reset() {
+        populateBean(null);
+    }
+
+    @Override
+    /**
+     *
+     */
+    public void populateBean(PredefinedCellStyle ob) {
+        this.populating = true;
+        this.cellStyle = ob;
+        for (int i = 0; i < paneList.size(); i++) {
+            ((AbstractBasicStylePane) paneList.get(i)).populateBean(ob.getStyle());
+            previewArea.preview(ob.getStyle());
+        }
+        this.populating = false;
+    }
+
+    @Override
+    /**
+     *
+     */
+    public PredefinedCellStyle updateBean() {
+        AbstractBasicStylePane basicStylePane = (AbstractBasicStylePane) paneList.get(tabPane.getSelectedIndex());
+        this.cellStyle.setStyle(basicStylePane.update(this.cellStyle.getStyle()));
+        return this.cellStyle;
+    }
+
+
+    /**
+     * @param ob
+     * @return
+     */
+    public boolean accept(Object ob) {
+        return ob instanceof PredefinedCellStyle;
+    }
+
+    @Override
+    protected List<BasicPane> initPaneList() {
+        paneList = new ArrayList<BasicPane>();
+        paneList.add(new FormatPane());
+        paneList.add(new BorderPane());
+        paneList.add(new AlignmentPane());
+        return paneList;
+    }
+
+    protected void initLayout() {
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
+
+        JPanel jPanel = new JPanel();
+        jPanel.setLayout(new BorderLayout(0, 4));
+
+        JPanel previewPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        previewArea = new PreviewArea();
+        previewPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview"), null));
+        previewPane.add(previewArea, BorderLayout.CENTER);
+
+        this.add(previewPane, BorderLayout.NORTH);
+
+        this.add(jPanel, BorderLayout.CENTER);
+        jPanel.add(tabPane, BorderLayout.NORTH);
+        JPanel attrListenerPane = new AbstractAttrNoScrollPane() {
+
+            @Override
+            protected void initContentPane() {
+                leftContentPane = createContentPane();
+                this.add(leftContentPane, BorderLayout.CENTER);
+            }
+
+            @Override
+            protected JPanel createContentPane() {
+                this.addAttributeChangeListener(new AttributeChangeListener() {
+                    @Override
+                    public void attributeChange() {
+                        if (populating) {
+                            return;
+                        }
+                        PredefinedCellStyle cellStyle = updateBean();
+                        if (cellStyle != null) {
+                            previewArea.preview(cellStyle.getStyle());
+                        }
+                    }
+                });
+                BasicScrollPane basicScrollPane = new AttrScrollPane() {
+                    @Override
+                    protected JPanel createContentPane() {
+                        return centerPane;
+                    }
+                };
+                return basicScrollPane;
+            }
+        };
+        jPanel.add(attrListenerPane, BorderLayout.CENTER);
+    }
+
+    @Override
+    /**
+     *
+     */
+    public void updateBean(PredefinedCellStyle ob) {
+        return;
+    }
+
+
+
+
+    /**
+     * 预览Style的面板
+     *
+     * @author richer
+     */
+    private static class PreviewArea extends JComponent {
+
+        private String paintText = "Report";
+        private Style style = Style.DEFAULT_STYLE;
+
+        public PreviewArea() {
+            setPreferredSize(new Dimension(40, 30));
+        }
+
+        public void preview(Style style) {
+            this.style = style;
+            repaint();
+        }
+
+        @Override
+        public void paintComponent(Graphics g) {
+            Graphics2D g2d = (Graphics2D) g;
+            int resolution = ScreenResolution.getScreenResolution();
+
+            if (style == Style.DEFAULT_STYLE) {
+                // 如果是默认的style,就只写"Report"上去
+                Style.paintContent(g2d, paintText, style, getWidth() - 3, getHeight() - 3, resolution);
+                return;
+            }
+
+            Style.paintBackground(g2d, style, getWidth() - 3, getHeight() - 3);
+
+            Style.paintContent(g2d, paintText, style, getWidth() - 3, getHeight() - 3, resolution);
+
+            Style.paintBorder(g2d, style, getWidth() - 3, getHeight() - 3);
+        }
+
+        @Override
+        public Dimension getMinimumSize() {
+            return getPreferredSize();
+        }
+    }
+}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/chart/AbstractChartStylePane.java

@@ -0,0 +1,49 @@
+package com.fr.design.mainframe.predefined.ui.detail.chart;
+
+import com.fr.config.predefined.PredefinedChartStyle;
+import com.fr.design.constants.LayoutConstants;
+import com.fr.design.dialog.BasicPane;
+import com.fr.design.gui.icontainer.UIScrollPane;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.layout.TableLayout;
+import com.fr.design.layout.TableLayoutHelper;
+
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.Component;
+
+/**
+ * @author Bjorn
+ * @version 10.0
+ * Created by Bjorn on 2020-09-17
+ */
+public abstract class AbstractChartStylePane extends BasicPane {
+
+    public AbstractChartStylePane() {
+        initComponents();
+        initPane();
+    }
+
+    protected abstract void initComponents();
+
+    protected void initPane() {
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        double e = 155;
+        double p = TableLayout.PREFERRED;
+        double[] columnSize = {p, e};
+        JPanel gapTableLayoutPane = TableLayoutHelper.createGapTableLayoutPane(getComponent(), getRows(p), columnSize, 20, LayoutConstants.VGAP_LARGE);
+        gapTableLayoutPane.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 0));
+        UIScrollPane rightTopPane = new UIScrollPane(gapTableLayoutPane);
+        rightTopPane.setBorder(BorderFactory.createEmptyBorder());
+        this.add(rightTopPane, BorderLayout.CENTER);
+    }
+
+    protected abstract Component[][] getComponent();
+
+    protected abstract double[] getRows(double p);
+
+    public abstract void populate(PredefinedChartStyle chartStyle);
+
+    public abstract void update(PredefinedChartStyle chartStyle);
+}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/chart/ChartAxisStylePane.java

@@ -0,0 +1,69 @@
+package com.fr.design.mainframe.predefined.ui.detail.chart;
+
+import com.fr.config.predefined.PredefinedChartStyle;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.style.color.ColorSelectBox;
+
+import java.awt.Component;
+
+/**
+ * @author Bjorn
+ * @version 10.0
+ * Created by Bjorn on 2020-09-16
+ */
+public class ChartAxisStylePane extends AbstractChartStylePane {
+
+    //轴标题字体样式
+    private ChartFontPane titleFontPane;
+
+    //轴标签字体样式
+    private ChartFontPane labelFontPane;
+
+    //轴线颜色
+    private ColorSelectBox axisLineColor;
+
+    protected void initComponents() {
+        titleFontPane = new ChartFontPane() {
+            public String getUILabelText() {
+                return Toolkit.i18nText("Fine-Design_Chart_Axis_Title_Character");
+            }
+        };
+        labelFontPane = new ChartFontPane() {
+            public String getUILabelText() {
+                return Toolkit.i18nText("Fine-Design_Chart_Axis_Label_Character");
+            }
+        };
+        axisLineColor = new ColorSelectBox(100);
+    }
+
+    protected Component[][] getComponent() {
+        return new Component[][]{
+                new Component[]{titleFontPane, null},
+                new Component[]{labelFontPane, null},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Axis_Line_Color")), axisLineColor}
+        };
+    }
+
+    protected double[] getRows(double p) {
+        return new double[]{p, p, p};
+    }
+
+    @Override
+    protected String title4PopupWindow() {
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis");
+    }
+
+    public void populate(PredefinedChartStyle chartStyle) {
+        titleFontPane.populate(chartStyle.getAxisTitleFont());
+        labelFontPane.populate(chartStyle.getAxisLabelFont());
+        axisLineColor.setSelectObject(chartStyle.getAxisLineColor());
+    }
+
+
+    public void update(PredefinedChartStyle chartStyle) {
+        chartStyle.setAxisTitleFont(titleFontPane.update());
+        chartStyle.setAxisLabelFont(labelFontPane.update());
+        chartStyle.setAxisLineColor(axisLineColor.getSelectObject());
+    }
+}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/chart/ChartBackgroundStylePane.java

@@ -0,0 +1,113 @@
+package com.fr.design.mainframe.predefined.ui.detail.chart;
+
+import com.fr.base.background.ImageBackground;
+import com.fr.config.predefined.PredefinedChartStyle;
+import com.fr.design.gui.icombobox.UIComboBox;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.mainframe.backgroundpane.BackgroundQuickPane;
+import com.fr.design.mainframe.backgroundpane.ColorBackgroundQuickPane;
+import com.fr.design.mainframe.backgroundpane.ImageBackgroundQuickPane;
+import com.fr.design.mainframe.backgroundpane.NullBackgroundQuickPane;
+import com.fr.design.mainframe.backgroundpane.VanChartGradientPane;
+import com.fr.design.style.color.ColorSelectBox;
+import com.fr.general.Background;
+import com.fr.stable.Constants;
+
+import javax.swing.JPanel;
+import java.util.ArrayList;
+import java.util.List;
+import java.awt.CardLayout;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+
+/**
+ * @author Bjorn
+ * @version 10.0
+ * Created by Bjorn on 2020-09-17
+ */
+public class ChartBackgroundStylePane extends AbstractChartStylePane {
+
+    private UIComboBox typeComboBox;
+    private List<BackgroundQuickPane> paneList;
+    private JPanel centerPane;
+    //网格线颜色
+    private ColorSelectBox mainGridColor;
+
+    protected void initComponents() {
+        mainGridColor = new ColorSelectBox(100);
+
+        typeComboBox = new UIComboBox();
+        final CardLayout cardlayout = new CardLayout();
+        initList();
+
+        centerPane = new JPanel(cardlayout) {
+            @Override
+            public Dimension getPreferredSize() {// AUGUST:使用当前面板的的高度
+                int index = typeComboBox.getSelectedIndex();
+                return new Dimension(super.getPreferredSize().width, paneList.get(index).getPreferredSize().height);
+            }
+        };
+        for (int i = 0; i < paneList.size(); i++) {
+            BackgroundQuickPane pane = paneList.get(i);
+            typeComboBox.addItem(pane.title4PopupWindow());
+            centerPane.add(pane, pane.title4PopupWindow());
+        }
+
+        typeComboBox.addItemListener(new ItemListener() {
+            @Override
+            public void itemStateChanged(ItemEvent e) {
+                cardlayout.show(centerPane, (String) typeComboBox.getSelectedItem());
+            }
+        });
+    }
+
+    protected Component[][] getComponent() {
+        return new Component[][]{
+                new Component[]{null, null},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Area_Background_Color")), typeComboBox},
+                new Component[]{null, centerPane},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Grid_Line_Color")), mainGridColor}
+        };
+    }
+
+    protected double[] getRows(double p) {
+        return new double[]{p, p, p, p};
+    }
+
+    private void initList() {
+        paneList = new ArrayList<>();
+        paneList.add(new NullBackgroundQuickPane());
+        paneList.add(new ColorBackgroundQuickPane());
+        paneList.add(new ImageBackgroundQuickPane(false));
+        paneList.add(new VanChartGradientPane());
+    }
+
+    @Override
+    protected String title4PopupWindow() {
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Background");
+    }
+
+    public void populate(PredefinedChartStyle chartStyle) {
+        Background background = chartStyle.getChartBackground();
+        for (int i = 0; i < paneList.size(); i++) {
+            BackgroundQuickPane pane = paneList.get(i);
+            if (pane.accept(background)) {
+                pane.populateBean(background);
+                typeComboBox.setSelectedIndex(i);
+                break;
+            }
+        }
+        mainGridColor.setSelectObject(chartStyle.getGridMainLineColor());
+    }
+
+    public void update(PredefinedChartStyle chartStyle) {
+        chartStyle.setChartBackground(paneList.get(typeComboBox.getSelectedIndex()).updateBean());
+        if (chartStyle.getChartBackground() instanceof ImageBackground) {
+            ((ImageBackground) chartStyle.getChartBackground()).setLayout(Constants.IMAGE_EXTEND);
+        }
+        chartStyle.setGridMainLineColor(mainGridColor.getSelectObject());
+    }
+}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/chart/ChartDataSheetStylePane.java

@@ -0,0 +1,58 @@
+package com.fr.design.mainframe.predefined.ui.detail.chart;
+
+import com.fr.config.predefined.PredefinedChartStyle;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.style.color.ColorSelectBox;
+
+import java.awt.Component;
+
+/**
+ * @author Bjorn
+ * @version 10.0
+ * Created by Bjorn on 2020-09-17
+ */
+public class ChartDataSheetStylePane extends AbstractChartStylePane {
+
+    //字体样式
+    private ChartFontPane fontPane;
+
+    //边框颜色
+    private ColorSelectBox borderColor;
+
+    protected void initComponents() {
+        fontPane = new ChartFontPane() {
+            public String getUILabelText() {
+                return Toolkit.i18nText("Fine-Design_Chart_DataSheet_Character");
+            }
+        };
+        borderColor = new ColorSelectBox(100);
+    }
+
+    protected Component[][] getComponent() {
+        return new Component[][]{
+                new Component[]{fontPane, null},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Border_Color")), borderColor}
+        };
+    }
+
+    protected double[] getRows(double p) {
+        return new double[]{p, p, p};
+    }
+
+    @Override
+    protected String title4PopupWindow() {
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Sheet");
+    }
+
+    public void populate(PredefinedChartStyle chartStyle) {
+        fontPane.populate(chartStyle.getDataSheetFont());
+        borderColor.setSelectObject(chartStyle.getDataSheetBorderColor());
+    }
+
+
+    public void update(PredefinedChartStyle chartStyle) {
+        chartStyle.setDataSheetFont(fontPane.update());
+        chartStyle.setDataSheetBorderColor(borderColor.getSelectObject());
+    }
+}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/chart/ChartFontPane.java

@@ -0,0 +1,160 @@
+package com.fr.design.mainframe.predefined.ui.detail.chart;
+
+import com.fr.base.BaseUtils;
+import com.fr.base.FRContext;
+import com.fr.base.Utils;
+import com.fr.design.constants.LayoutConstants;
+import com.fr.design.dialog.BasicPane;
+import com.fr.design.event.UIObserverListener;
+import com.fr.design.gui.ibutton.UIColorButton;
+import com.fr.design.gui.ibutton.UIToggleButton;
+import com.fr.design.gui.icombobox.UIComboBox;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.TableLayout;
+import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.general.FRFont;
+import com.fr.general.GeneralUtils;
+
+import javax.swing.JPanel;
+import javax.swing.SwingConstants;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.FlowLayout;
+import java.awt.Font;
+
+/**
+ * @author Bjorn
+ * @version 10.0
+ * Created by Bjorn on 2020-09-16
+ */
+public class ChartFontPane extends BasicPane {
+
+    public static final int FONT_START = 6;
+    public static final int FONT_END = 72;
+    private UIComboBox fontNameComboBox;
+    private UIComboBox fontSizeComboBox;
+    private UIToggleButton bold;
+    private UIToggleButton italic;
+    private UIColorButton fontColor;
+    private static Integer[] FONT_SIZES = new Integer[FONT_END - FONT_START + 1];
+
+    static {
+        for (int i = FONT_START; i <= FONT_END; i++) {
+            FONT_SIZES[i - FONT_START] = i;
+        }
+    }
+
+    public ChartFontPane() {
+        initState();
+        initComponents();
+    }
+
+    private void initState() {
+        fontNameComboBox = new UIComboBox(Utils.getAvailableFontFamilyNames4Report());
+        fontSizeComboBox = new UIComboBox(FONT_SIZES);
+        bold = new UIToggleButton(BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/bold.png"));
+        italic = new UIToggleButton(BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/italic.png"));
+        fontColor = new UIColorButton();
+    }
+
+    protected void initComponents() {
+        Component[] components = new Component[]{
+                fontColor, italic, bold
+        };
+        JPanel buttonPane = new JPanel(new BorderLayout());
+        buttonPane.add(fontSizeComboBox, BorderLayout.CENTER);
+        buttonPane.add(GUICoreUtils.createFlowPane(components, FlowLayout.LEFT, LayoutConstants.HGAP_LARGE), BorderLayout.EAST);
+
+        this.setLayout(new BorderLayout());
+        this.add(getContentPane(buttonPane), BorderLayout.CENTER);
+
+        populate(FRContext.getDefaultValues().getFRFont());
+    }
+
+    protected JPanel getContentPane(JPanel buttonPane) {
+        double e = 155;
+        double p = TableLayout.PREFERRED;
+        double[] rows = {p, p, p};
+        double[] columnSize = {p, e};
+        UILabel text = new UILabel(getUILabelText(), SwingConstants.LEFT);
+        Component[][] components = {
+                new Component[]{null, null},
+                new Component[]{text, fontNameComboBox},
+                new Component[]{null, buttonPane}
+        };
+
+        return TableLayoutHelper.createGapTableLayoutPane(components, rows, columnSize, 20, LayoutConstants.VGAP_LARGE);
+    }
+
+    public String getUILabelText() {
+        return Toolkit.i18nText("Fine-Design_Chart_Character");
+    }
+
+    public String title4PopupWindow() {
+        return null;
+    }
+
+    public void populate(FRFont frFont) {
+        UIObserverListener listener = fontNameComboBox == null ? null : fontNameComboBox.getUiObserverListener();
+        removeAllComboBoxListener();
+
+        if (frFont != null) {
+            fontNameComboBox.setSelectedItem(frFont.getFamily());
+            bold.setSelected(frFont.isBold());
+            italic.setSelected(frFont.isItalic());
+            populateFontSize(frFont);
+            if (fontColor != null) {
+                fontColor.setColor(frFont.getForeground());
+            }
+        }
+
+        //更新结束后，注册监听器
+        registerAllComboBoxListener(listener);
+    }
+
+    private void populateFontSize(FRFont frFont) {
+        if (fontSizeComboBox != null) {
+            fontSizeComboBox.setSelectedItem(frFont.getSize());
+        }
+    }
+
+    private void removeAllComboBoxListener() {
+        fontNameComboBox.removeChangeListener();
+        fontSizeComboBox.removeChangeListener();
+    }
+
+    private void registerAllComboBoxListener(UIObserverListener listener) {
+        fontNameComboBox.registerChangeListener(listener);
+        fontSizeComboBox.registerChangeListener(listener);
+    }
+
+    /**
+     * 更新字
+     *
+     * @return 更新字
+     */
+    public FRFont update() {
+        String name = GeneralUtils.objectToString(fontNameComboBox.getSelectedItem());
+
+        return FRFont.getInstance(name, updateFontStyle(), updateFontSize(), fontColor.getColor());
+    }
+
+    private int updateFontStyle() {
+        int style = Font.PLAIN;
+        if (bold.isSelected() && !italic.isSelected()) {
+            style = Font.BOLD;
+        } else if (!bold.isSelected() && italic.isSelected()) {
+            style = Font.ITALIC;
+        } else if (bold.isSelected() && italic.isSelected()) {
+            style = 3;
+        }
+
+        return style;
+    }
+
+    private float updateFontSize() {
+        return Float.parseFloat(GeneralUtils.objectToString(fontSizeComboBox.getSelectedItem()));
+    }
+}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/chart/ChartLabelStylePane.java

@@ -0,0 +1,78 @@
+package com.fr.design.mainframe.predefined.ui.detail.chart;
+
+import com.fr.config.predefined.PredefinedChartStyle;
+import com.fr.design.gui.ibutton.UIButtonGroup;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.Toolkit;
+
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+/**
+ * @author Bjorn
+ * @version 10.0
+ * Created by Bjorn on 2020-09-16
+ */
+public class ChartLabelStylePane extends AbstractChartStylePane {
+
+    private UIButtonGroup<Integer> autoButton;
+    //字体样式
+    private ChartFontPane chartFontPane;
+
+    protected void initComponents() {
+        autoButton = new UIButtonGroup<>(new String[]{Toolkit.i18nText("Fine-Design_Chart_Auto"),
+                Toolkit.i18nText("Fine-Design_Chart_Custom")});
+        chartFontPane = new ChartFontPane() {
+            public String getUILabelText() {
+                return Toolkit.i18nText("Fine-Design_Chart_Label_Character");
+            }
+        };
+        initListener();
+    }
+
+    protected Component[][] getComponent() {
+        return new Component[][]{
+                new Component[]{null, null},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Style_Setting")), autoButton},
+                new Component[]{chartFontPane, null}
+        };
+    }
+
+    protected double[] getRows(double p) {
+        return new double[]{p, p, p};
+    }
+
+    private void initListener() {
+        autoButton.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                checkPreButton();
+            }
+        });
+    }
+
+    private void checkPreButton() {
+        chartFontPane.setVisible(autoButton.getSelectedIndex() == 1);
+        chartFontPane.setPreferredSize(autoButton.getSelectedIndex() == 1 ? new Dimension(0, 60) : new Dimension(0, 0));
+    }
+
+
+    @Override
+    protected String title4PopupWindow() {
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Label");
+    }
+
+    public void populate(PredefinedChartStyle chartStyle) {
+        autoButton.setSelectedIndex(chartStyle.isAutoLabelFont() ? 0 : 1);
+        chartFontPane.populate(chartStyle.getLabelFont());
+        checkPreButton();
+    }
+
+
+    public void update(PredefinedChartStyle chartStyle) {
+        chartStyle.setAutoLabelFont(autoButton.getSelectedIndex() == 0);
+        chartStyle.setLabelFont(chartFontPane.update());
+    }
+}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/chart/ChartLegendStylePane.java

@@ -0,0 +1,49 @@
+package com.fr.design.mainframe.predefined.ui.detail.chart;
+
+import com.fr.config.predefined.PredefinedChartStyle;
+import com.fr.design.i18n.Toolkit;
+
+import java.awt.Component;
+
+/**
+ * @author Bjorn
+ * @version 10.0
+ * Created by Bjorn on 2020-09-16
+ */
+public class ChartLegendStylePane extends AbstractChartStylePane {
+
+    //字体样式
+    private ChartFontPane chartFontPane;
+
+    protected void initComponents() {
+        chartFontPane = new ChartFontPane() {
+            public String getUILabelText() {
+                return Toolkit.i18nText("Fine-Design_Chart_Legend_Character");
+            }
+        };
+    }
+
+    protected Component[][] getComponent() {
+        return new Component[][]{
+                new Component[]{chartFontPane, null}
+        };
+    }
+
+    protected double[] getRows(double p) {
+        return new double[]{p};
+    }
+
+    @Override
+    protected String title4PopupWindow() {
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Legend");
+    }
+
+    public void populate(PredefinedChartStyle chartStyle) {
+        chartFontPane.populate(chartStyle.getLegendFont());
+    }
+
+
+    public void update(PredefinedChartStyle chartStyle) {
+        chartStyle.setLegendFont(chartFontPane.update());
+    }
+}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/chart/ChartTitleStylePane.java

@@ -0,0 +1,49 @@
+package com.fr.design.mainframe.predefined.ui.detail.chart;
+
+import com.fr.config.predefined.PredefinedChartStyle;
+import com.fr.design.i18n.Toolkit;
+
+import java.awt.Component;
+
+/**
+ * @author Bjorn
+ * @version 10.0
+ * Created by Bjorn on 2020-09-16
+ */
+public class ChartTitleStylePane extends AbstractChartStylePane {
+
+    //字体样式
+    private ChartFontPane chartFontPane;
+
+    protected void initComponents() {
+        chartFontPane = new ChartFontPane() {
+            public String getUILabelText() {
+                return Toolkit.i18nText("Fine-Design_Chart_Title_Character");
+            }
+        };
+    }
+
+    protected Component[][] getComponent() {
+        return new Component[][]{
+                new Component[]{chartFontPane, null}
+        };
+    }
+
+    protected double[] getRows(double p) {
+        return new double[]{p};
+    }
+
+    @Override
+    protected String title4PopupWindow() {
+        return Toolkit.i18nText("Fine-Design_Report_Title");
+    }
+
+    public void populate(PredefinedChartStyle chartStyle) {
+        chartFontPane.populate(chartStyle.getTitleFont());
+    }
+
+
+    public void update(PredefinedChartStyle chartStyle) {
+        chartStyle.setTitleFont(chartFontPane.update());
+    }
+}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/component/ComponentFrameStylePane.java

@@ -0,0 +1,153 @@
+package com.fr.design.mainframe.predefined.ui.detail.component;
+
+import com.fr.base.GraphHelper;
+import com.fr.base.Utils;
+import com.fr.config.predefined.PredefinedComponentStyle;
+import com.fr.design.gui.frpane.UINumberDragPane;
+import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.gui.ibutton.UIButtonUI;
+import com.fr.design.gui.ibutton.UIColorButton;
+import com.fr.design.gui.icombobox.LineComboBox;
+import com.fr.design.gui.icombobox.UIComboBox;
+import com.fr.design.gui.icontainer.UIScrollPane;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.gui.ispinner.UISpinner;
+import com.fr.design.gui.style.BackgroundSpecialPane;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.layout.TableLayout;
+import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.mainframe.backgroundpane.GradientBackgroundQuickPane;
+import com.fr.general.act.BorderPacker;
+import com.fr.stable.Constants;
+
+import javax.swing.BorderFactory;
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.geom.RoundRectangle2D;
+
+/**
+ * Created by kerry on 2020-09-01
+ */
+public class ComponentFrameStylePane extends ComponentStylePane {
+    private final static String[] BORDER_STYLE = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Common"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Shadow")};
+    private static final double ALPHA_MAX_NUMBER = 100;
+    private final static int[] BORDER_LINE_STYLE_ARRAY = new int[]{
+            Constants.LINE_NONE,
+            Constants.LINE_THIN, //1px
+            Constants.LINE_MEDIUM, //2px
+            Constants.LINE_THICK, //3px
+    };
+
+    //渲染风格
+    private UIComboBox borderStyleCombo;
+    //边框粗细
+    private LineComboBox currentLineCombo;
+    //边框圆角
+    private UISpinner borderCornerSpinner;
+    //边框颜色
+    private UIColorButton currentLineColorPane;
+    //主体背景
+    private BackgroundSpecialPane backgroundPane;
+    //透明度
+    private UINumberDragPane numberDragPane;
+
+    public ComponentFrameStylePane() {
+        initPane();
+    }
+
+    protected void initPane() {
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        this.setBorder(BorderFactory.createEmptyBorder(6, 0, 0, 0));
+        this.borderStyleCombo = new UIComboBox(BORDER_STYLE);
+        this.currentLineCombo = new LineComboBox(BORDER_LINE_STYLE_ARRAY);
+        this.currentLineColorPane = new UIColorButton(null);
+        this.borderCornerSpinner = new UISpinner(0, 1000, 1, 0);
+        currentLineColorPane.setUI(getButtonUI(currentLineColorPane));
+        currentLineColorPane.set4ToolbarButton();
+        currentLineColorPane.setPreferredSize(new Dimension(20, 20));
+        JPanel buttonPane = new JPanel(new BorderLayout());
+        buttonPane.add(currentLineColorPane, BorderLayout.WEST);
+        backgroundPane = new BackgroundSpecialPane(){
+            @Override
+            protected GradientBackgroundQuickPane createGradientBackgroundQuickPane(){
+                return new GradientBackgroundQuickPane(119);
+            }
+        };
+        JPanel transparencyPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        this.numberDragPane = new UINumberDragPane(0, 100);
+        transparencyPane.add(numberDragPane, BorderLayout.CENTER);
+        transparencyPane.add(new UILabel(" %"), BorderLayout.EAST);
+
+        double p = TableLayout.PREFERRED;
+        double[] rowSize = {p, p, p, p, p, p, p, p};
+        double[] columnSize = {p, 157};
+        JPanel rightTopContentPane = TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{
+                {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Render_Style")), borderStyleCombo},
+                {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Border_Line")), currentLineCombo},
+                {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Border_Color")), buttonPane},
+                getBorderCornerSpinnerComp(),
+                {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget-Style_Body_Background")), backgroundPane},
+                {new UILabel(""), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget-Style_Alpha"))},
+                {new UILabel(""), transparencyPane},
+        }, rowSize, columnSize, 10);
+        UIScrollPane rightTopPane = new UIScrollPane(rightTopContentPane);
+        rightTopPane.setBorder(BorderFactory.createEmptyBorder());
+        this.add(rightTopPane, BorderLayout.CENTER);
+    }
+
+
+    private JComponent[] getBorderCornerSpinnerComp() {
+        return new JComponent[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Radius") + ":"), borderCornerSpinner};
+    }
+
+
+    protected UIButtonUI getButtonUI(final UIColorButton uiColorButton) {
+        return new UIButtonUI() {
+
+            public void paint(Graphics g, JComponent c) {
+                UIButton b = (UIButton) c;
+                g.setColor(Color.black);
+                GraphHelper.draw(g, new RoundRectangle2D.Double(1, 1, b.getWidth() - 2, b.getHeight() - 2, 0, 0), 1);
+
+                if (b.getModel().isEnabled()) {
+                    g.setColor(uiColorButton.getColor());
+                } else {
+                    g.setColor(new Color(Utils.filterRGB(uiColorButton.getColor().getRGB(), 50)));
+                }
+                g.fillRect(2, 2, b.getWidth() - 3, b.getHeight() - 3);
+            }
+        };
+    }
+
+    @Override
+    protected String title4PopupWindow() {
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Frame");
+    }
+
+
+    @Override
+    public void populate(PredefinedComponentStyle componentStyle) {
+        BorderPacker borderStyle = componentStyle.getBorderStyle();
+        this.borderStyleCombo.setSelectedIndex(borderStyle.getBorderStyle());
+        this.borderCornerSpinner.setValue(borderStyle.getBorderRadius());
+        this.currentLineCombo.setSelectedLineStyle(borderStyle.getBorder());
+        this.currentLineColorPane.setColor(borderStyle.getColor());
+        this.backgroundPane.populateBean(borderStyle.getBackground());
+        numberDragPane.populateBean(borderStyle.getAlpha() * ALPHA_MAX_NUMBER);
+    }
+
+    @Override
+    public void update(PredefinedComponentStyle componentStyle) {
+        BorderPacker style = componentStyle.getBorderStyle();
+        style.setBorderStyle(borderStyleCombo.getSelectedIndex());
+        style.setBorderRadius((int) borderCornerSpinner.getValue());
+        style.setBorder(currentLineCombo.getSelectedLineStyle());
+        style.setColor(currentLineColorPane.getColor());
+        style.setBackground(backgroundPane.update());
+        style.setAlpha((float) (numberDragPane.updateBean() / ALPHA_MAX_NUMBER));
+    }
+}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/component/ComponentMarginStylePane.java

@@ -0,0 +1,93 @@
+package com.fr.design.mainframe.predefined.ui.detail.component;
+
+import com.fr.config.predefined.PredefinedComponentStyle;
+import com.fr.design.designer.IntervalConstants;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.gui.ispinner.UISpinner;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.layout.TableLayout;
+import com.fr.design.layout.TableLayoutHelper;
+
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
+import javax.swing.SwingConstants;
+import java.awt.BorderLayout;
+import java.awt.Component;
+
+/**
+ * Created by kerry on 2020-09-01
+ */
+public class ComponentMarginStylePane extends ComponentStylePane {
+    protected UISpinner top;
+    protected UISpinner bottom;
+    protected UISpinner left;
+    protected UISpinner right;
+
+    public ComponentMarginStylePane() {
+        initBoundPane(0, 0, 0, 0);
+    }
+
+    public void initBoundPane(int t, int b, int l, int r) {
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        top = new UISpinner(0, Integer.MAX_VALUE, 1, t);
+        bottom = new UISpinner(0, Integer.MAX_VALUE, 1, b);
+        left = new UISpinner(0, Integer.MAX_VALUE, 1, l);
+        right = new UISpinner(0, Integer.MAX_VALUE, 1, r);
+        top.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout_Padding_Duplicate"));
+        bottom.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout_Padding_Duplicate"));
+        left.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout_Padding_Duplicate"));
+        right.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout_Padding_Duplicate"));
+        UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout_Padding_Duplicate"));
+        label.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L1, 0, 0, 0));
+        label.setVerticalAlignment(SwingConstants.TOP);
+        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{
+                new Component[]{label, createRightPane()}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W2, IntervalConstants.INTERVAL_L1);
+        this.add(panel);
+    }
+
+
+    public JPanel createRightPane() {
+        double f = TableLayout.FILL;
+        double p = TableLayout.PREFERRED;
+        double[] rowSize = {p, p};
+        double[] columnSize = {f, f};
+        int[][] rowCount = {{1, 1}, {1, 1}};
+        Component[][] components1 = new Component[][]{
+                new Component[]{top, bottom},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Top"), SwingConstants.CENTER), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bottom"), SwingConstants.CENTER)}
+        };
+        Component[][] components2 = new Component[][]{
+                new Component[]{left, right},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Left"), SwingConstants.CENTER), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Right"), SwingConstants.CENTER)}
+        };
+        JPanel northPanel = TableLayoutHelper.createGapTableLayoutPane(components1, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_L6, IntervalConstants.INTERVAL_L6);
+        northPanel.setBorder(BorderFactory.createEmptyBorder(0, 0, IntervalConstants.INTERVAL_L1, 0));
+        JPanel centerPanel = TableLayoutHelper.createGapTableLayoutPane(components2, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_L6, IntervalConstants.INTERVAL_L6);
+        JPanel panel = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        panel.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L1, 0, IntervalConstants.INTERVAL_L1, 0));
+        panel.add(northPanel, BorderLayout.NORTH);
+        panel.add(centerPanel, BorderLayout.CENTER);
+        return panel;
+    }
+
+    @Override
+    protected String title4PopupWindow() {
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Base_Margin");
+    }
+
+    @Override
+    public void populate(PredefinedComponentStyle componentStyle) {
+        this.top.setValue(componentStyle.getTop());
+        this.bottom.setValue(componentStyle.getBottom());
+        this.left.setValue(componentStyle.getLeft());
+        this.right.setValue(componentStyle.getRight());
+    }
+
+    @Override
+    public void update(PredefinedComponentStyle componentStyle) {
+        componentStyle.setTop((int) this.top.getValue());
+        componentStyle.setBottom((int) this.bottom.getValue());
+        componentStyle.setLeft((int) this.left.getValue());
+        componentStyle.setRight((int) this.right.getValue());
+    }
+}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/component/ComponentStylePane.java

@@ -0,0 +1,15 @@
+package com.fr.design.mainframe.predefined.ui.detail.component;
+
+import com.fr.config.predefined.PredefinedComponentStyle;
+import com.fr.design.dialog.BasicPane;
+
+
+/**
+ * Created by kerry on 2020-09-01
+ */
+public abstract class ComponentStylePane extends BasicPane {
+
+    public abstract void populate(PredefinedComponentStyle componentStyle);
+
+    public abstract void update(PredefinedComponentStyle componentStyle);
+}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/detail/component/ComponentTitleStylePane.java

@@ -0,0 +1,258 @@
+package com.fr.design.mainframe.predefined.ui.detail.component;
+
+import com.fr.base.BaseUtils;
+import com.fr.base.Utils;
+import com.fr.config.predefined.PredefinedComponentStyle;
+import com.fr.design.constants.LayoutConstants;
+import com.fr.design.constants.UIConstants;
+import com.fr.design.formula.TinyFormulaPane;
+import com.fr.design.gui.ibutton.UIButtonGroup;
+import com.fr.design.gui.ibutton.UIColorButton;
+import com.fr.design.gui.ibutton.UIToggleButton;
+import com.fr.design.gui.icombobox.LineComboBox;
+import com.fr.design.gui.icombobox.UIComboBox;
+import com.fr.design.gui.icontainer.UIScrollPane;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.gui.style.BackgroundNoImagePane;
+import com.fr.design.gui.style.FRFontPane;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.layout.TableLayout;
+import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.mainframe.backgroundpane.GradientBackgroundQuickPane;
+import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.form.ui.LayoutBorderStyle;
+import com.fr.form.ui.WidgetTitle;
+import com.fr.general.FRFont;
+import com.fr.general.act.BorderPacker;
+import com.fr.general.act.TitlePacker;
+import com.fr.stable.ArrayUtils;
+import com.fr.stable.Constants;
+import com.fr.stable.StringUtils;
+
+import javax.swing.BorderFactory;
+import javax.swing.Icon;
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Font;
+
+/**
+ * Created by kerry on 2020-09-01
+ */
+public class ComponentTitleStylePane extends ComponentStylePane {
+    private final static Dimension BUTTON_SIZE = new Dimension(24, 20);
+    //标题内容
+    private TinyFormulaPane formulaPane;
+    //标题格式
+    private UIComboBox fontNameComboBox;
+    private UIComboBox fontSizeComboBox;
+    private UIColorButton colorSelectPane;
+    private UIToggleButton bold;
+    private UIToggleButton italic;
+    private UIToggleButton underline;
+    private LineComboBox underlineCombo;
+    //对齐方式
+    private UIButtonGroup hAlignmentPane;
+    //标题背景
+    private BackgroundNoImagePane titleBackgroundPane;
+
+    public static ComponentTitleStylePane createPredefinedSettingPane(){
+        return new ComponentTitleStylePane(true);
+    }
+
+    public static ComponentTitleStylePane createStyleSettingPane(){
+        return new ComponentTitleStylePane(false);
+    }
+
+    private ComponentTitleStylePane(boolean isPredefined) {
+        initPane(isPredefined);
+    }
+
+    protected void initPane(boolean isPredefined) {
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        this.setBorder(BorderFactory.createEmptyBorder(6, 0,0,0));
+        formulaPane = new TinyFormulaPane();
+        fontSizeComboBox = new UIComboBox(FRFontPane.FONT_SIZES);
+        fontNameComboBox = new UIComboBox(Utils.getAvailableFontFamilyNames4Report());
+        fontNameComboBox.setPreferredSize(new Dimension(105 , 20));
+        JPanel fontSizeTypePane = new JPanel(new BorderLayout(3, 0));
+        fontSizeTypePane.add(fontSizeComboBox, BorderLayout.CENTER);
+        fontSizeTypePane.add(fontNameComboBox, BorderLayout.EAST);
+
+        Icon[] hAlignmentIconArray = {BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_left_normal.png"),
+                BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_center_normal.png"),
+                BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_right_normal.png"),};
+        Integer[] hAlignment = new Integer[]{Constants.LEFT, Constants.CENTER, Constants.RIGHT};
+        hAlignmentPane = new UIButtonGroup<Integer>(hAlignmentIconArray, hAlignment);
+        hAlignmentPane.setAllToolTips(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_StyleAlignment_Left")
+                , com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_StyleAlignment_Center"),
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_StyleAlignment_Right")});
+        JPanel hPaneContainer = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0));
+        hPaneContainer.add(hAlignmentPane);
+
+        titleBackgroundPane = new BackgroundNoImagePane(){
+            @Override
+            protected GradientBackgroundQuickPane createGradientBackgroundQuickPane(){
+                return new GradientBackgroundQuickPane(119);
+            }
+        };
+
+        double p = TableLayout.PREFERRED;
+        double[] rowSize = {p, p, p, p, p, p, p, p};
+        double[] columnSize = {p, 157};
+        JComponent[][] jComponents = new JComponent[][]{
+                {new UILabel(com.fr.design.i18n.Toolkit.i18nText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Char"))), fontSizeTypePane},
+                {new UILabel(""), initFontButtonPane()},
+                {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Alignment-Style")), hAlignmentPane},
+                {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title_Background")), titleBackgroundPane}};
+
+        JComponent[][] displayComponents = createDisplayComponentArray(isPredefined, jComponents);
+        JPanel rightBottomContentPane = TableLayoutHelper.createCommonTableLayoutPane(displayComponents, rowSize, columnSize, 10);
+
+        UIScrollPane jPanel = new UIScrollPane(rightBottomContentPane);
+        jPanel.setBorder(BorderFactory.createEmptyBorder());
+        this.add(jPanel, BorderLayout.CENTER);
+    }
+
+    private JComponent[][] createDisplayComponentArray(boolean isPredefined, JComponent[][] baseComponents) {
+        if (isPredefined) {
+            return baseComponents;
+        }
+        JComponent[][] titleComponent = new JComponent[][]{{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title_Content")), formulaPane}};
+        return ArrayUtils.addAll(titleComponent, baseComponents);
+
+    }
+
+    protected JPanel initFontButtonPane() {
+        colorSelectPane = new UIColorButton();
+        bold = new UIToggleButton(BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/bold.png"));
+        italic = new UIToggleButton(BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/italic.png"));
+        underline = new UIToggleButton(BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/underline.png"));
+        bold.setPreferredSize(BUTTON_SIZE);
+        italic.setPreferredSize(BUTTON_SIZE);
+        underline.setPreferredSize(BUTTON_SIZE);
+        underline.addChangeListener(new ChangeListener() {
+            @Override
+            public void stateChanged(ChangeEvent e) {
+                underlineCombo.setVisible(underline.isSelected());
+            }
+        });
+        underlineCombo = new LineComboBox(UIConstants.BORDER_LINE_STYLE_ARRAY);
+        Component[] components_font = new Component[]{
+                colorSelectPane, italic, bold, underline
+        };
+        JPanel buttonPane = new JPanel(new BorderLayout());
+        buttonPane.add(GUICoreUtils.createFlowPane(components_font, FlowLayout.LEFT, LayoutConstants.HGAP_SMALL));
+        JPanel combinePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        combinePane.add(buttonPane, BorderLayout.WEST);
+        combinePane.add(underlineCombo, BorderLayout.CENTER);
+        initAllNames();
+        setToolTips();
+        return combinePane;
+
+    }
+
+    protected void initAllNames() {
+        fontNameComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Family"));
+        fontSizeComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Size"));
+        colorSelectPane.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Foreground"));
+        italic.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Italic"));
+        bold.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Bold"));
+        underline.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Underline"));
+        underlineCombo.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Line_Style"));
+    }
+
+    protected void setToolTips() {
+        colorSelectPane.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Foreground"));
+        italic.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Italic"));
+        bold.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Bold"));
+        underline.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Underline"));
+    }
+
+
+    @Override
+    protected String title4PopupWindow() {
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Title");
+    }
+
+    @Override
+    public void populate(PredefinedComponentStyle componentStyle) {
+        BorderPacker borderStyle = componentStyle.getBorderStyle();
+        TitlePacker widgetTitle = borderStyle == null ? new WidgetTitle() : borderStyle.getTitle();
+        widgetTitle = widgetTitle == null ? new WidgetTitle() : widgetTitle;
+
+        populateFormula(widgetTitle);
+        populateFont(widgetTitle);
+
+        hAlignmentPane.setSelectedItem(widgetTitle.getPosition());
+
+        titleBackgroundPane.populateBean(widgetTitle.getBackground());
+    }
+
+    private void populateFormula(TitlePacker widgetTitle) {
+        this.formulaPane.populateBean(widgetTitle.getTextObject().toString());
+    }
+
+    protected void populateFont(TitlePacker widgetTitle) {
+        FRFont frFont = widgetTitle.getFrFont();
+        this.fontSizeComboBox.setSelectedItem(frFont.getSize());
+        this.fontNameComboBox.setSelectedItem(frFont.getFamily());
+        this.colorSelectPane.setColor(frFont.getForeground());
+        this.colorSelectPane.repaint();
+        bold.setSelected(frFont.isBold());
+        italic.setSelected(frFont.isItalic());
+        int line = frFont.getUnderline();
+        if (line == Constants.LINE_NONE) {
+            underline.setSelected(false);
+            underlineCombo.setVisible(false);
+        } else {
+            underline.setSelected(true);
+            underlineCombo.setVisible(true);
+            this.underlineCombo.setSelectedLineStyle(line);
+        }
+    }
+
+    @Override
+    public void update(PredefinedComponentStyle componentStyle) {
+        BorderPacker style = componentStyle.getBorderStyle();
+        TitlePacker title = style.getTitle() == null ? new WidgetTitle() : style.getTitle();
+        String titleText = formulaPane.updateBean();
+        title.setTextObject(titleText);
+        style.setType(StringUtils.isEmpty(titleText) ? LayoutBorderStyle.STANDARD : LayoutBorderStyle.TITLE);
+        FRFont frFont = title.getFrFont();
+        frFont = frFont.applySize((Integer) fontSizeComboBox.getSelectedItem());
+        frFont = frFont.applyName(fontNameComboBox.getSelectedItem().toString());
+        frFont = frFont.applyForeground(colorSelectPane.getColor());
+        frFont = updateItalicBold(frFont);
+        int line = underline.isSelected() ? this.underlineCombo.getSelectedLineStyle() : Constants.LINE_NONE;
+        frFont = frFont.applyUnderline(line);
+        title.setFrFont(frFont);
+        title.setPosition((Integer) hAlignmentPane.getSelectedItem());
+        title.setBackground(titleBackgroundPane.update());
+        style.setTitle(title);
+    }
+
+    private FRFont updateItalicBold(FRFont frFont) {
+        int italic_bold = frFont.getStyle();
+        boolean isItalic = italic_bold == Font.ITALIC || italic_bold == (Font.BOLD + Font.ITALIC);
+        boolean isBold = italic_bold == Font.BOLD || italic_bold == (Font.BOLD + Font.ITALIC);
+        if (italic.isSelected() && !isItalic) {
+            italic_bold += Font.ITALIC;
+        } else if (!italic.isSelected() && isItalic) {
+            italic_bold -= Font.ITALIC;
+        }
+        frFont = frFont.applyStyle(italic_bold);
+        if (bold.isSelected() && !isBold) {
+            italic_bold += Font.BOLD;
+        } else if (!bold.isSelected() && isBold) {
+            italic_bold -= Font.BOLD;
+        }
+        frFont = frFont.applyStyle(italic_bold);
+        return frFont;
+    }
+}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/dialog/PredefinedStyleEditDialog.java

@@ -0,0 +1,193 @@
+package com.fr.design.mainframe.predefined.ui.dialog;
+
+import com.fr.config.ServerPreferenceConfig;
+import com.fr.config.predefined.PredefinedStyleConfig;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.gui.itextfield.UITextField;
+import com.fr.design.mainframe.predefined.ui.PredefinedStyleEditPane;
+import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.stable.StringUtils;
+
+import javax.swing.BorderFactory;
+import javax.swing.JDialog;
+
+import javax.swing.JPanel;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+
+/**
+ * Created by kerry on 2020-08-26
+ */
+public class PredefinedStyleEditDialog extends JDialog {
+
+    public PredefinedStyleEditDialog(Window parent, PredefinedStyleEditPane contentPane) {
+        this(parent, contentPane, false);
+    }
+
+
+    public PredefinedStyleEditDialog(Window parent, PredefinedStyleEditPane contentPane, boolean isBuiltIn) {
+        super(parent, ModalityType.APPLICATION_MODAL);
+
+        this.setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Predefined_Style_Edit"));
+        this.setResizable(false);
+        JPanel defaultPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
+        this.setContentPane(defaultPane);
+
+        UIButton saveBtn = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Save"));
+        saveBtn.setEnabled(!isBuiltIn);
+        saveBtn.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                if(contentPane.saveStyle()){
+                    dialogExit();
+                }
+            }
+        });
+        UIButton saveAsBtn = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Predefined_Save_As_New"));
+        saveAsBtn.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                SaveAsNewStyleDialog saveAsNewStyleDialog = new SaveAsNewStyleDialog(PredefinedStyleEditDialog.this, contentPane);
+                saveAsNewStyleDialog.setVisible(true);
+
+            }
+        });
+        UIButton cancelBtn = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cancel"));
+        cancelBtn.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                dialogExit();
+            }
+        });
+        JPanel buttonPanel = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
+        buttonPanel.add(saveBtn);
+        buttonPanel.add(saveAsBtn);
+        buttonPanel.add(cancelBtn);
+
+        defaultPane.add(contentPane, BorderLayout.CENTER);
+        defaultPane.add(buttonPanel, BorderLayout.SOUTH);
+
+        addWindowListener(new WindowAdapter() {
+            public void windowClosing(WindowEvent e) {
+                dialogExit();
+            }
+        });
+
+
+        this.setSize(new Dimension(900, 600));
+        GUICoreUtils.centerWindow(this);
+    }
+
+    public void dialogExit() {
+        this.dispose();
+    }
+
+    class SaveAsNewStyleDialog extends JDialog {
+        private UITextField textField;
+        private UILabel tipLabel;
+
+        public SaveAsNewStyleDialog(Window parent, PredefinedStyleEditPane editPane) {
+            super(parent, ModalityType.APPLICATION_MODAL);
+
+            this.setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Predefined_Save_As_New"));
+            this.setResizable(false);
+            UIButton confirm = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Confirm"));
+            confirm.setEnabled(false);
+            confirm.addActionListener(new ActionListener() {
+                @Override
+                public void actionPerformed(ActionEvent e) {
+                    String name = textField.getText();
+                    if (valid(name)) {
+                        editPane.saveAsNewStyle(name);
+                        dialogExit();
+                        PredefinedStyleEditDialog.this.dialogExit();
+                    } else {
+                        tipLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Predefined_Name_Repeat"));
+                    }
+                }
+            });
+            UIButton cancle = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cancel"));
+            cancle.addActionListener(new ActionListener() {
+                @Override
+                public void actionPerformed(ActionEvent e) {
+                    dialogExit();
+                }
+            });
+            JPanel defaultPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
+            JPanel buttonPanel = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
+            buttonPanel.add(confirm);
+            buttonPanel.add(cancle);
+
+            JPanel panel = createSaveAsPane(confirm);
+
+
+            defaultPane.add(panel, BorderLayout.CENTER);
+            defaultPane.add(buttonPanel, BorderLayout.SOUTH);
+
+            this.setContentPane(defaultPane);
+
+            addWindowListener(new WindowAdapter() {
+                public void windowClosing(WindowEvent e) {
+                    dialogExit();
+                }
+            });
+
+
+            this.setSize(new Dimension(300, 140));
+            GUICoreUtils.centerWindow(this);
+        }
+
+        private JPanel createSaveAsPane(UIButton confirm) {
+            JPanel panel = FRGUIPaneFactory.createBorderLayout_S_Pane();
+            JPanel centerPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(20, 5);
+            centerPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Predefined_Style_Name")));
+            textField = new UITextField();
+            textField.getDocument().addDocumentListener(new DocumentListener() {
+                @Override
+                public void insertUpdate(DocumentEvent e) {
+                    confirm.setEnabled(StringUtils.isNotEmpty(textField.getText()));
+                }
+
+                @Override
+                public void removeUpdate(DocumentEvent e) {
+
+                }
+
+                @Override
+                public void changedUpdate(DocumentEvent e) {
+
+                }
+            });
+            textField.setPreferredSize(new Dimension(180, 20));
+            centerPane.add(textField);
+            panel.add(centerPane, BorderLayout.CENTER);
+            tipLabel = new UILabel();
+            tipLabel.setBorder(BorderFactory.createEmptyBorder(10, 20, 0, 0));
+            tipLabel.setForeground(Color.RED);
+            panel.add(tipLabel, BorderLayout.SOUTH);
+            return panel;
+
+
+        }
+
+
+        public void dialogExit() {
+            this.dispose();
+        }
+
+        private boolean valid(String name) {
+            PredefinedStyleConfig config = ServerPreferenceConfig.getInstance().getPreferenceStyleConfig();
+            return !config.containStyle(name);
+        }
+    }
+}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/dialog/ReportPredefinedStyleDialog.java

@@ -0,0 +1,97 @@
+package com.fr.design.mainframe.predefined.ui.dialog;
+
+import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.mainframe.predefined.ui.ReportPredefinedStylePane;
+import com.fr.design.mainframe.predefined.ui.ServerPredefinedStylePane;
+import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.workspace.WorkContext;
+
+import javax.swing.JDialog;
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+
+/**
+ * Created by kerry on 2020-08-26
+ */
+public class ReportPredefinedStyleDialog extends JDialog {
+
+
+    public ReportPredefinedStyleDialog(Window parent, ReportPredefinedStylePane contentPane) {
+        super(parent, ModalityType.APPLICATION_MODAL);
+
+        this.setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Predefined_Template_Style"));
+        this.setResizable(false);
+        JPanel defaultPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
+        this.setContentPane(defaultPane);
+        UIButton managerBtn = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Predefined_Style_Manager"));
+        managerBtn.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                ServerPredefinedStylePane predefinedStylePane = new ServerPredefinedStylePane();
+                ServerPredefinedStyleDialog dialog = new ServerPredefinedStyleDialog(ReportPredefinedStyleDialog.this, predefinedStylePane);
+                dialog.setVisible(true);
+                dialog.addWindowListener(new WindowAdapter() {
+                    @Override
+                    public void windowClosed(WindowEvent e) {
+                        contentPane.refresh();
+                    }
+                });
+            }
+        });
+
+
+        UIButton settingBtn = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Predefined_Applicate_Style"));
+        settingBtn.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                contentPane.update();
+                dialogExit();
+            }
+        });
+
+        UIButton cancelBtn = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cancel"));
+        cancelBtn.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                dialogExit();
+            }
+        });
+        JPanel southPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+
+        if (WorkContext.getCurrent().isRoot()){
+            JPanel buttonPanel1 = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane();
+            buttonPanel1.add(managerBtn);
+            southPane.add(buttonPanel1, BorderLayout.CENTER);
+        }
+
+        JPanel buttonPanel2 = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
+        buttonPanel2.add(settingBtn);
+        buttonPanel2.add(cancelBtn);
+
+        southPane.add(buttonPanel2, BorderLayout.EAST);
+
+        defaultPane.add(contentPane, BorderLayout.CENTER);
+        defaultPane.add(southPane, BorderLayout.SOUTH);
+
+        addWindowListener(new WindowAdapter() {
+            public void windowClosing(WindowEvent e) {
+                dialogExit();
+            }
+        });
+
+
+        this.setSize(new Dimension(660, 600));
+        GUICoreUtils.centerWindow(this);
+    }
+
+    public void dialogExit() {
+        this.dispose();
+    }
+}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/dialog/ServerPredefinedStyleDialog.java

@@ -0,0 +1,68 @@
+package com.fr.design.mainframe.predefined.ui.dialog;
+
+import com.fr.design.mainframe.predefined.ui.ServerPredefinedStylePane;
+import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.utils.gui.GUICoreUtils;
+
+import javax.swing.JDialog;
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+
+/**
+ * Created by kerry on 2020-08-26
+ */
+public class ServerPredefinedStyleDialog extends JDialog  {
+
+
+    public ServerPredefinedStyleDialog(Window parent, ServerPredefinedStylePane contentPane) {
+        super(parent, ModalityType.APPLICATION_MODAL);
+        this.setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Predefined_Server_Style"));
+        this.setResizable(false);
+        JPanel defaultPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
+        this.setContentPane(defaultPane);
+
+        UIButton settingBtn = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Predefined_Set_Default"));
+        settingBtn.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                contentPane.update();
+                dialogExit();
+            }
+        });
+
+        UIButton cancelBtn = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cancel"));
+        cancelBtn.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                dialogExit();
+            }
+        });
+        JPanel buttonPanel = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
+        buttonPanel.add(settingBtn);
+        buttonPanel.add(cancelBtn);
+
+        defaultPane.add(contentPane, BorderLayout.CENTER);
+        defaultPane.add(buttonPanel, BorderLayout.SOUTH);
+
+        addWindowListener(new WindowAdapter() {
+            public void windowClosing(WindowEvent e) {
+                dialogExit();
+            }
+        });
+
+
+        this.setSize(new Dimension(660, 600));
+        GUICoreUtils.centerWindow(this);
+    }
+
+    public void dialogExit(){
+        this.dispose();
+    }
+}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/preview/ChartPreStylePreView.java

@@ -0,0 +1,100 @@
+package com.fr.design.mainframe.predefined.ui.preview;
+
+import com.fr.base.chart.BaseChartCollection;
+import com.fr.base.chart.BaseChartPainter;
+import com.fr.base.chart.chartdata.CallbackEvent;
+import com.fr.base.chart.result.WebChartIDInfo;
+import com.fr.chart.base.ChartConstants;
+import com.fr.chart.base.ChartPreStyleProvider;
+import com.fr.chart.chartattr.ChartCollection;
+import com.fr.config.predefined.PredefinedStyle;
+import com.fr.design.gui.chart.MiddleChartComponent;
+import com.fr.plugin.chart.vanchart.VanChart;
+import com.fr.script.Calculator;
+import com.fr.stable.core.PropertyChangeListener;
+
+import java.util.List;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+
+/**
+ * @author Bjorn
+ * @version 10.0
+ * Created by Bjorn on 2020-09-28
+ */
+public class ChartPreStylePreView extends MiddleChartComponent {
+
+    private ChartCollection chartCollection;
+
+    private double scaleX = 1.0;
+    private double scaleY = 1.0;
+
+    private CallbackEvent callbackEvent;
+
+    public ChartPreStylePreView() {
+    }
+
+    public ChartPreStylePreView(ChartCollection cc) {
+        this(cc, 1.0, 1.0);
+    }
+
+    public ChartPreStylePreView(ChartCollection cc, double scaleX, double scaleY) {
+        this.scaleX = scaleX;
+        this.scaleY = scaleY;
+        populate(cc);
+    }
+
+    public void setCallbackEvent(CallbackEvent callbackEvent) {
+        this.callbackEvent = callbackEvent;
+    }
+
+    public void paintComponent(Graphics g) {
+        Graphics2D g2d = (Graphics2D) g;
+        g2d.translate(ChartConstants.PREGAP4BOUNDS / 2, ChartConstants.PREGAP4BOUNDS / 2);
+        g2d.scale(scaleX, scaleY);
+        super.paintComponent(g);
+        drawChart(g2d);
+        g2d.scale(1 / scaleX, 1 / scaleY);
+        g2d.translate(-ChartConstants.PREGAP4BOUNDS / 2, -ChartConstants.PREGAP4BOUNDS / 2);
+    }
+
+    private void drawChart(Graphics2D g2d) {
+        Dimension d = getBounds().getSize();
+        int chartWidth = (int) (d.width / scaleX) - ChartConstants.PREGAP4BOUNDS;
+        int chartHeight = (int) (d.height / scaleX) - ChartConstants.PREGAP4BOUNDS;
+        BaseChartPainter painter = chartCollection.createResultChartPainterWithOutDealFormula(Calculator.createCalculator(),
+                WebChartIDInfo.createEmptyDesignerInfo(), chartWidth, chartHeight);
+        painter.paint(g2d, chartWidth, chartHeight, 0, null, callbackEvent);
+    }
+
+    public void refresh(PredefinedStyle style) {
+        VanChart vanChart = chartCollection.getSelectedChartProvider(VanChart.class);
+        List<ChartPreStyleProvider> chartPreStyleProviders = vanChart.getChartPreStyleProvider();
+        for (ChartPreStyleProvider chartPreStyleProvider : chartPreStyleProviders) {
+            chartPreStyleProvider.updatePreDefinedStyle(style);
+        }
+        vanChart.attrChange();
+    }
+
+    @Override
+    public void populate(BaseChartCollection cc) {
+        this.chartCollection = (ChartCollection) cc;
+    }
+
+    @Override
+    public BaseChartCollection update() {
+        return this.chartCollection;
+    }
+
+    @Override
+    public void addStopEditingListener(PropertyChangeListener l) {
+
+    }
+
+
+    @Override
+    public void reset() {
+
+    }
+}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/preview/ComponentPreviewPane.java

@@ -0,0 +1,146 @@
+package com.fr.design.mainframe.predefined.ui.preview;
+
+import com.fr.base.FRContext;
+import com.fr.base.GraphHelper;
+import com.fr.config.predefined.PredefinedStyle;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.general.Background;
+import com.fr.general.FRFont;
+import com.fr.general.act.BorderPacker;
+import com.fr.general.act.TitlePacker;
+
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.FontMetrics;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.geom.Rectangle2D;
+
+/**
+ * Created by kerry on 2020-09-04
+ */
+public abstract class ComponentPreviewPane extends StyleSettingPreviewPane {
+    private PredefinedStyle style = new PredefinedStyle();
+    private static final int SMALL_GAP = 5;
+    private static final int GAP = 10;
+    private JPanel contentPane;
+    private TitlePreviewPane titlePane;
+
+
+    public ComponentPreviewPane() {
+        this.setBackground(null);
+        this.setOpaque(false);
+        this.contentPane = createContentPane();
+        this.titlePane = new TitlePreviewPane();
+        this.titlePane.setPreferredSize(new Dimension(484, 35));
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        this.setBorder(BorderFactory.createEmptyBorder(5, 10, 10, 10));
+
+        this.add(titlePane, BorderLayout.NORTH);
+        this.add(contentPane, BorderLayout.CENTER);
+    }
+
+    protected abstract JPanel createContentPane();
+
+    public void refresh() {
+        this.repaint();
+    }
+
+    public void refresh(PredefinedStyle style) {
+        this.style = style;
+    }
+
+
+    @Override
+    public void paint(Graphics g) {
+        paintContent(g);
+
+
+    }
+
+    public void paintContent(Graphics g) {
+        BorderPacker borderStyle = style.getComponentStyle().getBorderStyle();
+
+        updateBorders(g, borderStyle);
+
+        paintTitle(g, borderStyle.getTitle());
+
+        paintContentPane(g,borderStyle);
+
+    }
+
+    private void paintContentPane(Graphics g, BorderPacker borderStyle) {
+
+        Graphics clipg;
+        clipg = g.create(10, 40, this.contentPane.getWidth(), this.contentPane.getHeight());
+        if (borderStyle.getBackground() != null) {
+            borderStyle.getBackground().paint(clipg, clipg.getClipBounds());
+        }
+        this.contentPane.paint(clipg);
+        clipg.dispose();
+
+    }
+
+    private void paintTitle(Graphics g, TitlePacker titlePacker) {
+        FRFont font = titlePacker.getFrFont();
+        Background background = titlePacker.getBackground();
+        if (background != null) {
+            background.paint(g, new Rectangle2D.Double(10, 5, this.titlePane.getWidth(), this.titlePane.getHeight()));
+        }
+        titlePane.setFontObject(font);
+        titlePane.paintComponent(g);
+    }
+
+    private void updateBorders(Graphics g, BorderPacker borderStyle) {
+        if (borderStyle != null) {
+            borderStyle.paint(g, new Rectangle2D.Double(SMALL_GAP, SMALL_GAP, getWidth() - GAP, getHeight() - SMALL_GAP - GAP));
+        }
+    }
+
+
+    private class TitlePreviewPane extends JPanel {
+        private FRFont frFont = null;
+
+        public TitlePreviewPane() {
+            this.setBackground(null);
+            this.setOpaque(false);
+            frFont = FRContext.getDefaultValues().getFRFont();
+        }
+
+        @Override
+        public void paint(Graphics g) {
+
+        }
+
+        public void paintComponent(Graphics g) {
+            Graphics2D g2d = (Graphics2D) g;
+            Dimension d = getSize();
+            if (frFont == null) {
+                return;
+            }
+            FontMetrics fm = getFontMetrics(frFont);
+            if (this.isEnabled()) {
+                g2d.setColor(frFont.getForeground());
+            } else {
+                g2d.setColor(new Color(237, 237, 237));
+            }
+            g2d.setFont(frFont.applySize(14).applyResolutionNP(96));
+            int startY = 0;
+            startY = (d.height + fm.getHeight()) / 2;
+            drawTabBack(g2d, startY);
+        }
+
+        private void drawTabBack(Graphics2D g2d, int startY) {
+            String paintText = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Predefined_Preview_Title_Text");
+            GraphHelper.drawString(g2d, paintText, GAP, 32);
+        }
+
+        public void setFontObject(FRFont font) {
+            this.frFont = font;
+        }
+    }
+
+}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/preview/ElementCasePreview.java

@@ -0,0 +1,98 @@
+package com.fr.design.mainframe.predefined.ui.preview;
+
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.general.FRFont;
+import com.fr.log.FineLoggerFactory;
+
+import javax.swing.JPanel;
+import javax.swing.JSeparator;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by kerry on 2020-09-04
+ */
+public class ElementCasePreview extends ComponentPreviewPane {
+    private static final List<String[]> PREVIEW_DATA_LIST = new ArrayList<>();
+    private static final String BLANK_CHAR = " ";
+
+    static {
+        readPreviewData();
+    }
+
+    private static void readPreviewData() {
+        try {
+            InputStream inputStream = ElementCasePreview.class.getResourceAsStream("/com/fr/design/mainframe/predefined/previewData");
+            BufferedReader br = new BufferedReader(new InputStreamReader(inputStream,
+                    StandardCharsets.UTF_8));
+            String lineTxt = null;
+            while ((lineTxt = br.readLine()) != null) {
+                String[] data = lineTxt.split(BLANK_CHAR);
+                PREVIEW_DATA_LIST.add(data);
+            }
+            br.close();
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+        }
+    }
+
+    @Override
+    protected JPanel createContentPane() {
+
+        JPanel jPanel = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane();
+        jPanel.setOpaque(false);
+        jPanel.setBackground(null);
+        FRFont font = FRFont.getInstance();
+        FRFont titleFont = font.applySize(11).applyForeground(Color.decode("#63B2EE"));
+        FRFont endFont = font.applyForeground(Color.decode("#1B97FF"));
+        for (int i = 0; i < PREVIEW_DATA_LIST.size(); i++) {
+            FRFont frFont = font;
+            if (i == 0) {
+                frFont = titleFont;
+            }
+            if (i == PREVIEW_DATA_LIST.size() - 1) {
+                frFont = endFont;
+            }
+            jPanel.add(new GridRowPane(frFont, PREVIEW_DATA_LIST.get(i)));
+
+        }
+
+        return jPanel;
+    }
+
+    class GridRowPane extends JPanel {
+        public GridRowPane(FRFont frFont, String[] data) {
+            this.setOpaque(false);
+            this.setBackground(null);
+            this.setLayout(FRGUIPaneFactory.createBorderLayout());
+            JPanel panel = FRGUIPaneFactory.createNColumnGridInnerContainer_Pane(4, 20, 10);
+            panel.setOpaque(false);
+            panel.setBackground(null);
+            for (String text : data) {
+                panel.add(createLabel(text, frFont));
+            }
+            this.add(panel, BorderLayout.CENTER);
+            JSeparator jSeparator = new JSeparator();
+            jSeparator.setPreferredSize(new Dimension(246, 2));
+            this.add(jSeparator, BorderLayout.SOUTH);
+        }
+
+        private UILabel createLabel(String text, FRFont frFont) {
+            UILabel label = new UILabel(text);
+            label.setFont(frFont);
+            label.setForeground(frFont.getForeground());
+            label.setBackground(null);
+            return label;
+        }
+
+    }
+
+}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/preview/PredefinedStylePreviewPane.java

@@ -0,0 +1,179 @@
+package com.fr.design.mainframe.predefined.ui.preview;
+
+import com.fr.base.background.ColorBackground;
+import com.fr.base.chart.chartdata.CallbackEvent;
+import com.fr.chart.chartattr.ChartCollection;
+import com.fr.chart.chartattr.Title;
+import com.fr.chart.charttypes.ChartTypeManager;
+import com.fr.config.predefined.PredefinedStyle;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.utils.ComponentUtils;
+import com.fr.general.Background;
+import com.fr.log.FineLoggerFactory;
+import com.fr.plugin.chart.attr.axis.VanChartAxis;
+import com.fr.plugin.chart.attr.plot.VanChartPlot;
+import com.fr.plugin.chart.base.AttrLabel;
+import com.fr.plugin.chart.base.VanChartTools;
+import com.fr.plugin.chart.column.VanChartColumnPlot;
+import com.fr.plugin.chart.line.VanChartLinePlot;
+import com.fr.plugin.chart.vanchart.VanChart;
+import com.fr.stable.Constants;
+
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+import java.util.ArrayList;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.geom.Rectangle2D;
+
+/**
+ * Created by kerry on 2020-09-06
+ */
+public class PredefinedStylePreviewPane extends StyleSettingPreviewPane implements CallbackEvent {
+    private ElementCasePreview elementCasePreview;
+    private Background background;
+    private double scaleX = 1.0;
+    private double scaleY = 1.0;
+    private ChartPreStylePreView columnChartPane;
+    private ChartPreStylePreView lineChartPane;
+
+    private int COLUMN_CHART_WIDTH = 297;
+
+    private int COLUMN_CHART_HEIGHT = 220;
+
+
+    public static final double CHART_SCALE = 0.6;
+
+    public PredefinedStylePreviewPane() {
+        this(1.0, 1.0);
+    }
+
+    public PredefinedStylePreviewPane(double scaleX, double scaleY) {
+        this.scaleX = scaleX;
+        this.scaleY = scaleY;
+        this.setBackground(Color.WHITE);
+        this.elementCasePreview = new ElementCasePreview();
+        this.add(initChartPreViewPane());
+        this.elementCasePreview.setPreferredSize(new Dimension(517, 250));
+        this.add(this.elementCasePreview);
+    }
+
+    private JPanel initChartPreViewPane() {
+        columnChartPane = new ChartPreStylePreView(initVanColumnChart(), CHART_SCALE, CHART_SCALE);
+        columnChartPane.setPreferredSize(new Dimension(COLUMN_CHART_WIDTH, COLUMN_CHART_HEIGHT));
+        columnChartPane.setCallbackEvent(this);
+        lineChartPane = new ChartPreStylePreView(initVanLineChart(), CHART_SCALE, CHART_SCALE);
+        lineChartPane.setPreferredSize(new Dimension(220, 220));
+        lineChartPane.setCallbackEvent(this);
+
+        JPanel panel = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
+        panel.add(columnChartPane);
+        panel.add(lineChartPane);
+        return panel;
+    }
+
+    //柱形图
+    private ChartCollection initVanColumnChart() {
+        try {
+            VanChart chart = (VanChart) ChartTypeManager.getInstance().getCharts(VanChartColumnPlot.VAN_CHART_COLUMN_PLOT_ID)[0].clone();
+            chart.getTitle().setPosition(Constants.LEFT);
+            VanChartTools vanChartTools = chart.getVanChartTools();
+            vanChartTools.setSort(false);
+            vanChartTools.setExport(false);
+            vanChartTools.setFullScreen(false);
+            VanChartPlot plot = chart.getPlot();
+            AttrLabel defaultAttrLabel = plot.getDefaultAttrLabel();
+            defaultAttrLabel.setEnable(true);
+            defaultAttrLabel.getAttrLabelDetail().getBorder().setBorderStyle(0);
+            defaultAttrLabel.getAttrLabelDetail().getBackground().setBackground(null);
+            plot.getConditionCollection().getDefaultAttr().addDataSeriesCondition(defaultAttrLabel);
+            plot.getLegend().setLegendVisible(false);
+            plot.getDataSheet().setVisible(true);
+            ChartCollection chartCollection = new ChartCollection(chart);
+            return chartCollection;
+        } catch (Exception ex) {
+            FineLoggerFactory.getLogger().error(ex.getMessage(), ex);
+        }
+        return null;
+    }
+
+    //折线图
+    private ChartCollection initVanLineChart() {
+        try {
+            VanChart chart = (VanChart) ChartTypeManager.getInstance().getCharts(VanChartLinePlot.VAN_CHART_LINE_PLOT)[0].clone();
+            chart.getTitle().setPosition(Constants.LEFT);
+            VanChartTools vanChartTools = chart.getVanChartTools();
+            vanChartTools.setSort(false);
+            vanChartTools.setExport(false);
+            vanChartTools.setFullScreen(false);
+            VanChartLinePlot plot = chart.getPlot();
+            plot.getLegend().setPosition(Constants.TOP);
+            VanChartAxis defaultXAxis = plot.getDefaultXAxis();
+            Title title = new Title();
+            title.setTextObject(Toolkit.i18nText("Fine-Design_Chart_Category"));
+            defaultXAxis.setTitle(title);
+            defaultXAxis.setShowAxisTitle(true);
+            ChartCollection chartCollection = new ChartCollection(chart);
+            return chartCollection;
+        } catch (Exception ex) {
+            FineLoggerFactory.getLogger().error(ex.getMessage(), ex);
+        }
+        return null;
+    }
+
+    @Override
+    public void refresh() {
+
+    }
+
+    @Override
+    public void paint(Graphics g) {
+        ((Graphics2D) g).scale(scaleX, scaleY);
+        // 禁止双缓冲
+        ArrayList<JComponent> dbcomponents = new ArrayList<JComponent>();
+        ComponentUtils.disableBuffer(this.elementCasePreview, dbcomponents);
+
+        if (background == null) {
+            background = ColorBackground.getInstance(Color.WHITE);
+        }
+        background.paint(g, new Rectangle2D.Double(0, 0, 517, 500));
+        this.columnChartPane.paintComponent(g);
+
+        g.translate(COLUMN_CHART_WIDTH, 0);
+        this.lineChartPane.paintComponent(g);
+        g.translate(-COLUMN_CHART_WIDTH, COLUMN_CHART_HEIGHT + 10);
+        this.elementCasePreview.paintContent(g);
+        g.translate(0, -COLUMN_CHART_HEIGHT - 10);
+        // 恢复双缓冲
+        ComponentUtils.resetBuffer(dbcomponents);
+
+    }
+
+    @Override
+    public void paintComponents(Graphics g) {
+        super.paintComponents(g);
+        if (background != null) {
+            background.paint(g, new Rectangle2D.Double(0, 0, this.getWidth(), this.getHeight()));
+        }
+    }
+
+    public void refresh(PredefinedStyle style) {
+        refresh(style, false);
+    }
+
+    public void refresh(PredefinedStyle style, boolean displayFormBackground) {
+        elementCasePreview.refresh(style);
+        columnChartPane.refresh(style);
+        lineChartPane.refresh(style);
+        background = displayFormBackground ? style.getFormBackground().getBackground() : style.getReportBackground();
+        this.repaint();
+    }
+
+    @Override
+    public void callback() {
+        this.repaint();
+    }
+}

designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/preview/StyleSettingPreviewPane.java

@@ -0,0 +1,17 @@
+package com.fr.design.mainframe.predefined.ui.preview;
+
+import javax.swing.JPanel;
+
+/**
+ * Created by kerry on 2020-08-31
+ */
+public abstract class StyleSettingPreviewPane extends JPanel {
+    public StyleSettingPreviewPane() {
+
+    }
+
+
+    public abstract void refresh();
+
+
+}

designer-base/src/main/java/com/fr/design/mainframe/template/info/SendHelper.java

@@ -27,7 +27,7 @@ public class SendHelper {
         return success;
     }
 
-    private static boolean sendSinglePointInfo(String url, String content) {
+    public static boolean sendSinglePointInfo(String url, String content) {
         Map<String, Object> para = new HashMap<>();
         para.put("token", SiteCenterToken.generateToken());
         para.put("content", content);

designer-base/src/main/java/com/fr/design/mainframe/template/info/TemplateInfoCollector.java

@@ -1,7 +1,7 @@
 package com.fr.design.mainframe.template.info;
 
-import com.fr.design.mainframe.burying.point.AbstractPointCollector;
 import com.fr.design.mainframe.burying.point.AbstractPointInfo;
+import com.fr.design.mainframe.burying.point.AbstractTemplateInfoCollector;
 import com.fr.json.JSON;
 import com.fr.json.JSONFactory;
 import com.fr.json.JSONObject;
@@ -18,7 +18,7 @@ import java.util.concurrent.ConcurrentHashMap;
  * 做模板的过程和耗时收集，辅助类
  * Created by plough on 2017/2/21.
  */
-public class TemplateInfoCollector extends AbstractPointCollector<TemplateInfo> {
+public class TemplateInfoCollector extends AbstractTemplateInfoCollector<TemplateInfo> {
     private static final String XML_TAG = "TplInfo";
     private static final String XML_TEMPLATE_INFO_LIST = "TemplateInfoList";
     private static final String XML_FILE_NAME = "tpl.info";

designer-base/src/main/java/com/fr/design/notification/SnapChatAllTypes.java

@@ -6,33 +6,61 @@ import com.fr.stable.CommonUtils;
  * created by Harrison on 2020/03/16
  **/
 public abstract class SnapChatAllTypes {
-    
+
     public enum Menu implements SnapChatKey {
-        
+
         /**
          * 社区按钮
          */
         BBS("BBS");
-        
+
         private static final String SIGN = "0001";
-        
+
         private String key;
-        
+
         Menu(String key) {
             this.key = key;
         }
-        
+
+        public String getKey() {
+            return key;
+        }
+
+        @Override
+        public String calc() {
+
+            return CommonUtils.join(
+                    new String[]{SIGN, getKey()}, "-"
+            );
+        }
+    }
+
+    public enum UpdateAction implements SnapChatKey {
+
+        /**
+         * 服务器预定义样式
+         */
+        PREDEFINED_STYLE("PREDEFINED_STYLE");
+
+        private static final String SIGN = "0002";
+
+        private String key;
+
+        UpdateAction(String key) {
+            this.key = key;
+        }
+
         public String getKey() {
             return key;
         }
-        
+
         @Override
         public String calc() {
-            
+
             return CommonUtils.join(
                     new String[]{SIGN, getKey()}, "-"
             );
         }
     }
-    
+
 }

designer-base/src/main/java/com/fr/design/style/background/gradient/GradientBackgroundPane.java

@@ -26,6 +26,7 @@ import java.awt.event.ActionListener;
  */
 public class GradientBackgroundPane extends BackgroundDetailPane {
 	private static final long serialVersionUID = -6854603990673031897L;
+	public static final int DEFAULT_GRADIENT_WIDTH = 254;
 
 	private UIRadioButton left2right, top2bottom;
 	private GradientBar gradientBar;
@@ -41,7 +42,7 @@ public class GradientBackgroundPane extends BackgroundDetailPane {
 		// neil:增加渐变色拖动条
 		JPanel gradientPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
 		JPanel blankJp = new JPanel();
-		gradientBar = new GradientBar(4, 254);
+		gradientBar = new GradientBar(4, DEFAULT_GRADIENT_WIDTH);
 		blankJp.add(gradientBar);
 		UILabel jl = FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Drag_To_Select_Gradient"));
 		jl.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 20));

designer-base/src/main/java/com/fr/design/style/background/gradient/GradientBar.java

@@ -192,7 +192,15 @@ public class GradientBar extends JComponent implements UIObserver, ColorSelectab
         }
         float[] dist = new float[list.size()];
         for (int i = 0; i < list.size(); i++) {
-            dist[i] = (float) ((list.get(i).getX() - 4) / (max - 4));
+            double value = list.get(i).getX() - 4;
+            double defaultMax = max - 4;
+            if (Double.compare(value, defaultMax) > 0) {
+                // 设置了预定义的渐变色 渐变色起始位置比较大 然后由预定义样式切换到自定义样式 做下等比例转换
+                dist[i] = (float) (value / (GradientBackgroundPane.DEFAULT_GRADIENT_WIDTH - 4));
+                list.get(i).setX(max * dist[i]);
+            } else {
+                dist[i] = (float) (value / defaultMax);
+            }
         }
         LinearGradientPaint paint = new LinearGradientPaint(start, end, dist, c);
 

designer-base/src/main/java/com/fr/design/style/background/impl/BPane.java

@@ -15,7 +15,7 @@ public abstract class BPane extends BackgroundDetailPane {
         this.initComponents(nColumn);
     }
 
-    private void initComponents(int nColumn) {
+    protected void initComponents(int nColumn) {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
         this.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4));
 

designer-base/src/main/java/com/fr/design/style/background/impl/TextureBackgroundPane.java

@@ -1,197 +1,59 @@
 package com.fr.design.style.background.impl;
 
-import com.fr.base.GraphHelper;
-import com.fr.base.background.TextureBackground;
 import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.style.background.BackgroundDetailPane;
+import com.fr.design.style.background.texture.TextureDetailPane;
 import com.fr.general.Background;
-import com.fr.general.ComparatorUtils;
 
 
-import javax.swing.*;
-import javax.swing.event.ChangeEvent;
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
 import javax.swing.event.ChangeListener;
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.geom.Rectangle2D;
+import java.awt.BorderLayout;
 
 /**
  * Texture background pane.  TODO kunsnat: 拆出去. 真特么的长..
  */
-public class TextureBackgroundPane extends BPane {
-
-    private static final TexturePaint[] EMBED_TEXTURE_PAINT_ARRAY = new TexturePaint[]{
-        TextureBackground.NEWSPRINT_TEXTURE_PAINT,
-        TextureBackground.RECYCLED_PAPER_TEXTURE_PAINT,
-        TextureBackground.PARCHMENT_TEXTURE_PAINT,
-        TextureBackground.STATIONERY_TEXTURE_PAINT,
-        TextureBackground.GREEN_MARBLE_TEXTURE_PAINT,
-        TextureBackground.WHITE_MARBLE_TEXTURE_PAINT,
-        TextureBackground.BROWN_MARBLE_TEXTURE_PAINT,
-        TextureBackground.GRANITE_TEXTURE_PAINT,
-        TextureBackground.BLUE_TISSUE_PAPER_TEXTURE_PAINT,
-        TextureBackground.PINK_TISSUE_PAPER_TEXTURE_PAINT,
-        TextureBackground.PURPLE_MESH_TEXTURE_PAINT,
-        TextureBackground.BOUQUET_TEXTURE_PAINT,
-        TextureBackground.PAPYRUS_TEXTURE_PAINT,
-        TextureBackground.CANVAS_TEXTURE_PAINT,
-        TextureBackground.DENIM_TEXTURE_PAINT,
-        TextureBackground.WOVEN_MAT_TEXTURE_PAINT,
-        TextureBackground.WATER_DROPLETS_TEXTURE_PAINT,
-        TextureBackground.PAPER_BAG_TEXTURE_PAINT,
-        TextureBackground.FISH_FOSSIL_TEXTURE_PAINT,
-        TextureBackground.SAND_TEXTURE_PAINT,
-        TextureBackground.CORK_TEXTURE_PAINT,
-        TextureBackground.WALNUT_TEXTURE_PAINT,
-        TextureBackground.OAK_TEXTURE_PAINT,
-        TextureBackground.MEDIUM_WOOD_TEXTURE_PAINT};
-
-    private static final String[] EMBED_TEXTURE_PAINT_DES_ARRAY = new String[]{
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Newsprint"),
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Recycled_Paper"),
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Parchment"),
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Stationery"),
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Green_Marble"),
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_White_Marble"),
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Brown_Marble"),
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Granite"),
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Blue_Tissue_Paper"),
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Pink_Tissue_Paper"),
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Purple_Mesh"),
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Bouquet"),
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Papyrus"),
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Canvas"),
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Denim"),
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Woven_Mat"),
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Water_Droplets"),
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_PaperBag"),
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_FishFossil"),
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Sand"),
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Cork"),
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Walnut"),
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Oak"),
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Medium_Wood")
-    };
-
-    private TexturePaint texturePaint;
-    private TextureButton[] textureButtonArray;
+public class TextureBackgroundPane extends BackgroundDetailPane {
+
+
+    private TextureDetailPane detailPane;
 
     public TextureBackgroundPane() {
-        super(8);// 默认的.
+        this(8);// 默认的.
     }
 
-    public TextureBackgroundPane(int colum) {
-        super(colum);// 自定义的.
-    }
+    public TextureBackgroundPane(int column) {
+        this.detailPane = TextureDetailPane.createNormalTextureDetailPane(column);
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        this.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4));
 
-    protected LayoutManager layoutOfTypePane(int nColumn) {
-        return FRGUIPaneFactory.createNColumnGridLayout(nColumn);
+        JPanel contentPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane();
+        this.add(contentPane, BorderLayout.NORTH);
+
+        JPanel typePane = FRGUIPaneFactory.createTitledBorderPane(titleOfTypePane());
+        contentPane.add(typePane);
+        typePane.add(this.detailPane);
     }
 
+
+
     protected String titleOfTypePane() {
         return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture");
     }
-    protected void setChildrenOfTypePane(JPanel typePane2) {
-        ButtonGroup patternButtonGroup = new ButtonGroup();
-        textureButtonArray = new TextureButton[EMBED_TEXTURE_PAINT_ARRAY.length];
-        for (int i = 0; i < EMBED_TEXTURE_PAINT_ARRAY.length; i++) {
-            textureButtonArray[i] = new TextureButton(
-                EMBED_TEXTURE_PAINT_ARRAY[i], EMBED_TEXTURE_PAINT_DES_ARRAY[i]);
-            patternButtonGroup.add(textureButtonArray[i]);
-            typePane2.add(textureButtonArray[i]);
-        }
-    }
+
 
     public void populate(Background background) {
-        if (background instanceof TextureBackground) {
-            TextureBackground textureBackground = (TextureBackground) background;
-
-            this.texturePaint = textureBackground.getTexturePaint();
-
-            for (int i = 0; i < textureButtonArray.length; i++) {
-                if (ComparatorUtils.equals(textureButtonArray[i].getTexturePaint(), this.texturePaint)) {
-                    textureButtonArray[i].setSelected(true);
-                    break;
-                }
-            }
-        } else {
-            this.textureButtonArray[0].setSelected(true);
-            this.texturePaint = textureButtonArray[0].getTexturePaint();
-        }
+       this.detailPane.populate(background);
     }
 
     public Background update() throws Exception {
-        return new TextureBackground(this.texturePaint);
+        return this.detailPane.update();
     }
 
+    @Override
     public void addChangeListener(ChangeListener changeListener) {
-        for (int i = 0; i < this.textureButtonArray.length; i++) {
-            this.textureButtonArray[i].addChangeListener(changeListener);
-        }
+        this.detailPane.addChangeListener(changeListener);
     }
 
-    /**
-     * Texture type button.
-     */
-    class TextureButton extends JToggleButton implements ActionListener {
-
-        private TexturePaint buttonTexturePaint;
-
-        public TextureButton(TexturePaint buttonTexturePaint, String tooltip) {
-            this.buttonTexturePaint = buttonTexturePaint;
-            this.setToolTipText(tooltip);
-
-            this.setCursor(new Cursor(Cursor.HAND_CURSOR));
-            this.addActionListener(this);
-            this.setBorder(null);
-        }
-
-        public void paintComponent(Graphics g) {
-            Graphics2D g2d = (Graphics2D) g;
-
-            Dimension d = getSize();
-
-            g2d.setPaint(this.buttonTexturePaint);
-            GraphHelper.fill(g2d, new Rectangle2D.Double(0, 0, d.width - 1d,
-                d.height - 1d));
-
-            if (ComparatorUtils.equals(texturePaint, this.buttonTexturePaint)) {// it's
-                // selected.
-                g2d.setPaint(Color.black);
-            } else {
-                g2d.setPaint(Color.gray);
-            }
-            GraphHelper.draw(g2d, new Rectangle2D.Double(0, 0, d.width - 1d,
-                d.height - 1d));
-        }
-
-        public Dimension getPreferredSize() {
-            return new Dimension(36, 32);
-        }
-
-        public TexturePaint getTexturePaint() {
-            return this.buttonTexturePaint;
-        }
-
-        /**
-         * set Pattern setIndex.
-         */
-        public void actionPerformed(ActionEvent evt) {
-            TextureBackgroundPane.this.texturePaint = this.getTexturePaint();
-
-            fireChagneListener();
-            TextureBackgroundPane.this.repaint(); // repaint.
-        }
-
-        public void addChangeListener(ChangeListener changeListener) {
-            this.changeListener = changeListener;
-        }
-
-        private void fireChagneListener() {
-            if (this.changeListener != null) {
-                ChangeEvent evt = new ChangeEvent(this);
-                this.changeListener.stateChanged(evt);
-            }
-        }
-    }
 }

designer-base/src/main/java/com/fr/design/style/background/texture/TextureDetailPane.java

@@ -0,0 +1,208 @@
+package com.fr.design.style.background.texture;
+
+import com.fr.base.GraphHelper;
+import com.fr.base.background.TextureBackground;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.style.background.BackgroundDetailPane;
+import com.fr.general.Background;
+import com.fr.general.ComparatorUtils;
+
+import javax.swing.ButtonGroup;
+import javax.swing.JToggleButton;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.Color;
+import java.awt.Cursor;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.GridLayout;
+import java.awt.LayoutManager;
+import java.awt.TexturePaint;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.geom.Rectangle2D;
+
+/**
+ * Created by kerry on 2020-08-31
+ */
+public class TextureDetailPane extends BackgroundDetailPane {
+
+    private static final TexturePaint[] EMBED_TEXTURE_PAINT_ARRAY = new TexturePaint[]{
+            TextureBackground.NEWSPRINT_TEXTURE_PAINT,
+            TextureBackground.RECYCLED_PAPER_TEXTURE_PAINT,
+            TextureBackground.PARCHMENT_TEXTURE_PAINT,
+            TextureBackground.STATIONERY_TEXTURE_PAINT,
+            TextureBackground.GREEN_MARBLE_TEXTURE_PAINT,
+            TextureBackground.WHITE_MARBLE_TEXTURE_PAINT,
+            TextureBackground.BROWN_MARBLE_TEXTURE_PAINT,
+            TextureBackground.GRANITE_TEXTURE_PAINT,
+            TextureBackground.BLUE_TISSUE_PAPER_TEXTURE_PAINT,
+            TextureBackground.PINK_TISSUE_PAPER_TEXTURE_PAINT,
+            TextureBackground.PURPLE_MESH_TEXTURE_PAINT,
+            TextureBackground.BOUQUET_TEXTURE_PAINT,
+            TextureBackground.PAPYRUS_TEXTURE_PAINT,
+            TextureBackground.CANVAS_TEXTURE_PAINT,
+            TextureBackground.DENIM_TEXTURE_PAINT,
+            TextureBackground.WOVEN_MAT_TEXTURE_PAINT,
+            TextureBackground.WATER_DROPLETS_TEXTURE_PAINT,
+            TextureBackground.PAPER_BAG_TEXTURE_PAINT,
+            TextureBackground.FISH_FOSSIL_TEXTURE_PAINT,
+            TextureBackground.SAND_TEXTURE_PAINT,
+            TextureBackground.CORK_TEXTURE_PAINT,
+            TextureBackground.WALNUT_TEXTURE_PAINT,
+            TextureBackground.OAK_TEXTURE_PAINT,
+            TextureBackground.MEDIUM_WOOD_TEXTURE_PAINT};
+
+    private static final String[] EMBED_TEXTURE_PAINT_DES_ARRAY = new String[]{
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Newsprint"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Recycled_Paper"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Parchment"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Stationery"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Green_Marble"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_White_Marble"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Brown_Marble"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Granite"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Blue_Tissue_Paper"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Pink_Tissue_Paper"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Purple_Mesh"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Bouquet"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Papyrus"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Canvas"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Denim"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Woven_Mat"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Water_Droplets"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_PaperBag"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_FishFossil"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Sand"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Cork"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Walnut"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Oak"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Medium_Wood")
+    };
+
+
+    private TexturePaint texturePaint;
+    private TextureButton[] textureButtonArray;
+
+    private TextureDetailPane(LayoutManager layoutManager, Dimension perTextureBtnSize) {
+//        this.setForeground(Color.WHITE);
+//        this.setBackground(Color.WHITE);
+        this.setLayout(layoutManager);
+        this.setChildrenOfTypePane(perTextureBtnSize);
+    }
+
+    public static TextureDetailPane createNormalTextureDetailPane(int nColumn) {
+        return new TextureDetailPane(FRGUIPaneFactory.createNColumnGridLayout(nColumn), new Dimension(36, 32));
+    }
+
+    public static TextureDetailPane createMiniTextureDetailPane(int nColumn) {
+        return new TextureDetailPane(new GridLayout(0, nColumn, 2, 2), new Dimension(23, 23));
+    }
+
+
+    protected void setChildrenOfTypePane(Dimension dimension) {
+        ButtonGroup patternButtonGroup = new ButtonGroup();
+        textureButtonArray = new TextureButton[EMBED_TEXTURE_PAINT_ARRAY.length];
+        for (int i = 0; i < EMBED_TEXTURE_PAINT_ARRAY.length; i++) {
+            textureButtonArray[i] = new TextureButton(
+                    EMBED_TEXTURE_PAINT_ARRAY[i], EMBED_TEXTURE_PAINT_DES_ARRAY[i]);
+            textureButtonArray[i].setPreferredSize(dimension);
+            patternButtonGroup.add(textureButtonArray[i]);
+            this.add(textureButtonArray[i]);
+        }
+    }
+
+    public void populate(Background background) {
+        if (background instanceof TextureBackground) {
+            TextureBackground textureBackground = (TextureBackground) background;
+
+            this.texturePaint = textureBackground.getTexturePaint();
+
+            for (int i = 0; i < textureButtonArray.length; i++) {
+                if (ComparatorUtils.equals(textureButtonArray[i].getTexturePaint(), this.texturePaint)) {
+                    textureButtonArray[i].setSelected(true);
+                    break;
+                }
+            }
+        } else {
+            this.textureButtonArray[0].setSelected(true);
+            this.texturePaint = textureButtonArray[0].getTexturePaint();
+        }
+    }
+
+    public Background update() throws Exception {
+        return new TextureBackground(this.texturePaint);
+    }
+
+    public void addChangeListener(ChangeListener changeListener) {
+        for (int i = 0; i < this.textureButtonArray.length; i++) {
+            this.textureButtonArray[i].addChangeListener(changeListener);
+        }
+    }
+
+    /**
+     * Texture type button.
+     */
+    class TextureButton extends JToggleButton implements ActionListener {
+
+        private TexturePaint buttonTexturePaint;
+
+        public TextureButton(TexturePaint buttonTexturePaint, String tooltip) {
+            this.buttonTexturePaint = buttonTexturePaint;
+            this.setToolTipText(tooltip);
+
+            this.setCursor(new Cursor(Cursor.HAND_CURSOR));
+            this.addActionListener(this);
+            this.setBorder(null);
+        }
+
+        public void paintComponent(Graphics g) {
+            Graphics2D g2d = (Graphics2D) g;
+
+            Dimension d = getSize();
+
+            g2d.setPaint(this.buttonTexturePaint);
+            GraphHelper.fill(g2d, new Rectangle2D.Double(0, 0, d.width - 1d,
+                    d.height - 1d));
+
+            if (ComparatorUtils.equals(texturePaint, this.buttonTexturePaint)) {// it's
+                // selected.
+                g2d.setPaint(Color.black);
+            } else {
+                g2d.setPaint(Color.gray);
+            }
+            GraphHelper.draw(g2d, new Rectangle2D.Double(0, 0, d.width - 1d,
+                    d.height - 1d));
+        }
+
+        public Dimension getPreferredSize() {
+            return new Dimension(36, 32);
+        }
+
+        public TexturePaint getTexturePaint() {
+            return this.buttonTexturePaint;
+        }
+
+        /**
+         * set Pattern setIndex.
+         */
+        public void actionPerformed(ActionEvent evt) {
+            TextureDetailPane.this.texturePaint = this.getTexturePaint();
+
+            fireChagneListener();
+            TextureDetailPane.this.repaint(); // repaint.
+        }
+
+        public void addChangeListener(ChangeListener changeListener) {
+            this.changeListener = changeListener;
+        }
+
+        private void fireChagneListener() {
+            if (this.changeListener != null) {
+                ChangeEvent evt = new ChangeEvent(this);
+                this.changeListener.stateChanged(evt);
+            }
+        }
+    }
+}

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

@@ -1,14 +1,12 @@
-package com.fr.design.mainframe.chart.gui.style;
+package com.fr.design.style.color;
 
 import com.fr.base.BaseUtils;
 import com.fr.base.background.ColorBackground;
-import com.fr.design.chartx.component.button.ColorButton;
 import com.fr.design.event.UIObserver;
 import com.fr.design.event.UIObserverListener;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.VerticalFlowLayout;
 import com.fr.design.style.AbstractSelectBox;
-import com.fr.design.style.color.ColorSelectPane;
 
 import javax.swing.JPanel;
 import javax.swing.event.ChangeEvent;
@@ -32,7 +30,7 @@ import java.awt.image.BufferedImage;
  * @version 10.0
  * Created by Bjorn on 2020-03-25
  */
-public class ChartColorAdjustPane extends JPanel implements UIObserver {
+public class ColorAdjustPane extends JPanel implements UIObserver {
 
     public static final Color[] DEFAULT_COLORS = {
             new Color(99, 178, 238),
@@ -58,11 +56,11 @@ public class ChartColorAdjustPane extends JPanel implements UIObserver {
     private ChangeListener changeListener;
 
 
-    public ChartColorAdjustPane() {
+    public ColorAdjustPane() {
         this(DEFAULT_COLORS);
     }
 
-    public ChartColorAdjustPane(Color[] colors) {
+    public ColorAdjustPane(Color[] colors) {
         iniListener();
         createColorButton(colors);
         createContentPane();
@@ -217,7 +215,7 @@ public class ChartColorAdjustPane extends JPanel implements UIObserver {
                     if(colorButtons.size() < MAX_BUTTON) {
                         colorButtons.add(createColorButton(color));
                     }
-                    ChartColorAdjustPane.this.stateChanged();
+                    ColorAdjustPane.this.stateChanged();
                     relayout();
                 }
             });

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

@@ -1,9 +1,8 @@
-package com.fr.design.chartx.component.button;
+package com.fr.design.style.color;
 
 import com.fr.base.BaseUtils;
 import com.fr.base.background.ColorBackground;
 import com.fr.design.style.AbstractSelectBox;
-import com.fr.design.style.color.ColorSelectPane;
 
 import javax.swing.JPanel;
 import javax.swing.event.ChangeEvent;

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

@@ -53,25 +53,19 @@ public class ColorSelectPane extends TransparentPane implements ColorSelectable
         initialCompents(isSupportTransparent);
     }
 
-    private void initialCompents(boolean isSupportTransparent) {
+    protected void initialCompents(boolean isSupportTransparent) {
 
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
         this.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, 5));
         if (isSupportTransparent) {
-            UIButton transpanrentButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ChartF_Transparency"));
-            this.add(transpanrentButton, BorderLayout.NORTH);
-            transpanrentButton.addActionListener(new ActionListener() {
-
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    doTransparent();
-                }
-            });
+            this.add(createTranspanrentButton(), BorderLayout.NORTH);
         }
+        this.add(createCenterPane(), BorderLayout.CENTER);
+    }
 
+    protected JPanel createCenterPane(){
         // center
         JPanel centerPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane();
-        this.add(centerPane, BorderLayout.CENTER);
 
         centerPane.add(getRow1Pane());
 
@@ -98,6 +92,19 @@ public class ColorSelectPane extends TransparentPane implements ColorSelectable
         centerPane1.setBorder(BorderFactory.createEmptyBorder(2, 8, 8, 8));
         centerPane1.add(customButton, BorderLayout.NORTH);
         centerPane.add(centerPane1);
+        return centerPane;
+    }
+
+    protected UIButton createTranspanrentButton(){
+        UIButton transpanrentButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ChartF_Transparency"));
+        transpanrentButton.addActionListener(new ActionListener() {
+
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                doTransparent();
+            }
+        });
+        return transpanrentButton;
     }
 
     protected JPanel getMenuColorPane() {

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

@@ -6,6 +6,7 @@ import com.fr.concurrent.NamedThreadFactory;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.dialog.FineJOptionPane;
+import com.fr.design.env.DesignerWorkspaceInfo;
 import com.fr.design.fun.DesignerEnvProcessor;
 import com.fr.design.gui.UILookAndFeel;
 import com.fr.design.i18n.Toolkit;
@@ -15,6 +16,7 @@ import com.fr.file.FileFILE;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.FRFont;
 import com.fr.general.GeneralContext;
+import com.fr.general.GeneralUtils;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.CommonCodeUtils;
@@ -25,7 +27,8 @@ import com.fr.start.ServerStarter;
 import com.fr.value.NotNullLazyValue;
 import com.fr.workspace.WorkContext;
 import org.jetbrains.annotations.NotNull;
-
+import com.fr.workspace.connect.WorkspaceConnectionInfo;
+import com.fr.workspace.engine.channel.http.FunctionalHttpRequest;
 import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
 import java.awt.Desktop;
@@ -417,4 +420,23 @@ public class DesignUtils {
     public static boolean sendFeedBack(FeedBackInfo feedBackInfo) throws Exception {
         return true;
     }
+
+
+    public static boolean checkDesignerRemoteVersion() {
+        if (WorkContext.getCurrent().isLocal()){
+            return true;
+        }
+        String envName = DesignerEnvManager.getEnvManager().getCurEnvName();
+        DesignerWorkspaceInfo selectedEnv = DesignerEnvManager.getEnvManager().getWorkspaceInfo(envName);
+        String localBranch;
+        String remoteBranch;
+        WorkspaceConnectionInfo connectionInfo = selectedEnv.getConnection();
+        localBranch = GeneralUtils.readFullBuildNO();
+        try {
+            remoteBranch = new FunctionalHttpRequest(connectionInfo).getServerBranch();
+        } catch (Exception e) {
+            return false;
+        }
+        return localBranch.contains("#") && localBranch.equals(remoteBranch);
+    }
 }

designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java

@@ -53,6 +53,7 @@ import javax.swing.BorderFactory;
 import javax.swing.DefaultCellEditor;
 import javax.swing.DefaultComboBoxModel;
 import javax.swing.Icon;
+import javax.swing.JFrame;
 import javax.swing.JList;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
@@ -867,13 +868,14 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
 			textLabel = new UILabel();
 			textLabel.addMouseListener(new MouseAdapter() {
 				public void mousePressed(MouseEvent e) {
+					vPaneDLG.setAlwaysOnTop(true);
 					vPaneDLG.setVisible(true);
 
 				}
 			});
 
 			vPane = new ValuePane(types);
-			vPaneDLG = vPane.showSmallWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() {
+			vPaneDLG = vPane.showSmallWindow(new JFrame(), new DialogActionAdapter() {
 				public void doOk() {
 					fireEditingStopped(); // Make the renderer
 					// reappear.

designer-base/src/main/java/com/fr/env/RemoteEnvPane.java

@@ -4,6 +4,8 @@ import com.fr.design.DesignerEnvManager;
 import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.border.UITitledBorder;
+import com.fr.design.dialog.FineJOptionPane;
+import com.fr.design.dialog.link.MessageWithLink;
 import com.fr.design.env.RemoteDesignerWorkspaceInfo;
 import com.fr.design.fun.DesignerEnvProcessor;
 import com.fr.design.gui.ibutton.UIButton;
@@ -16,6 +18,7 @@ import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.scrollruler.ModLineBorder;
 import com.fr.license.exception.RegistEditionException;
 import com.fr.log.FineLoggerFactory;
@@ -25,6 +28,7 @@ import com.fr.workspace.WorkContext;
 import com.fr.workspace.connect.WorkspaceConnectionInfo;
 import com.fr.workspace.engine.exception.WorkspaceAuthException;
 
+import com.fr.workspace.engine.exception.WorkspaceCheckException;
 import javax.swing.BorderFactory;
 import javax.swing.BoxLayout;
 import javax.swing.JDialog;
@@ -53,12 +57,13 @@ import java.awt.event.MouseEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.io.File;
-import java.util.function.Supplier;
+
 
 import static com.fr.design.layout.TableLayout.FILL;
 import static com.fr.design.layout.TableLayout.PREFERRED;
 import static com.fr.env.TestConnectionResult.AUTH_FAILED;
 import static com.fr.third.guava.base.Optional.fromNullable;
+import static javax.swing.JOptionPane.ERROR_MESSAGE;
 
 /**
  * @author yaohwu
@@ -583,6 +588,8 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
                 } catch (RegistEditionException e) {
                     FineLoggerFactory.getLogger().error(e.getMessage(), e);
                     throw e;
+                } catch (WorkspaceCheckException e) {
+                    return TestConnectionResult.parseByException(e);
                 }
             }
 
@@ -591,6 +598,14 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
                 okButton.setEnabled(true);
                 try {
                     TestConnectionResult result = get();
+                    if (result.isVerifyResult()) {
+                        dialog.dispose();
+                        FineJOptionPane.showMessageDialog(RemoteEnvPane.this,
+                                                          new MessageWithLink(result.getText(), Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Modify_PassWord"), connection.getUrl() + RemoteWorkspaceURL.SYSTEM_LOGIN_PATH),
+                                                          Toolkit.i18nText("Fine-Design_Basic_Dialog_Message_Title"),
+                                                          ERROR_MESSAGE,
+                                                          UIManager.getIcon("OptionPane.errorIcon"));
+                    }
                     message.setText(result.getText());
                     uiLabel.setIcon(result.getIcon());
                 } catch (Exception e) {
@@ -635,7 +650,7 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
         message.setBorder(BorderFactory.createEmptyBorder(8, 5, 0, 0));
         okButton.setEnabled(false);
 
-        dialog = new JDialog((Dialog) SwingUtilities.getWindowAncestor(RemoteEnvPane.this), UIManager.getString("OptionPane.messageDialogTitle"), true);
+        dialog = new JDialog((Dialog) SwingUtilities.getWindowAncestor(RemoteEnvPane.this), Toolkit.i18nText("Fine-Design_Basic_Dialog_Message_Title"), true);
 
         dialog.setSize(new Dimension(308, 132));
         okButton.setEnabled(false);

designer-base/src/main/java/com/fr/env/RemoteWorkspaceURL.java

@@ -9,6 +9,8 @@ import com.fr.stable.StringUtils;
  */
 public class RemoteWorkspaceURL implements FCloneable {
 
+    public static final String SYSTEM_LOGIN_PATH = "#management/system/login";
+
     /**
      * 默认 web app name
      */

designer-base/src/main/java/com/fr/env/TestConnectionResult.java

@@ -1,12 +1,15 @@
 package com.fr.env;
 
+import com.fr.decision.webservice.exception.login.UserLoginLockException;
+import com.fr.decision.webservice.exception.login.UserPasswordNeedUpdateException;
+import com.fr.decision.webservice.exception.user.UserPasswordStrengthLimitException;
 import com.fr.design.i18n.Toolkit;
-import com.fr.log.FineLoggerFactory;
-import com.fr.stable.AssistUtils;
-import com.fr.workspace.WorkContext;
+import com.fr.exception.RemoteDesignPermissionDeniedException;
+import com.fr.general.ComparatorUtils;
+import com.fr.stable.StringUtils;
 import com.fr.workspace.connect.WorkspaceConnectionInfo;
-import com.fr.workspace.engine.channel.http.FunctionalHttpRequest;
 
+import com.fr.workspace.engine.exception.WorkspaceCheckException;
 import javax.swing.Icon;
 import javax.swing.UIManager;
 
@@ -76,12 +79,127 @@ public enum TestConnectionResult {
         public String getText() {
             return Toolkit.i18nText("Fine-Design_Basic_Remote_Connect_Auth_Failed");
         }
+    },
+
+    /**
+     * 登录锁定
+     */
+    LOGIN_LOCK {
+
+        private String value;
+
+        @Override
+        public Icon getIcon() {
+            return UIManager.getIcon("OptionPane.errorIcon");
+        }
+
+        @Override
+        public String getText() {
+            return Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Login_Lock", value);
+        }
+
+        @Override
+        public String errorCode() {
+            return UserLoginLockException.ERROR_CODE;
+        }
+
+        @Override
+        public void setValue(String lockMin) {
+            this.value = lockMin;
+        }
+
+        @Override
+        public boolean isVerifyResult() {
+            return true;
+        }
+    },
+
+    /**
+     * 没有远程设计权限
+     */
+    PERMISSION_DENIED {
+        @Override
+        public Icon getIcon() {
+            return UIManager.getIcon("OptionPane.errorIcon");
+        }
+
+        @Override
+        public String getText() {
+            return Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Permission_Denied");
+        }
+
+        @Override
+        public String errorCode() {
+            return RemoteDesignPermissionDeniedException.ERROR_CODE;
+        }
+    },
+
+    /**
+     * 弱密码
+     */
+    PASSWORD_STRENGTH_LIMIT () {
+        @Override
+        public Icon getIcon() {
+            return UIManager.getIcon("OptionPane.errorIcon");
+        }
+
+        @Override
+        public String getText() {
+            return Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Weak_Password");
+        }
+
+        @Override
+        public String errorCode() {
+            return UserPasswordStrengthLimitException.ERROR_CODE;
+        }
+
+        @Override
+        public boolean isVerifyResult() {
+            return true;
+        }
+    },
+
+    /**
+     * 密码更新
+     */
+    PASSWORD_NEED_UPDATE {
+        @Override
+        public Icon getIcon() {
+            return UIManager.getIcon("OptionPane.errorIcon");
+        }
+
+        @Override
+        public String getText() {
+            return Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Update_Password");
+        }
+
+        @Override
+        public String errorCode() {
+            return UserPasswordNeedUpdateException.ERROR_CODE;
+        }
+
+        @Override
+        public boolean isVerifyResult() {
+            return true;
+        }
     };
 
     public abstract Icon getIcon();
 
     public abstract String getText();
 
+    public void setValue(String value) {
+        // do noting
+    }
+
+    public String errorCode() {
+        return StringUtils.EMPTY;
+    }
+
+    public boolean isVerifyResult() {
+        return false;
+    }
+
     public static TestConnectionResult parse(Boolean value, WorkspaceConnectionInfo info) {
         if (value == null) {
             return AUTH_FAILED;
@@ -92,4 +210,17 @@ public enum TestConnectionResult {
         //去掉测试连接时所做的检测
         return FULLY_SUCCESS;
     }
+
+    public static TestConnectionResult parseByException(WorkspaceCheckException e) {
+        for (TestConnectionResult result : values()) {
+            if (ComparatorUtils.equals(e.errorCode(), result.errorCode())) {
+                // 登录锁定 获取下锁定的时间
+                if (ComparatorUtils.equals(result, LOGIN_LOCK)) {
+                    result.setValue(e.getMessage().replaceAll("\\D+", StringUtils.EMPTY));
+                }
+                return result;
+            }
+        }
+        return AUTH_FAILED;
+    }
 }

designer-base/src/main/resources/com/fr/design/mainframe/predefined/previewData

@@ -0,0 +1,11 @@
+城市 当月目标 当月实际完成 月度完成率
+南通市 324,646 324,646 105%
+合肥市 248,938 348,938 103%
+邵阳市 248,938 348,938 103%
+九江市 248,938 348,938 103%
+武汉市 248,938 348,938 103%
+郑州市 248,938 348,938 103%
+无锡市 248,938 348,938 103%
+南京市 248,938 348,938 103%
+苏州市 248,938 348,938 103%
+合计 3200,425 2900,300 95%

designer-base/src/test/java/com/fr/design/mainframe/predefined/info/PredefinedStyleInfoCollectorTest.java

@@ -0,0 +1,97 @@
+package com.fr.design.mainframe.predefined.info;
+
+import com.fr.config.BBSAttr;
+import com.fr.config.MarketConfig;
+import com.fr.design.DesignerEnvManager;
+import com.fr.general.GeneralUtils;
+import com.fr.json.JSON;
+import com.fr.json.JSONFactory;
+import com.fr.json.JSONObject;
+import com.fr.stable.ProductConstants;
+import com.fr.third.org.apache.commons.io.FileUtils;
+import org.easymock.EasyMock;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.powermock.api.easymock.PowerMock;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.core.classloader.annotations.SuppressStaticInitializationFor;
+import org.powermock.modules.junit4.PowerMockRunner;
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * Created by kerry on 2020-09-05
+ */
+@RunWith(PowerMockRunner.class)
+@PrepareForTest({ProductConstants.class, MarketConfig.class, DesignerEnvManager.class, GeneralUtils.class})
+@SuppressStaticInitializationFor({"com.fr.jvm.assist.FineAssist"})
+public class PredefinedStyleInfoCollectorTest {
+    private String filePath;
+    private String initialFileContent;
+
+
+    @Before
+    public void setUp() throws IOException {
+        PowerMock.mockStatic(ProductConstants.class);
+
+        filePath = getClass().getResource("predefinedStyle.info").getPath();
+        String dirPath = filePath.substring(0, filePath.indexOf("predefinedStyle.info"));
+        EasyMock.expect(ProductConstants.getEnvHome()).andReturn(dirPath).anyTimes();
+
+        EasyMock.replay();
+        PowerMock.replayAll();
+        initialFileContent = FileUtils.readFileToString(new File(filePath), "utf-8");
+    }
+
+    @After
+    public void tearDown() throws IOException {
+        FileUtils.writeStringToFile(new File(filePath), initialFileContent, "utf-8");
+    }
+
+    @Test
+    public void testCollectClickNumber() {
+        PredefinedStyleInfoCollector.getInstance().collectClickNumber();
+        Assert.assertEquals(1, PredefinedStyleInfoCollector.getInstance().getClickNumber());
+    }
+
+    @Test
+    public void testCollectUseNumber() {
+        PredefinedStyleInfoCollector.getInstance().collectUseNumber("test");
+        Assert.assertEquals(1, PredefinedStyleInfoCollector.getInstance().getUseNumber());
+    }
+
+    @Test
+    public void testGenerateTotalInfo() {
+        PowerMock.mockStatic(DesignerEnvManager.class);
+        PowerMock.mockStatic(MarketConfig.class);
+        PowerMock.mockStatic(GeneralUtils.class);
+
+        DesignerEnvManager envManager = EasyMock.mock(DesignerEnvManager.class);
+        EasyMock.expect(envManager.getUUID()).andReturn("xxxxx-12345-xxxxx").once();
+        EasyMock.expect(DesignerEnvManager.getEnvManager()).andReturn(envManager).once();
+
+
+        MarketConfig marketConfig = EasyMock.mock(MarketConfig.class);
+        BBSAttr bbsAttr = new BBSAttr();
+        bbsAttr.setBbsUid(12345);
+        EasyMock.expect(marketConfig.getBBSAttr()).andReturn(bbsAttr).once();
+        EasyMock.expect(MarketConfig.getInstance()).andReturn(marketConfig).once();
+
+        EasyMock.expect(GeneralUtils.readFullVersionNO()).andReturn("10.0.9.2020.0817.final");
+
+        EasyMock.replay(envManager, marketConfig);
+
+        PowerMock.replayAll();
+        String content = PredefinedStyleInfoCollector.getInstance().generateTotalInfo();
+        JSONObject jsonObject = JSONFactory.createJSON(JSON.OBJECT, content);
+        Assert.assertEquals("predefinedStyle", jsonObject.getString("functionName"));
+        Assert.assertEquals("FR-F7003", jsonObject.getString("functionId"));
+        Assert.assertEquals("xxxxx-12345-xxxxx", jsonObject.getString("uuid"));
+        Assert.assertEquals(12345, jsonObject.getInt("uid"));
+        Assert.assertEquals("10.0.9.2020.0817.final", jsonObject.getString("jatTime"));
+    }
+
+}

designer-base/src/test/resources/com/fr/design/mainframe/predefined/info/predefinedStyle.info

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PredefinedStyleInfo xmlVersion="20170720" releaseVersion="10.0.0" clickNumber="0" useNumber="0"/>

designer-chart/src/main/java/com/fr/design/chart/gui/ChartComponent.java

@@ -7,6 +7,7 @@ import com.fr.base.chart.chartdata.CallbackEvent;
 import com.fr.base.chart.result.WebChartIDInfo;
 import com.fr.chart.base.ChartConstants;
 import com.fr.chart.chartattr.ChartCollection;
+import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.gui.chart.MiddleChartComponent;
 import com.fr.log.FineLoggerFactory;
@@ -144,6 +145,7 @@ public class ChartComponent extends MiddleChartComponent implements MouseListene
             return;
         }
 
+        chartCollection4Design.setPredefinedStyleName(getGlobalPredefinedStyleName(), false);
         Graphics2D g2d = (Graphics2D) g;
 
         Paint oldPaint = g2d.getPaint();
@@ -268,4 +270,8 @@ public class ChartComponent extends MiddleChartComponent implements MouseListene
     public void callback() {
         this.repaint();
     }
+
+    private String getGlobalPredefinedStyleName() {
+        return HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getTemplatePredefinedStyle();
+    }
 }

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPaneWithPreStyle.java

@@ -0,0 +1,97 @@
+package com.fr.design.mainframe.chart.gui.style;
+
+import com.fr.chart.base.TextAttr;
+import com.fr.design.gui.ibutton.UIButtonGroup;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.TableLayout;
+import com.fr.van.chart.designer.TableLayout4VanChartHelper;
+
+import javax.swing.JPanel;
+import javax.swing.SwingConstants;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+/**
+ * @author Bjorn
+ * @version 10.0
+ * Created by Bjorn on 2020-09-03
+ */
+public class ChartTextAttrPaneWithPreStyle extends ChartTextAttrPane {
+
+    private static final int PREDEFINED_STYLE = 0;
+    private static final int CUSTOM = 1;
+
+    private UIButtonGroup<Integer> preButton;
+    private JPanel textFontPane;
+
+    public ChartTextAttrPaneWithPreStyle() {
+        initListener();
+    }
+
+    protected JPanel getContentPane(JPanel buttonPane) {
+        preButton = new UIButtonGroup<>(new String[]{Toolkit.i18nText("Fine-Design_Chart_Predefined"),
+                Toolkit.i18nText("Fine-Design_Chart_Custom")});
+        double f = TableLayout.FILL;
+        double e = getEdithAreaWidth();
+        double[] columnSize = {f, e};
+        double p = TableLayout.PREFERRED;
+        textFontPane = TableLayout4VanChartHelper.createGapTableLayoutPane(getComponents(buttonPane), getRowSize(), columnSize);
+
+        double[] rowSize = {p, p, p};
+        UILabel text = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Character"), SwingConstants.LEFT);
+        Component[][] components = {
+                new Component[]{null, null},
+                new Component[]{text, preButton},
+                new Component[]{textFontPane, null},
+        };
+        return TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize);
+    }
+
+    protected double getEdithAreaWidth() {
+        return TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
+    }
+
+    protected Component[][] getComponents(JPanel buttonPane) {
+        return new Component[][]{
+                new Component[]{null, getFontNameComboBox()},
+                new Component[]{null, buttonPane}
+        };
+    }
+
+    private void initListener() {
+        preButton.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                checkPreButton();
+            }
+        });
+    }
+
+    private void checkPreButton() {
+        textFontPane.setVisible(preButton.getSelectedIndex() == CUSTOM);
+        textFontPane.setPreferredSize(preButton.getSelectedIndex() == CUSTOM ? new Dimension(0, 60) : new Dimension(0, 0));
+    }
+
+    public void populate(TextAttr textAttr) {
+        if (textAttr.isPredefinedStyle()) {
+            preButton.setSelectedIndex(PREDEFINED_STYLE);
+        } else {
+            preButton.setSelectedIndex(CUSTOM);
+        }
+        super.populate(textAttr);
+        checkPreButton();
+    }
+
+    public void update(TextAttr textAttr) {
+        int selectedIndex = preButton.getSelectedIndex();
+        if (selectedIndex == PREDEFINED_STYLE) {
+            textAttr.setPredefinedStyle(true);
+        } else {
+            textAttr.setPredefinedStyle(false);
+        }
+        super.update(textAttr);
+    }
+}

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ColorSelectBoxWithPreStyle.java

@@ -0,0 +1,88 @@
+package com.fr.design.mainframe.chart.gui.style;
+
+import com.fr.chart.base.ColorWithPreStyle;
+import com.fr.design.dialog.BasicPane;
+import com.fr.design.gui.ibutton.UIButtonGroup;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.TableLayout;
+import com.fr.design.style.color.ColorSelectBox;
+import com.fr.van.chart.designer.TableLayout4VanChartHelper;
+
+import javax.swing.JPanel;
+import javax.swing.SwingConstants;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+/**
+ * @author Bjorn
+ * @version 10.0
+ * Created by Bjorn on 2020-09-07
+ */
+public class ColorSelectBoxWithPreStyle extends BasicPane {
+
+    private static final int PREDEFINED_STYLE = 0;
+    private static final int CUSTOM = 1;
+
+    private UIButtonGroup<Integer> preButton;
+    private ColorSelectBox colorSelectBox;
+
+    public ColorSelectBoxWithPreStyle(int preferredWidth) {
+        preButton = new UIButtonGroup<>(new String[]{Toolkit.i18nText("Fine-Design_Chart_Predefined"),
+                Toolkit.i18nText("Fine-Design_Chart_Custom")});
+        colorSelectBox = new ColorSelectBox(preferredWidth);
+        initContent();
+        initListener();
+    }
+
+    private void initContent() {
+        double f = TableLayout.FILL;
+        double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
+        double[] columnSize = {f, e};
+        double p = TableLayout.PREFERRED;
+
+        double[] rowSize = {p, p, p};
+        UILabel text = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Color"), SwingConstants.LEFT);
+        Component[][] components = {
+                new Component[]{text, preButton},
+                new Component[]{null, colorSelectBox},
+        };
+        JPanel gapTableLayoutPane = TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize);
+        this.setLayout(new BorderLayout());
+        this.add(gapTableLayoutPane, BorderLayout.CENTER);
+    }
+
+    private void initListener() {
+        preButton.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                checkPreButton();
+            }
+        });
+    }
+
+    private void checkPreButton() {
+        colorSelectBox.setVisible(preButton.getSelectedIndex() == CUSTOM);
+        this.setPreferredSize(preButton.getSelectedIndex() == CUSTOM ? new Dimension(0, 55) : new Dimension(0, 23));
+    }
+
+    public String title4PopupWindow() {
+        return null;
+    }
+
+    public void populate(ColorWithPreStyle colorWithPreStyle) {
+        preButton.setSelectedIndex(colorWithPreStyle.isPredefinedStyle() ? PREDEFINED_STYLE : CUSTOM);
+        colorSelectBox.setSelectObject(colorWithPreStyle.getColor());
+        checkPreButton();
+    }
+
+    public ColorWithPreStyle update() {
+        ColorWithPreStyle colorWithPreStyle = new ColorWithPreStyle();
+        colorWithPreStyle.setPredefinedStyle(preButton.getSelectedIndex() == PREDEFINED_STYLE);
+        colorWithPreStyle.setColor(colorSelectBox.getSelectObject());
+        return colorWithPreStyle;
+    }
+}

designer-chart/src/main/java/com/fr/design/module/ChartPreFillStylePane.java

@@ -8,7 +8,7 @@ import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
-import com.fr.design.mainframe.chart.gui.style.ChartColorAdjustPane;
+import com.fr.design.style.color.ColorAdjustPane;
 import com.fr.design.style.background.gradient.FixedGradientBar;
 
 import javax.swing.BorderFactory;
@@ -38,7 +38,7 @@ public class ChartPreFillStylePane extends BasicBeanPane<ChartColorMatching> {
 
     private UIButtonGroup groupButton;
 
-    private ChartColorAdjustPane colorAdjustPane;
+    private ColorAdjustPane colorAdjustPane;
     private FixedGradientBar colorGradient;
 
     public ChartPreFillStylePane() {
@@ -59,7 +59,7 @@ public class ChartPreFillStylePane extends BasicBeanPane<ChartColorMatching> {
         changeColorSetPane = new JPanel(cardLayout = new CardLayout());
         changeColorSetPane.setBorder(BorderFactory.createEmptyBorder(5, 0, 0, 0));
         changeColorSetPane.add(colorGradient = new FixedGradientBar(4, 150), "gradient");
-        changeColorSetPane.add(colorAdjustPane = new ChartColorAdjustPane(), "acc");
+        changeColorSetPane.add(colorAdjustPane = new ColorAdjustPane(), "acc");
         cardLayout.show(changeColorSetPane, "acc");
         customPane.add(changeColorSetPane, BorderLayout.CENTER);
 
@@ -124,9 +124,9 @@ public class ChartPreFillStylePane extends BasicBeanPane<ChartColorMatching> {
 
             if (colorList.isEmpty()) {
                 List<Color> resultList = new ArrayList<>();
-                Collections.addAll(resultList, ChartColorAdjustPane.DEFAULT_COLORS);
+                Collections.addAll(resultList, ColorAdjustPane.DEFAULT_COLORS);
                 condition.setColorList(resultList);
-                colorAdjustPane.updateColor(ChartColorAdjustPane.DEFAULT_COLORS);
+                colorAdjustPane.updateColor(ColorAdjustPane.DEFAULT_COLORS);
             } else {
                 colorAdjustPane.updateColor(colorList.toArray(new Color[colorList.size()]));
             }

designer-chart/src/main/java/com/fr/design/module/ChartPreStyleManagerPane.java

@@ -2,7 +2,7 @@ package com.fr.design.module;
 
 import com.fr.base.ChartColorMatching;
 import com.fr.base.ChartPreStyleConfig;
-import com.fr.design.chartx.component.combobox.ColorSchemeComboBox;
+import com.fr.design.gui.icombobox.ColorSchemeComboBox;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.i18n.Toolkit;

designer-chart/src/main/java/com/fr/van/chart/bubble/VanChartBubbleConditionPane.java

@@ -20,7 +20,6 @@ import com.fr.van.chart.designer.other.condition.item.VanChartEffectConditionPan
 import com.fr.van.chart.designer.other.condition.item.VanChartLabelConditionPane;
 import com.fr.van.chart.designer.other.condition.item.VanChartSeriesColorConditionPane;
 import com.fr.van.chart.designer.other.condition.item.VanChartTooltipConditionPane;
-import com.fr.van.chart.scatter.component.label.VanChartScatterLabelConditionPane;
 import com.fr.van.chart.scatter.component.tooltip.VanChartScatterTooltipConditionPane;
 
 import java.awt.Dimension;
@@ -66,7 +65,7 @@ public class VanChartBubbleConditionPane extends DataSeriesConditionPane {
     }
 
     private void addNormalAction() {
-        classPaneMap.put(ScatterAttrLabel.class, new VanChartScatterLabelConditionPane(this, plot));
+        classPaneMap.put(ScatterAttrLabel.class, new VanChartLabelConditionPane(this, plot));
         classPaneMap.put(ScatterAttrTooltip.class, new VanChartScatterTooltipConditionPane(this, plot));
         classPaneMap.put(AttrEffect.class, new VanChartEffectConditionPane(this, EffectHelper.getBubblePlotDefaultEffect()));
     }

designer-chart/src/main/java/com/fr/van/chart/bubble/VanChartBubbleStylePane.java

@@ -6,7 +6,6 @@ import com.fr.design.gui.frpane.AttributeChangeListener;
 import com.fr.design.mainframe.chart.gui.style.series.ChartSeriesPane;
 import com.fr.plugin.chart.bubble.VanChartBubblePlot;
 import com.fr.van.chart.bubble.force.VanChartForceBubbleAreaPane;
-import com.fr.van.chart.bubble.force.VanChartForceBubbleLabelPane;
 import com.fr.van.chart.bubble.force.VanChartForceBubbleTooltipPane;
 import com.fr.van.chart.designer.style.background.VanChartAreaPane;
 import com.fr.van.chart.scatter.component.VanChartScatterStylePane;
@@ -22,17 +21,6 @@ public class VanChartBubbleStylePane extends VanChartScatterStylePane {
         super(listener);
     }
 
-    @Override
-    protected void createVanChartLabelPane(List<BasicPane> paneList) {
-        Plot plot = getChart().getPlot();
-
-        if(((VanChartBubblePlot) plot).isForceBubble()){
-            paneList.add(new VanChartForceBubbleLabelPane(VanChartBubbleStylePane.this));
-        } else {
-            super.createVanChartLabelPane(paneList);
-        }
-    }
-
     protected void addVanChartTooltipPane(List<BasicPane> paneList){
         Plot plot = getChart().getPlot();
         if(((VanChartBubblePlot) plot).isForceBubble()){

designer-chart/src/main/java/com/fr/van/chart/bubble/force/VanChartForceBubbleLabelPane.java

@@ -1,19 +0,0 @@
-package com.fr.van.chart.bubble.force;
-
-import com.fr.chart.chartattr.Plot;
-import com.fr.van.chart.designer.style.VanChartStylePane;
-import com.fr.van.chart.designer.style.label.VanChartLabelPane;
-import com.fr.van.chart.designer.style.label.VanChartPlotLabelPane;
-
-/**
- * Created by Mitisky on 16/3/31.
- */
-public class VanChartForceBubbleLabelPane extends VanChartLabelPane {
-    public VanChartForceBubbleLabelPane(VanChartStylePane parent) {
-        super(parent);
-    }
-
-    protected VanChartPlotLabelPane getLabelPane(Plot plot) {
-        return new VanChartPlotLabelPane(plot, parent);
-    }
-}

designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnConditionPane.java

@@ -49,7 +49,7 @@ public class VanChartColumnConditionPane extends DataSeriesConditionPane{
         classPaneMap.put(AttrBackground.class, new VanChartColumnSeriesColorConditionPane(this));
         classPaneMap.put(AttrAlpha.class, new LabelAlphaPane(this));
         classPaneMap.put(AttrBorder.class, new VanChartColumnLabelBorderPane(this));
-        classPaneMap.put(AttrLabel.class, new VanChartColumnLabelConditionPane(this, plot));
+        classPaneMap.put(AttrLabel.class, new VanChartLabelConditionPane(this, plot));
         classPaneMap.put(AttrFloatColor.class, new VanChartFloatColorConditionPane(this));
         classPaneMap.put(VanChartAttrTrendLine.class, new VanChartTrendLineConditionPane(this));
         classPaneMap.put(AttrSeriesImageBackground.class, new VanChartSeriesImageBackgroundConditionPane(this));

designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnLabelConditionPane.java

@@ -1,17 +0,0 @@
-package com.fr.van.chart.column;
-
-import com.fr.chart.chartattr.Plot;
-import com.fr.design.condition.ConditionAttributesPane;
-import com.fr.van.chart.designer.other.condition.item.VanChartLabelConditionPane;
-import com.fr.van.chart.designer.style.label.VanChartPlotLabelPane;
-
-public class VanChartColumnLabelConditionPane extends VanChartLabelConditionPane {
-
-    public VanChartColumnLabelConditionPane(ConditionAttributesPane conditionAttributesPane, Plot plot) {
-        super(conditionAttributesPane, plot);
-    }
-
-    protected VanChartPlotLabelPane createLabelPane() {
-        return new VanChartColumnPlotLabelNoCheckPane(getPlot(),null);
-    }
-}

designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnPlotLabelDetailPane.java

@@ -12,12 +12,12 @@ import com.fr.van.chart.designer.style.label.VanChartPlotLabelDetailPane;
 
 public class VanChartColumnPlotLabelDetailPane extends VanChartPlotLabelDetailPane {
 
-    public VanChartColumnPlotLabelDetailPane(Plot plot, VanChartStylePane parent) {
-        super(plot, parent);
+    public VanChartColumnPlotLabelDetailPane(Plot plot, VanChartStylePane parent, boolean inCondition) {
+        super(plot, parent, inCondition);
     }
 
     protected void initToolTipContentPane(Plot plot) {
-        VanChartLabelContentPane dataLabelContentPane = new VanChartLabelContentPane(getParentPane(), VanChartColumnPlotLabelDetailPane.this) {
+        VanChartLabelContentPane dataLabelContentPane = new VanChartLabelContentPane(getParentPane(), VanChartColumnPlotLabelDetailPane.this, isInCondition()) {
             protected void checkCardPane() {
                 super.checkCardPane();
                 checkOrientationPane();

designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnPlotLabelNoCheckPane.java

@@ -1,25 +0,0 @@
-package com.fr.van.chart.column;
-
-import com.fr.chart.chartattr.Plot;
-import com.fr.plugin.chart.base.AttrLabel;
-import com.fr.van.chart.designer.style.VanChartStylePane;
-
-import java.awt.BorderLayout;
-
-public class VanChartColumnPlotLabelNoCheckPane extends VanChartColumnPlotLabelPane {
-
-    public VanChartColumnPlotLabelNoCheckPane(Plot plot, VanChartStylePane parent) {
-        super(plot, parent);
-    }
-
-    protected void addComponents() {
-        this.setLayout(new BorderLayout());
-        this.add(getLabelPane(), BorderLayout.CENTER);
-    }
-
-    public void populate(AttrLabel attr) {
-        super.populate(attr);
-        getLabelShowCheckBox().setSelected(true);
-        getLabelPane().setVisible(true);
-    }
-}

designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnPlotLabelPane.java

@@ -1,20 +0,0 @@
-package com.fr.van.chart.column;
-
-import com.fr.chart.chartattr.Plot;
-import com.fr.van.chart.designer.style.VanChartStylePane;
-import com.fr.van.chart.designer.style.label.VanChartPlotLabelPane;
-
-import java.awt.BorderLayout;
-
-public class VanChartColumnPlotLabelPane extends VanChartPlotLabelPane {
-
-    public VanChartColumnPlotLabelPane(Plot plot, VanChartStylePane parent) {
-        super(plot, parent);
-    }
-
-    protected void createLabelPane() {
-        VanChartColumnPlotLabelDetailPane labelDetailPane = new VanChartColumnPlotLabelDetailPane(getPlot(), getParentPane());
-        setLabelDetailPane(labelDetailPane);
-        getLabelPane().add(labelDetailPane, BorderLayout.CENTER);
-    }
-}

designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnSeriesPane.java

@@ -69,7 +69,7 @@ public class VanChartColumnSeriesPane extends VanChartAbstractPlotSeriesPane {
 
     //边框（有圆角）
     protected VanChartBorderPane createDiffBorderPane() {
-        return new VanChartBorderWithRadiusPane();
+        return new VanChartBorderWithRadiusPane(true);
     }
 
     private JPanel createSeriesStylePane(double[] row, double[] col) {

designer-chart/src/main/java/com/fr/van/chart/custom/style/VanChartCustomSeriesPane.java

@@ -1,5 +1,6 @@
 package com.fr.van.chart.custom.style;
 
+import com.fr.chart.base.AttrFillStyle;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chartx.config.info.constant.ConfigType;
 import com.fr.design.layout.TableLayout;
@@ -90,10 +91,15 @@ public class VanChartCustomSeriesPane extends ChartSeriesPane {
 
         VanChartCustomPlot plot = (VanChartCustomPlot) chart.getPlot();
 
-        if (fillStylePane != null){
-            plot.setPlotFillStyle(fillStylePane.updateBean());
+        if (fillStylePane != null) {
+            AttrFillStyle plotFillStyle = plot.getPlotFillStyle();
+            if(plotFillStyle == null) {
+                plotFillStyle = new AttrFillStyle();
+                plot.setPlotFillStyle(plotFillStyle);
+            }
+            fillStylePane.updateBean(plotFillStyle);
         }
-        if (seriesPane != null){
+        if (seriesPane != null) {
             plotSeriesPane.updateBean(plot);
         }
         //系列埋点

designer-chart/src/main/java/com/fr/van/chart/designer/PlotFactory.java

@@ -24,23 +24,25 @@ import com.fr.plugin.chart.structure.VanChartStructurePlot;
 import com.fr.plugin.chart.treemap.VanChartTreeMapPlot;
 import com.fr.plugin.chart.wordcloud.VanChartWordCloudPlot;
 import com.fr.van.chart.bubble.force.VanChartBubbleRefreshTooltipPane;
-import com.fr.van.chart.column.VanChartColumnPlotLabelPane;
+import com.fr.van.chart.column.VanChartColumnPlotLabelDetailPane;
 import com.fr.van.chart.designer.component.VanChartLabelContentPane;
 import com.fr.van.chart.designer.component.VanChartRefreshTooltipContentPane;
 import com.fr.van.chart.designer.component.VanChartTooltipContentPane;
 import com.fr.van.chart.designer.style.HeatMapRangeLegendPane;
+import com.fr.van.chart.designer.style.MapRangeLegendPane;
 import com.fr.van.chart.designer.style.VanChartPlotLegendPane;
 import com.fr.van.chart.designer.style.VanChartRangeLegendPane;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 import com.fr.van.chart.designer.style.VanLegendPaneWidthOutHighlight;
 import com.fr.van.chart.designer.style.label.VanChartGaugePlotLabelPane;
+import com.fr.van.chart.designer.style.label.VanChartPlotLabelDetailPane;
 import com.fr.van.chart.designer.style.label.VanChartPlotLabelPane;
 import com.fr.van.chart.designer.style.tooltip.VanChartPlotRefreshTooltipPane;
 import com.fr.van.chart.designer.style.tooltip.VanChartPlotTooltipPane;
 import com.fr.van.chart.funnel.designer.style.VanChartFunnelLabelContentPane;
 import com.fr.van.chart.funnel.designer.style.VanChartFunnelRefreshTooltipContentPane;
 import com.fr.van.chart.funnel.designer.style.VanChartFunnelTooltipContentPane;
-import com.fr.van.chart.gantt.designer.style.label.VanChartGanttPlotLabelPane;
+import com.fr.van.chart.gantt.designer.style.label.VanChartGanttLabelContentPane;
 import com.fr.van.chart.gantt.designer.style.tooltip.VanChartGanttPlotTooltipPane;
 import com.fr.van.chart.gantt.designer.style.tooltip.VanChartGanttTooltipContentPane;
 import com.fr.van.chart.gauge.VanChartGaugePlotRefreshTooltipPane;
@@ -52,10 +54,10 @@ import com.fr.van.chart.multilayer.style.VanChartMultiPieLabelContentPane;
 import com.fr.van.chart.multilayer.style.VanChartMultiPiePlotTooltipPane;
 import com.fr.van.chart.multilayer.style.VanChartMultiPieTooltipContentPane;
 import com.fr.van.chart.multilayer.style.VanChartMutiPieRefreshTooltipContentPane;
+import com.fr.van.chart.scatter.VanChartScatterLabelContentPane;
 import com.fr.van.chart.scatter.VanChartScatterPlotTooltipPane;
 import com.fr.van.chart.scatter.VanChartScatterRefreshTooltipContentPane;
-import com.fr.van.chart.scatter.component.label.VanChartScatterPlotLabelPane;
-import com.fr.van.chart.structure.desinger.style.VanChartStructurePlotLabelPane;
+import com.fr.van.chart.structure.desinger.style.VanChartStructureLabelContentPane;
 import com.fr.van.chart.structure.desinger.style.VanChartStructureRefreshTooltipContentPane;
 import com.fr.van.chart.structure.desinger.style.VanChartStructureTooltipContentPane;
 import com.fr.van.chart.wordcloud.designer.style.VanChartWordCloudRefreshTooltipContentPane;
@@ -65,12 +67,12 @@ import javax.swing.BorderFactory;
 import javax.swing.JLabel;
 import javax.swing.JList;
 import javax.swing.JPanel;
-import java.awt.Component;
 import java.lang.reflect.Constructor;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+import java.awt.Component;
 
 /**
  * Created by Mitisky on 16/3/1.
@@ -104,20 +106,6 @@ public class PlotFactory {
         return borderAndBackgroundLabelPlots.contains(plot.getClass());
     }
 
-    /**
-     * 标签Map
-     */
-    private static Map<Class<? extends Plot>, Class<? extends VanChartPlotLabelPane>> labelMap = new HashMap<>();
-
-    static {
-        labelMap.put(VanChartColumnPlot.class, VanChartColumnPlotLabelPane.class);
-        labelMap.put(VanChartGaugePlot.class, VanChartGaugePlotLabelPane.class);
-        labelMap.put(VanChartScatterPlot.class, VanChartScatterPlotLabelPane.class);
-        labelMap.put(VanChartBubblePlot.class, VanChartScatterPlotLabelPane.class);
-        labelMap.put(VanChartGanttPlot.class, VanChartGanttPlotLabelPane.class);
-        labelMap.put(VanChartStructurePlot.class, VanChartStructurePlotLabelPane.class);
-    }
-
     /**
      * 图例Map
      */
@@ -128,8 +116,8 @@ public class PlotFactory {
         legendMap.put(VanChartMultiPiePlot.class, VanLegendPaneWidthOutHighlight.class);
         legendMap.put(VanChartScatterPlot.class, VanChartRangeLegendPane.class);
         legendMap.put(VanChartBubblePlot.class, VanChartRangeLegendPane.class);
-        legendMap.put(VanChartMapPlot.class, VanChartRangeLegendPane.class);
-        legendMap.put(VanChartDrillMapPlot.class, VanChartRangeLegendPane.class);
+        legendMap.put(VanChartMapPlot.class, MapRangeLegendPane.class);
+        legendMap.put(VanChartDrillMapPlot.class, MapRangeLegendPane.class);
         legendMap.put(VanChartHeatMapPlot.class, HeatMapRangeLegendPane.class);
         legendMap.put(VanChartWordCloudPlot.class, VanChartRangeLegendPane.class);
     }
@@ -157,6 +145,10 @@ public class PlotFactory {
         labelContentMap.put(VanChartTreeMapPlot.class, VanChartMultiPieLabelContentPane.class);
         labelContentMap.put(VanChartFunnelPlot.class, VanChartFunnelLabelContentPane.class);
         labelContentMap.put(VanChartHeatMapPlot.class, VanChartMapLabelContentPane.class);
+        labelContentMap.put(VanChartBubblePlot.class, VanChartScatterLabelContentPane.class);
+        labelContentMap.put(VanChartScatterPlot.class, VanChartScatterLabelContentPane.class);
+        labelContentMap.put(VanChartStructurePlot.class, VanChartStructureLabelContentPane.class);
+        labelContentMap.put(VanChartGanttPlot.class, VanChartGanttLabelContentPane.class);
     }
 
     private static Map<Class<? extends Plot>, Class<? extends VanChartTooltipContentPane>> tooltipContentMap = new HashMap<Class<? extends Plot>, Class<? extends VanChartTooltipContentPane>>();
@@ -211,19 +203,24 @@ public class PlotFactory {
      * @return 标签界面
      */
     public static VanChartPlotLabelPane createPlotLabelPane(Plot plot, VanChartStylePane stylePane) {
-        Class<? extends Plot> key = plot.getClass();
-        if (labelMap.containsKey(key)) {
-            try {
-                Class<? extends VanChartPlotLabelPane> cl = labelMap.get(key);
-                Constructor<? extends VanChartPlotLabelPane> constructor = cl.getConstructor(Plot.class, VanChartStylePane.class);
-                return constructor.newInstance(plot, stylePane);
-            } catch (Exception e) {
-                FineLoggerFactory.getLogger().error(e.getMessage(), e);
-            }
+        return createPlotLabelPane(plot, stylePane, false);
+    }
+
+    public static VanChartPlotLabelPane createPlotLabelPane(Plot plot, VanChartStylePane stylePane, boolean inCondition) {
+        if (plot instanceof VanChartGaugePlot) {
+            return new VanChartGaugePlotLabelPane(plot, stylePane);
         }
-        return new VanChartPlotLabelPane(plot, stylePane);
+        return new VanChartPlotLabelPane(plot, stylePane, inCondition);
     }
 
+    public static VanChartPlotLabelDetailPane createPlotLabelDetailPane(Plot plot, VanChartStylePane stylePane, boolean inCondition) {
+        if (plot instanceof VanChartColumnPlot) {
+            return new VanChartColumnPlotLabelDetailPane(plot, stylePane, inCondition);
+        }
+        return new VanChartPlotLabelDetailPane(plot, stylePane, inCondition);
+    }
+
+
     /**
      * 根据图表类型创建图例界面
      *
@@ -274,18 +271,22 @@ public class PlotFactory {
      * @param showOnPane formatpane用到
      * @return 标签的具体内容界面
      */
-    public static VanChartTooltipContentPane createPlotLabelContentPane(Plot plot, VanChartStylePane parent, JPanel showOnPane) {
+    public static VanChartTooltipContentPane createPlotLabelContentPane(Plot plot, VanChartStylePane parent, JPanel showOnPane, boolean inCondition) {
         Class<? extends Plot> key = plot.getClass();
+        //力学气泡图特殊
+        if (plot instanceof VanChartBubblePlot && ((VanChartBubblePlot) plot).isForceBubble()) {
+            return new VanChartLabelContentPane(parent, showOnPane, inCondition);
+        }
         if (labelContentMap.containsKey(key)) {
             try {
                 Class<? extends VanChartTooltipContentPane> cl = labelContentMap.get(key);
-                Constructor<? extends VanChartTooltipContentPane> constructor = cl.getConstructor(VanChartStylePane.class, JPanel.class);
-                return constructor.newInstance(parent, showOnPane);
+                Constructor<? extends VanChartTooltipContentPane> constructor = cl.getConstructor(VanChartStylePane.class, JPanel.class, boolean.class);
+                return constructor.newInstance(parent, showOnPane, inCondition);
             } catch (Exception e) {
                 FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
         }
-        return new VanChartLabelContentPane(parent, showOnPane);
+        return new VanChartLabelContentPane(parent, showOnPane, inCondition);
     }
 
     /**

designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartFillStylePane.java

@@ -1,159 +1,57 @@
 package com.fr.van.chart.designer.component;
 
-import com.fr.base.ChartColorMatching;
-import com.fr.base.ChartPreStyleConfig;
-import com.fr.base.Utils;
 import com.fr.chart.base.AttrFillStyle;
-import com.fr.chart.base.ChartConstants;
-import com.fr.chart.base.ChartUtils;
-import com.fr.design.beans.BasicBeanPane;
-import com.fr.design.chartx.component.combobox.ColorSchemeComboBox;
-import com.fr.design.event.UIObserverListener;
+import com.fr.design.gui.icombobox.ColorSchemeComboBox;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.i18n.Toolkit;
-import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.layout.TableLayout;
 import com.fr.design.mainframe.DesignerBean;
 import com.fr.design.mainframe.DesignerContext;
-import com.fr.design.mainframe.chart.gui.style.ChartColorAdjustPane;
-import com.fr.design.style.background.gradient.FixedGradientBar;
+import com.fr.design.mainframe.predefined.ui.detail.ColorFillStylePane;
 import com.fr.design.utils.gui.GUICoreUtils;
-import com.fr.stable.StringUtils;
-import com.fr.van.chart.designer.TableLayout4VanChartHelper;
 
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
-import java.util.List;
 import java.awt.BorderLayout;
-import java.awt.CardLayout;
-import java.awt.Color;
 import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 
 /**
  * Created by mengao on 2017/8/17.
  */
-public class VanChartFillStylePane extends BasicBeanPane<AttrFillStyle> implements DesignerBean {
+public class VanChartFillStylePane extends ColorFillStylePane implements DesignerBean {
 
     public static final String name = "vanChartFillStyle";
 
-    protected ColorSchemeComboBox styleSelectBox;
-    protected JPanel customPane;
-    protected JPanel changeColorSetPane;
-    protected FixedGradientBar colorGradient;
-
-    protected CardLayout cardLayout;
-
-    protected ChartColorAdjustPane colorAdjustPane;
-
-    private Color[] gradientColors;
-    private Color[] accColors;
-
-    private boolean gradientSelect = false;
-
     public VanChartFillStylePane() {
-        this.setLayout(new BorderLayout());
-
-        styleSelectBox = new ColorSchemeComboBox();
-        customPane = new JPanel(FRGUIPaneFactory.createBorderLayout()) {
-            @Override
-            public Dimension getPreferredSize() {
-                if (!gradientSelect) {
-                    return colorAdjustPane.getPreferredSize();
-                }
-                return colorGradient.getPreferredSize();
-            }
-        };
-
-        changeColorSetPane = new JPanel(cardLayout = new CardLayout());
-        changeColorSetPane.add(colorGradient = new FixedGradientBar(4, 130), "gradient");
-        gradientColors = new Color[]{Color.WHITE, FixedGradientBar.NEW_CHARACTER};
-        changeColorSetPane.add(colorAdjustPane = new ChartColorAdjustPane(), "acc");
-        accColors = ChartColorAdjustPane.DEFAULT_COLORS;
-        cardLayout.show(changeColorSetPane, "acc");
-        customPane.add(changeColorSetPane, BorderLayout.CENTER);
-        initListener();
-        initLayout();
+        super();
         DesignerContext.setDesignerBean(name, this);
+    }
 
+    protected void styleSelectBoxChange() {
+        getCustomPane().setVisible(getStyleSelectBox().getSelectedIndex() != 0);
+        super.styleSelectBoxChange();
     }
 
-    private void initListener() {
-        colorAdjustPane.registerChangeListener(new UIObserverListener() {
-            @Override
-            public void doChange() {
-                accColors = colorAdjustPane.getColors();
-                if (styleSelectBox.getSelectType() != ColorSchemeComboBox.SelectType.COMBINATION_COLOR) {
-                    styleSelectBox.setSelectType(ColorSchemeComboBox.SelectType.COMBINATION_COLOR);
-                }
-                VanChartFillStylePane.this.revalidate();
-            }
-        });
-        colorGradient.registerChangeListener(new UIObserverListener() {
-            @Override
-            public void doChange() {
-                gradientColors[0] = colorGradient.getSelectColorPointBtnP1().getColorInner();
-                gradientColors[1] = colorGradient.getSelectColorPointBtnP2().getColorInner();
-                if (styleSelectBox.getSelectType() != ColorSchemeComboBox.SelectType.GRADATION_COLOR) {
-                    styleSelectBox.setSelectType(ColorSchemeComboBox.SelectType.GRADATION_COLOR);
-                }
-            }
-        });
-        styleSelectBox.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                switch (styleSelectBox.getSelectType()) {
-                    case COMBINATION_COLOR:
-                        colorAdjustPane.updateColor(accColors);
-                        cardLayout.show(changeColorSetPane, "acc");
-                        gradientSelect = false;
-                        break;
-                    case GRADATION_COLOR:
-                        colorGradient.updateColor(gradientColors[0], gradientColors[1]);
-                        cardLayout.show(changeColorSetPane, "gradient");
-                        gradientSelect = true;
-                        break;
-                    default:
-                        ColorSchemeComboBox.ColorInfo selectColorInfo = styleSelectBox.getSelectColorInfo();
-                        if (selectColorInfo.isGradient()) {
-                            colorGradient.updateColor(selectColorInfo.getColors().get(0), selectColorInfo.getColors().get(1));
-                            cardLayout.show(changeColorSetPane, "gradient");
-                            gradientSelect = true;
-                        } else {
-                            colorAdjustPane.updateColor(selectColorInfo.getColors().toArray(new Color[]{}));
-                            cardLayout.show(changeColorSetPane, "acc");
-                            gradientSelect = false;
-                        }
-                        break;
-                }
-                VanChartFillStylePane.this.revalidate();
-            }
-        });
+    protected ColorSchemeComboBox createColorSchemeComboBox() {
+        return new ColorSchemeComboBox(null, true);
     }
 
     protected void initLayout() {
-        this.setBorder(BorderFactory.createEmptyBorder(0, 0, 5, 0));
-        this.setLayout(new BorderLayout());
+        super.initLayout();
         this.add(getContentPane(), BorderLayout.CENTER);
     }
 
     protected JPanel getContentPane() {
-        double p = TableLayout.PREFERRED;
-        double f = TableLayout.FILL;
-        double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
-        double[] columnSize = {f, e};
-        double[] rowSize = {p, p, p};
-        Component[][] components = new Component[][]{
-                new Component[]{null, null},
-                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Match_Color_Scheme")), styleSelectBox},
-                new Component[]{null, customPane},
+        JPanel contentPane = super.getContentPane();
+        contentPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 5, 0));
+        return contentPane;
+    }
 
+    protected Component[][] contentPaneComponents() {
+        return new Component[][]{
+                new Component[]{null, null},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Match_Color_Scheme")), getStyleSelectBox()},
+                new Component[]{null, getCustomPane()},
         };
-        JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize);
-        panel.setBorder(BorderFactory.createEmptyBorder(0, 0, 5, 0));
-        return panel;
     }
 
     @Override
@@ -161,107 +59,31 @@ public class VanChartFillStylePane extends BasicBeanPane<AttrFillStyle> implemen
         return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Color");
     }
 
-    @Override
     public void populateBean(AttrFillStyle condition) {
-        String fillStyleName = condition == null ? "" : condition.getFillStyleName();
-        if (StringUtils.isBlank(fillStyleName) || !styleSelectBox.getItems().contains(fillStyleName)) {//兼容处理
-            if (condition == null || condition.getColorStyle() == ChartConstants.COLOR_DEFAULT) {
-                styleSelectBox.setSelectType(ColorSchemeComboBox.SelectType.DEFAULT);//默认
-            } else {
-                int colorStyle = condition.getColorStyle();
-                if (colorStyle == ChartConstants.COLOR_GRADIENT) {
-                    gradientColors[0] = condition.getColorIndex(0);
-                    gradientColors[1] = condition.getColorIndex(1);
-                    styleSelectBox.setSelectType(ColorSchemeComboBox.SelectType.GRADATION_COLOR);
-                } else {
-                    int colorSize = condition.getColorSize();
-                    accColors = new Color[colorSize];
-                    for (int i = 0; i < colorSize; i++) {
-                        accColors[i] = condition.getColorIndex(i);
-                    }
-                    styleSelectBox.setSelectType(ColorSchemeComboBox.SelectType.COMBINATION_COLOR);
-                }
-            }
-        } else {
-            styleSelectBox.setSelectedItem(fillStyleName);
+        if (condition.isPredefinedStyle()) {
+            getStyleSelectBox().setSelectType(ColorSchemeComboBox.SelectType.DEFAULT);
+            return;
         }
+        populateBean(condition.getColorFillStyle());
     }
 
-    @Override
-    public AttrFillStyle updateBean() {
-        switch (styleSelectBox.getSelectType()) {
-            case COMBINATION_COLOR:
-                return updateCombinationColor();
-            case GRADATION_COLOR:
-                return updateGradationColor();
-            case DEFAULT:
-                return updateDefaultColor();
-            default:
-                return updateNormalColor();
-        }
-    }
-
-    private AttrFillStyle updateCombinationColor() {
-        AttrFillStyle condition = new AttrFillStyle();
-        condition.clearColors();
-        condition.setColorStyle(ChartConstants.COLOR_ACC);
-        for (int i = 0, length = accColors.length; i < length; i++) {
-            condition.addFillColor(accColors[i]);
+    public void updateBean(AttrFillStyle attrFillStyle) {
+        if (getStyleSelectBox().getSelectedIndex() == 0) {
+            attrFillStyle.setPredefinedStyle(true);
+            return;
         }
-        condition.setCustomFillStyle(true);
-        return condition;
-    }
-
-    private AttrFillStyle updateGradationColor() {
-        AttrFillStyle condition = new AttrFillStyle();
-        condition.clearColors();
-        condition.setColorStyle(ChartConstants.COLOR_GRADIENT);
-        Color start = gradientColors[0];
-        Color end = gradientColors[1];
-        condition.addFillColor(start);
-        condition.addFillColor(end);
-        condition.setCustomFillStyle(true);
-        return condition;
-    }
-
-    private AttrFillStyle updateDefaultColor() {
-        AttrFillStyle condition = new AttrFillStyle();
-        condition.clearColors();
-        condition.setColorStyle(ChartConstants.COLOR_DEFAULT);
-        return condition;
-    }
-
-    private AttrFillStyle updateNormalColor() {
-        ChartPreStyleConfig manager = ChartPreStyleConfig.getInstance();
-        Object preStyle = manager.getPreStyle(styleSelectBox.getSelectedItem());
-        if (preStyle instanceof ChartColorMatching) {
-            AttrFillStyle def = ChartUtils.chartColorMatching2AttrFillStyle((ChartColorMatching) preStyle);
-            def.setFillStyleName(Utils.objectToString(styleSelectBox.getSelectedItem()));
-            return def;
-        } else {
-            return updateModifyColor();
-        }
-    }
-
-    private AttrFillStyle updateModifyColor() {
-        AttrFillStyle condition = new AttrFillStyle();
-        condition.clearColors();
-        ColorSchemeComboBox.ColorInfo selectColorInfo = styleSelectBox.getSelectColorInfo();
-        boolean isGradient = selectColorInfo.isGradient();
-        List<Color> colors = selectColorInfo.getColors();
-        condition.setColorList(colors);
-        condition.setCustomFillStyle(true);
-        condition.setColorStyle(isGradient ? ChartConstants.COLOR_GRADIENT : ChartConstants.COLOR_ACC);
-        return condition;
+        attrFillStyle.setPredefinedStyle(false);
+        attrFillStyle.setColorFillStyle(updateBean());
     }
 
     /**
      * 刷新组件对象
      */
     public void refreshBeanElement() {
-        AttrFillStyle attrFillStyle = updateBean();
+        AttrFillStyle attrFillStyle = new AttrFillStyle();
+        updateBean(attrFillStyle);
 
-        styleSelectBox.refresh();
+        getStyleSelectBox().refresh();
 
         populateBean(attrFillStyle);
         GUICoreUtils.repaint(this);

designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartLabelContentPane.java

@@ -1,17 +1,19 @@
 package com.fr.van.chart.designer.component;
 
+import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPaneWithPreStyle;
 import com.fr.plugin.chart.base.AttrTooltipContent;
 import com.fr.plugin.chart.type.TextAlign;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
 import javax.swing.JPanel;
+import java.awt.BorderLayout;
 
 public class VanChartLabelContentPane extends VanChartTooltipContentPane {
 
     private static final long serialVersionUID = 5630276526789839288L;
 
-    public VanChartLabelContentPane(VanChartStylePane parent, JPanel showOnPane) {
-        super(parent, showOnPane);
+    public VanChartLabelContentPane(VanChartStylePane parent, JPanel showOnPane, boolean inCondition) {
+        super(parent, showOnPane, inCondition);
     }
 
     protected VanChartHtmlLabelPane createHtmlLabelPane() {
@@ -21,4 +23,29 @@ public class VanChartLabelContentPane extends VanChartTooltipContentPane {
     protected AttrTooltipContent createAttrTooltip() {
         return new AttrTooltipContent(TextAlign.CENTER);
     }
+
+    public JPanel createCommonStylePane() {
+        if (isInCondition()) {
+            return super.createCommonStylePane();
+        }
+        setTextAttrPane(new ChartTextAttrPaneWithPreStyle());
+
+        JPanel stylePanel = new JPanel(new BorderLayout());
+        stylePanel.add(getTextAttrPane(), BorderLayout.CENTER);
+
+        return stylePanel;
+    }
+
+    public void updateTextAttr(AttrTooltipContent attrTooltipContent) {
+        if (isInCondition()) {
+            super.updateTextAttr(attrTooltipContent);
+            return;
+        }
+        if (hasTextStylePane()) {
+            this.getTextAttrPane().update(attrTooltipContent.getTextAttr());
+            if (!attrTooltipContent.getTextAttr().isPredefinedStyle()) {
+                attrTooltipContent.setCustom(true);
+            }
+        }
+    }
 }