Merge branch 'feature/10.0' of https://code.fineres.com/scm/design/design into feature/10.0

# Conflicts:
#	designer-chart/src/main/java/com/fr/van/chart/designer/component/border/VanChartBorderPane.java
#	designer-chart/src/main/java/com/fr/van/chart/designer/component/border/VanChartBorderWithRadiusPane.java
#	designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartPlotLabelDetailPane.java
#	designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartPlotLabelNoCheckPane.java
#	designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartPlotLabelPane.java
#	designer-chart/src/main/java/com/fr/van/chart/scatter/component/label/VanChartScatterPlotLabelDetailPane.java
#	designer-chart/src/main/java/com/fr/van/chart/scatter/component/label/VanChartScatterPlotLabelNoCheckPane.java
#	designer-chart/src/main/java/com/fr/van/chart/scatter/component/label/VanChartScatterPlotLabelPane.java

designer-base/src/main/java/com/fr/design/constants/UIConstants.java

@@ -37,7 +37,7 @@ public interface UIConstants {
     public static final Image APPFIT_H3 = IOUtils.readImage("/com/fr/design/images/dialog/appfit/H3.png");
     public static final Image APPFIT_H4 = IOUtils.readImage("/com/fr/design/images/dialog/appfit/H4.png");
 
-    public static final Border CELL_ATTR_ZEROBORDER = BorderFactory.createEmptyBorder(0, 0, 0, 0);
+    public static final Border CELL_ATTR_ZEROBORDER = BorderFactory.createEmptyBorder(0, 1, 0, 0);
     public static final Border CELL_ATTR_EMPTYBORDER = BorderFactory.createEmptyBorder(0, 10, 0, 0);
     public static final Border CELL_ATTR_PRESENTBORDER = BorderFactory.createEmptyBorder(0, 5, 0, 0);
     public static final Border CELL_ATTR_NORMALBORDER = BorderFactory.createEmptyBorder(0, 10, 0, 15);

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

@@ -1,21 +1,22 @@
 package com.fr.design.data.datapane;
 
 import com.fr.base.BaseUtils;
-import com.fr.general.NameObject;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.data.tabledata.wrapper.TableDataWrapper;
-import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode;
 import com.fr.design.gui.itree.refreshabletree.UserObjectRefreshJTree;
 import com.fr.design.icon.IconPathConstants;
 import com.fr.general.ComparatorUtils;
+import com.fr.general.NameObject;
 
-import javax.swing.*;
+import javax.swing.BorderFactory;
+import javax.swing.JTree;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeCellRenderer;
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreePath;
-import java.awt.*;
+import java.awt.Color;
+import java.awt.Component;
 
 /**
  * TableData Tree
@@ -31,6 +32,7 @@ public class TableDataTree extends UserObjectRefreshJTree<TableDataSourceOP> {
         this.setCellRenderer(tableDataTreeCellRenderer);
         this.setEditable(false);
     }
+
     // CellRenderer
     private DefaultTreeCellRenderer tableDataTreeCellRenderer = new DefaultTreeCellRenderer() {
         private static final long serialVersionUID = 1L;
@@ -66,14 +68,7 @@ public class TableDataTree extends UserObjectRefreshJTree<TableDataSourceOP> {
                 this.setIcon(null);
                 this.setText(PENDING.toString());
             }
-            // 这里新建一个Label作为render是因为JTree在动态刷新的时候，节点上render画布的的宽度不会变，会使得一部分比较长的数据显示为"..."
-            UILabel label = new UILabel();
-            label.setText(getText());
-            label.setIcon(getIcon());
-            Dimension dim = label.getPreferredSize();
-            dim.height += 2;
-            this.setSize(dim);
-            this.setPreferredSize(dim);
+            this.setBorder(BorderFactory.createEmptyBorder(1, 0, 1, 0));
             this.setBackgroundNonSelectionColor(UIConstants.TREE_BACKGROUND);
             this.setTextSelectionColor(Color.WHITE);
             this.setBackgroundSelectionColor(UIConstants.FLESH_BLUE);
@@ -152,7 +147,7 @@ public class TableDataTree extends UserObjectRefreshJTree<TableDataSourceOP> {
 
     /*
      * p:获得选中的NameObject = name + tabledata.
-	 */
+     */
     public NameObject getSelectedNameObject() {
         TreePath selectedTreePath = this.getSelectionPath();
         if (selectedTreePath == null) {

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

@@ -69,7 +69,16 @@ public class TreeTableDataComboBox extends UIComboBox {
 			}
 		}
 	}
-	
+
+	/**
+	 * 带参刷新方法
+	 * @param source 数据源数据集
+	 */
+	public void refresh(TableDataSource source) {
+		this.source = source;
+		refresh();
+	}
+
 	public void setSelectedTableDataByName(String name) {
 		TableDataWrapper tableDataWrapper;
 		if (res_map.get(name) != null) {

designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MaxMemRowCountPanel.java

@@ -73,6 +73,7 @@ public class MaxMemRowCountPanel extends UIToolbar {
 		switchCache = new UIComboBox(CACHE_LIST);
 		switchCache.addActionListener(switchStateL);
 		numberSpinner = new UISpinner(0, Integer.MAX_VALUE, 1);
+		numberSpinner.setNumberFieldColumns(4);
 	}
 
 	private void showAllPanel() {

designer-base/src/main/java/com/fr/design/gui/frpane/JTreeAutoBuildPane.java

@@ -26,14 +26,14 @@ import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
-
 import com.fr.stable.StringUtils;
-
-import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 import java.util.List;
+import javax.swing.*;
+import javax.swing.event.PopupMenuEvent;
+import javax.swing.event.PopupMenuListener;
 
 public class JTreeAutoBuildPane extends BasicPane implements PreviewLabel.Previewable, EditOrNewLabel.Editable {
     private TreeTableDataComboBox treeTableDataComboBox;
@@ -61,6 +61,23 @@ public class JTreeAutoBuildPane extends BasicPane implements PreviewLabel.Previe
                 tdChange();
             }
         });
+        // REPORT-38762 加一个展开监听事件，下拉框展开时刷新一下数据集
+        treeTableDataComboBox.addPopupMenuListener(new PopupMenuListener() {
+            @Override
+            public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
+                treeTableDataComboBox.refresh(DesignTableDataManager.getEditingTableDataSource());
+            }
+
+            @Override
+            public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
+
+            }
+
+            @Override
+            public void popupMenuCanceled(PopupMenuEvent e) {
+
+            }
+        });
         selectTreeDataPanel.add(treeTableDataComboBox);
         treeTableDataComboBox.setPreferredSize(new Dimension(200, 25));
         treeTableDataComboBox.setSelectedIndex(-1);

designer-base/src/main/java/com/fr/design/gui/ispinner/UISpinner.java

@@ -30,6 +30,7 @@ public class UISpinner extends JPanel implements UIObserver, GlobalNameObserver
     private static final int LEN = 13;
     private static final int WIDTH = 13;
     private static final int HEIGHT = 10;
+    private static final int DEFAULT_NUMBERFIELD_COLUMNS = 2;
     private UINumberField textField;
     private UIButton preButton;
     private UIButton nextButton;
@@ -40,9 +41,22 @@ public class UISpinner extends JPanel implements UIObserver, GlobalNameObserver
     private UIObserverListener uiObserverListener;
     private GlobalNameListener globalNameListener = null;
     private boolean lessMinValue = false;
+    /**
+     * Spinner内的数字文本框长度
+     */
+    private int numberFieldColumns;
 
 
     public UISpinner(double minValue, double maxValue, double dierta) {
+        init(minValue, maxValue, dierta);
+    }
+
+    public UISpinner(double minValue, double maxValue, double dierta, double defaultValue) {
+        init(minValue, maxValue, dierta);
+        textField.setValue(defaultValue);
+    }
+
+    private void init(double minValue, double maxValue, double dierta) {
         this.minValue = minValue;
         this.maxValue = maxValue;
         this.dierta = dierta;
@@ -50,11 +64,6 @@ public class UISpinner extends JPanel implements UIObserver, GlobalNameObserver
         iniListener();
     }
 
-    public UISpinner(double minValue, double maxValue, double dierta, double defaultValue) {
-        this(minValue, maxValue, dierta);
-        textField.setValue(defaultValue);
-    }
-
     private void iniListener() {
         if (shouldResponseChangeListener()) {
             this.addChangeListener(new ChangeListener() {
@@ -156,6 +165,13 @@ public class UISpinner extends JPanel implements UIObserver, GlobalNameObserver
         fireStateChanged();
     }
 
+    /**
+     * 设置Spinner内的数字输入框列数
+     * @param numberFieldColumns    输入框列数
+     */
+    public void setNumberFieldColumns(int numberFieldColumns) {
+        textField.setColumns(numberFieldColumns);
+    }
 
     public void setEnabled(boolean flag) {
         super.setEnabled(flag);
@@ -308,7 +324,8 @@ public class UISpinner extends JPanel implements UIObserver, GlobalNameObserver
     }
 
     protected UINumberField initNumberField() {
-        return new UINumberField(2) {
+        int columns = this.numberFieldColumns == 0 ? DEFAULT_NUMBERFIELD_COLUMNS : this.numberFieldColumns;
+        return new UINumberField(columns) {
             public boolean shouldResponseChangeListener() {
                 return false;
             }

designer-base/src/main/java/com/fr/design/gui/itree/filetree/EnvFileTree.java

@@ -2,7 +2,6 @@ package com.fr.design.gui.itree.filetree;
 
 import com.fr.base.FRContext;
 import com.fr.design.constants.UIConstants;
-import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode;
 import com.fr.design.gui.itree.refreshabletree.RefreshableJTree;
 import com.fr.design.i18n.Toolkit;
@@ -14,13 +13,13 @@ import com.fr.stable.CoreConstants;
 import com.fr.stable.StableUtils;
 import com.fr.workspace.WorkContext;
 
+import javax.swing.BorderFactory;
 import javax.swing.JTree;
 import javax.swing.tree.DefaultTreeCellRenderer;
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreePath;
 import java.awt.Color;
 import java.awt.Component;
-import java.awt.Dimension;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -79,14 +78,7 @@ public class EnvFileTree extends RefreshableJTree {
                     this.setIcon(null);
                     this.setText(PENDING.toString());
                 }
-                // 这里新建一个Label作为render是因为JTree在动态刷新的时候，节点上render画布的的宽度不会变，会使得一部分比较长的数据显示为"..."
-                UILabel label = new UILabel();
-                label.setText(getText());
-                label.setIcon(getIcon());
-                this.setSize(label.getPreferredSize());
-                Dimension dim = label.getPreferredSize();
-                dim.height += 2;
-                this.setPreferredSize(dim);
+                this.setBorder(BorderFactory.createEmptyBorder(1, 0, 1, 0));
                 this.setBackgroundNonSelectionColor(UIConstants.TREE_BACKGROUND);
                 this.setTextSelectionColor(Color.WHITE);
                 this.setBackgroundSelectionColor(UIConstants.FLESH_BLUE);

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

@@ -746,10 +746,14 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
      */
     public void checkCombineUp(boolean flag, ArrayList<String> al) {
         //Yvan: 检查当前是否为WORK_SHEET状态，因为只有WORK_SHEET中含有格式刷组件，此时是不需要进行checkComponentsByNames的
-        if (HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getMenuState() == DesignState.WORK_SHEET) {
-            return;
+        JTemplate<?, ?> jTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+        if (jTemplate != null) {
+            // 第一个条件满足后还需要添加一重判断，判断是编辑报表块还是参数面板，编辑报表块时则直接return
+            if (jTemplate.getMenuState() == DesignState.WORK_SHEET && !jTemplate.isUpMode()) {
+                return;
+            }
+            combineUp.checkComponentsByNames(flag, al);
         }
-        combineUp.checkComponentsByNames(flag, al);
     }
 
     /**

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

@@ -556,7 +556,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
             );
             newNameLabel.setHorizontalAlignment(SwingConstants.RIGHT);
             newNameLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 10));
-            newNameLabel.setPreferredSize(new Dimension(118, 15));
+            //newNameLabel.setPreferredSize(new Dimension(118, 15));
 
             // 重命名输入框
             nameField = new UITextField(oldName);

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

@@ -511,7 +511,10 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
         UIUtil.invokeLaterIfNeeded(new Runnable() {
             @Override
             public void run() {
-                propertyItemMap.get(key).replaceContentPane(pane);
+                PropertyItem item = propertyItemMap.get(key);
+                if (item != null) {
+                    item.replaceContentPane(pane);
+                }
             }
         });
     }

designer-base/src/main/java/com/fr/design/parameter/ParameterInputPane.java

@@ -20,14 +20,18 @@ import com.fr.design.editor.editor.TextEditor;
 import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.FRGUIPaneFactory;
-
 import com.fr.stable.ParameterProvider;
 import com.fr.stable.StringUtils;
 
-import javax.swing.*;
+import javax.swing.BorderFactory;
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.SwingConstants;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.Iterator;
@@ -37,31 +41,34 @@ import java.util.Map.Entry;
 
 /**
  * The dialog used to input parameter.
+ *
  * @editor zhou
  * @since 2012-3-26上午11:09:45
  */
 public class ParameterInputPane extends BasicPane {
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
+    /**
+     *
+     */
+    private static final long serialVersionUID = 1L;
+
+    // alex:保存编辑器对应的参数的名字
+    private java.util.Map<ValueEditorPane, String> editorNameMap; // Map<Editor, Name>
+
+    private boolean allowBlank = true;
 
-	// alex:保存编辑器对应的参数的名字
-	private java.util.Map<ValueEditorPane,String> editorNameMap; // Map<Editor, Name>
+    private FlowTableLayoutHelper flowTableLayoutHelper;
 
-	private boolean allowBlank = true;
-	
-	/**
+    /**
      * Constructor.
      */
     public ParameterInputPane(ParameterProvider[] parameters) {
         this.initComponents(parameters);
     }
 
-	public ParameterInputPane(ParameterProvider[] parameters, boolean allowBlank) {
-		this.allowBlank = allowBlank;
-		this.initComponents(parameters);
-	}
+    public ParameterInputPane(ParameterProvider[] parameters, boolean allowBlank) {
+        this.allowBlank = allowBlank;
+        this.initComponents(parameters);
+    }
 
     private void initComponents(ParameterProvider[] parameters) {
         this.setLayout(new BorderLayout(0, 4));
@@ -71,24 +78,24 @@ public class ParameterInputPane extends BasicPane {
         this.add(new JScrollPane(contentPane), BorderLayout.CENTER);
         contentPane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameters") + ":"));
 
-        FlowTableLayoutHelper flowTableLayoutHelper = new FlowTableLayoutHelper();
+        flowTableLayoutHelper = new FlowTableLayoutHelper();
+
+        editorNameMap = new java.util.HashMap<ValueEditorPane, String>();
 
-        editorNameMap = new java.util.HashMap<ValueEditorPane,String>();
-        
         //Parameter list.
         java.util.List<String> nameAddedList = new java.util.ArrayList<String>(); // alex:已经加到界面中去的参数名
         if (parameters != null && parameters.length > 0) {
             for (int i = 0; i < parameters.length; i++) {
                 ParameterProvider parameter = parameters[i];
-                
+
                 // alex:已经在界面中的参数,不加了
                 if (nameAddedList.contains(parameter.getName())) {
-                	continue;
-				}
-                if(parameter instanceof StoreProcedureParameter
-						&& ((StoreProcedureParameter) parameter).getSchema() == StoreProcedureConstants.OUT) {
-                	continue;
-				}
+                    continue;
+                }
+                if (parameter instanceof StoreProcedureParameter
+                        && ((StoreProcedureParameter) parameter).getSchema() == StoreProcedureConstants.OUT) {
+                    continue;
+                }
                 final Object pv = parameter.getValue();
                 Editor[] editors = makeEditorByValue(pv);
 
@@ -100,135 +107,140 @@ public class ParameterInputPane extends BasicPane {
                 editPane.setPreferredSize(new Dimension(180, editPane.getPreferredSize().height));
 
                 String parameterDisplayName = parameter.getName();
-                if(StringUtils.isNotBlank(parameter.getName())) {
-                	parameterDisplayName = parameter.getName();
+                if (StringUtils.isNotBlank(parameter.getName())) {
+                    parameterDisplayName = parameter.getName();
                 }
                 contentPane.add(flowTableLayoutHelper.createLabelFlowPane(parameterDisplayName + ":", editPane));
 
                 //add editor to parameter hashtable.
-				initTextListener(textF);
+                initTextListener(textF);
 
                 this.editorNameMap.put(textF, parameter.getName());
                 nameAddedList.add(parameter.getName());
             }
         }
+    }
 
+    @Override
+    public void addNotify() {
+        super.addNotify();
+        // windows 高DPI下，使用getPreferredSize必须在添加到容器之后，否则得到的数值不准确，因此先放到这调整大小
         flowTableLayoutHelper.adjustLabelWidth();
     }
 
     protected void initTextListener(ValueEditorPane textF) {
-		textF.getCurrentEditor().addChangeListener(new ChangeListener() {
-			@Override
-			public void stateChanged(ChangeEvent e) {
-				HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().fireTargetModified();
-			}
-		});
-	}
-
-	private Editor[] makeEditorByValue(Object pv) {
-		Editor[] editors = {null};
-		if (pv instanceof Integer) {
-			editors[0] = new IntegerEditor();
-		} else if (pv instanceof Double || pv instanceof Float) {
-			editors[0] = new DoubleEditor();
-		} else if (pv instanceof Float) {
-			editors[0] = new FloatEditor();
-		} else if (pv instanceof Date) {
-			editors[0] = new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date"));
-		} else if (pv instanceof Boolean) {
-			editors[0] = new BooleanEditor();
-		} else if (pv instanceof BaseFormula) {
-			editors = ValueEditorPaneFactory.basicEditors();
-		} else {
-			editors[0] = new TextEditor();
-		}
-		return editors;
-	}
-    
+        textF.getCurrentEditor().addChangeListener(new ChangeListener() {
+            @Override
+            public void stateChanged(ChangeEvent e) {
+                HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().fireTargetModified();
+            }
+        });
+    }
+
+    private Editor[] makeEditorByValue(Object pv) {
+        Editor[] editors = {null};
+        if (pv instanceof Integer) {
+            editors[0] = new IntegerEditor();
+        } else if (pv instanceof Double || pv instanceof Float) {
+            editors[0] = new DoubleEditor();
+        } else if (pv instanceof Float) {
+            editors[0] = new FloatEditor();
+        } else if (pv instanceof Date) {
+            editors[0] = new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date"));
+        } else if (pv instanceof Boolean) {
+            editors[0] = new BooleanEditor();
+        } else if (pv instanceof BaseFormula) {
+            editors = ValueEditorPaneFactory.basicEditors();
+        } else {
+            editors[0] = new TextEditor();
+        }
+        return editors;
+    }
+
     @Override
     protected String title4PopupWindow() {
-    	return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameters");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameters");
     }
 
     /**
      * Update
      */
-    public Map<String,Object> update() {
-    	
-    	java.util.Map<String,Object> nameValueMap = new java.util.HashMap<String,Object>();
-    	
-    	Iterator<Entry<ValueEditorPane, String>> entryIt = this.editorNameMap.entrySet().iterator();
-    	while(entryIt.hasNext()) {
-    		java.util.Map.Entry<ValueEditorPane, String> entry = entryIt.next();
-    		ValueEditorPane editor = entry.getKey();
-    		String parameterName = entry.getValue();
-    		
-    		Object editorStringValue = editor.update();
-    		nameValueMap.put(parameterName, editorStringValue);
-    	}
-    	
-    	return nameValueMap;
+    public Map<String, Object> update() {
+
+        java.util.Map<String, Object> nameValueMap = new java.util.HashMap<String, Object>();
+
+        Iterator<Entry<ValueEditorPane, String>> entryIt = this.editorNameMap.entrySet().iterator();
+        while (entryIt.hasNext()) {
+            java.util.Map.Entry<ValueEditorPane, String> entry = entryIt.next();
+            ValueEditorPane editor = entry.getKey();
+            String parameterName = entry.getValue();
+
+            Object editorStringValue = editor.update();
+            nameValueMap.put(parameterName, editorStringValue);
+        }
+
+        return nameValueMap;
+    }
+
+    public void checkValid() throws Exception {
+        if (!allowBlank) {
+            boolean valid = true;
+            String error = "";
+            Iterator<Entry<ValueEditorPane, String>> entryIt = this.editorNameMap.entrySet().iterator();
+            while (entryIt.hasNext()) {
+                java.util.Map.Entry<ValueEditorPane, String> entry = entryIt.next();
+                ValueEditorPane editor = entry.getKey();
+                String parameterName = entry.getValue();
+                Object editorStringValue = editor.update();
+                if (editorStringValue == null || StringUtils.isEmpty(Utils.objectToString(editorStringValue))) {
+                    valid = false;
+                    error += parameterName + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Not_Null_Des") + "\n";
+                }
+            }
+            if (!valid) {
+                throw new Exception(error);
+            }
+        }
     }
 
-	public void checkValid() throws Exception {
-		if (!allowBlank) {
-			boolean valid = true;
-			String error = "";
-			Iterator<Entry<ValueEditorPane, String>> entryIt = this.editorNameMap.entrySet().iterator();
-			while (entryIt.hasNext()) {
-				java.util.Map.Entry<ValueEditorPane, String> entry = entryIt.next();
-				ValueEditorPane editor = entry.getKey();
-				String parameterName = entry.getValue();
-				Object editorStringValue = editor.update();
-				if (editorStringValue == null || StringUtils.isEmpty(Utils.objectToString(editorStringValue))) {
-					valid = false;
-					error += parameterName + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Not_Null_Des") + "\n";
-				}
-			}
-			if (!valid) {
-				throw new Exception(error);
-			}
-		}
-	}
-    
     /**
      * The class help to flowlayout components
      */
     private static class FlowTableLayoutHelper {
-    	private List<UILabel> labelList = new ArrayList<UILabel>();
+        private List<UILabel> labelList = new ArrayList<UILabel>();
 
-    	public FlowTableLayoutHelper() {
-    	}
+        public FlowTableLayoutHelper() {
+        }
 
-    	public JPanel createLabelFlowPane(String text, JComponent comp) {
-    		JPanel centerPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
+        public JPanel createLabelFlowPane(String text, JComponent comp) {
+            JPanel centerPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
 
-    		UILabel textLabel = new UILabel(text);
-    		centerPane.add(textLabel);
-    		textLabel.setHorizontalAlignment(SwingConstants.LEFT);
+            UILabel textLabel = new UILabel(text);
+            centerPane.add(textLabel);
+            textLabel.setHorizontalAlignment(SwingConstants.LEFT);
 
-    		this.labelList.add(textLabel);
-    		centerPane.add(comp);
+            this.labelList.add(textLabel);
+            centerPane.add(comp);
 
-    		return centerPane;
-    	}
+            return centerPane;
+        }
 
-    	public void adjustLabelWidth() {
-    		int maxWidth = 0;
+        public void adjustLabelWidth() {
+            int maxWidth = 0;
 
-    		for (int i = 0; i < labelList.size(); i++) {
-    			maxWidth = Math.max(maxWidth, labelList.get(i).getPreferredSize().width);
-    		}
+            for (int i = 0; i < labelList.size(); i++) {
+                maxWidth = Math.max(maxWidth, labelList.get(i).getPreferredSize().width);
+            }
 
-    		for (int i = 0; i < labelList.size(); i++) {
-    			UILabel label = labelList.get(i);
+            for (int i = 0; i < labelList.size(); i++) {
+                UILabel label = labelList.get(i);
 
-    			Dimension labelDim = new Dimension(maxWidth, label.getPreferredSize().height);
+                Dimension labelDim = new Dimension(maxWidth, label.getPreferredSize().height);
 
-    			label.setPreferredSize(labelDim);
-    			label.setSize(labelDim);
-    			label.setMinimumSize(labelDim);
-    		}
-    	}
+                label.setPreferredSize(labelDim);
+                label.setSize(labelDim);
+                label.setMinimumSize(labelDim);
+            }
+        }
     }
-}
+}

designer-base/src/main/java/com/fr/design/update/ui/dialog/UpdateMainDialog.java

@@ -544,7 +544,7 @@ public class UpdateMainDialog extends UIDialog {
     private void showDownLoadInfo() {
         //形如 Build#release-2018.07.31.03.03.52.80
         String buildNO = downloadFileConfig.optString("buildNO");
-        Date jarDate = (new SimpleDateFormat("yyyy.MM.dd")).parse(buildNO, new ParsePosition(buildNO.indexOf("-") + 1));
+        Date jarDate = (new SimpleDateFormat("yyyy.MM.dd.HH.mm.ss")).parse(buildNO, new ParsePosition(buildNO.indexOf("-") + 1));
         String serverVersionNO = downloadFileConfig.optString("versionNO");
         String currentVersionNO = ProductConstants.RELEASE_VERSION;
         String[] serverVersionSplitStr = serverVersionNO.split("\\.");
@@ -556,8 +556,8 @@ public class UpdateMainDialog extends UIDialog {
         //形如 Build#release-2018.07.31.03.03.52.80
         String currentNO = GeneralUtils.readBuildNO();
         if (!".".equals(StableUtils.getInstallHome())) {
-            Date currentDate = (new SimpleDateFormat("yyyy.MM.dd")).parse(currentNO, new ParsePosition(currentNO.indexOf("-") + 1));
-            if (DateUtils.subtractDate(jarDate, currentDate, DateUtils.DAY) > 0) {
+            Date currentDate = (new SimpleDateFormat("yyyy.MM.dd.HH.mm.ss")).parse(currentNO, new ParsePosition(currentNO.indexOf("-") + 1));
+            if (DateUtils.subtractDate(jarDate, currentDate, DateUtils.SECOND) > 0) {
                 updateButton.setEnabled(true);
                 updateLabel.setVisible(true);
                 loadingLabel.stopLoading(buildNO.contains("-") ? buildNO.substring(buildNO.lastIndexOf("-") + 1) : buildNO);

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

@@ -19,10 +19,10 @@ import com.fr.stable.ArrayUtils;
 import com.fr.stable.CommonCodeUtils;
 import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
+import com.fr.stable.os.OperatingSystem;
 import com.fr.start.ServerStarter;
 import com.fr.workspace.WorkContext;
 
-import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
 import java.awt.Desktop;
@@ -31,7 +31,6 @@ import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
@@ -83,6 +82,7 @@ public class DesignUtils {
     /**
      * 判断设计器端口是否被其他程序占用
      * 尝试去通信，无回应就是其他程序占用端口，否则需要继续判断是否为设计器进程未关闭
+     *
      * @return
      */
     public static boolean isPortOccupied() {
@@ -153,7 +153,7 @@ public class DesignUtils {
             return;
         }
         try (Socket socket = new Socket("localhost", port)) {
-             clientSend(lines, socket);
+            clientSend(lines, socket);
         } catch (Exception ignore) {
 
         }
@@ -189,10 +189,10 @@ public class DesignUtils {
                                     DesignerEnvManager.getEnvManager().setCurrentEnv2Default();
                                     ServerStarter.browserDemoURL();
                                 } else if ("check".equals(line)) {
-                                    clientSend(new String[] {"response"}, socket);
+                                    clientSend(new String[]{"response"}, socket);
                                 } else if ("end".equals(line)) {
-                                    DesignerExiter.getInstance().execute();                                }
-                                else if (StringUtils.isNotEmpty(line)) {
+                                    DesignerExiter.getInstance().execute();
+                                } else if (StringUtils.isNotEmpty(line)) {
                                     File f = new File(line);
                                     String path = f.getAbsolutePath();
 
@@ -219,7 +219,7 @@ public class DesignUtils {
 
     }
 
-    public static void  responseToClient(Socket socket) {
+    public static void responseToClient(Socket socket) {
         try (OutputStream outputStream = socket.getOutputStream()) {
             outputStream.write("reponse".getBytes(StandardCharsets.UTF_8));
             outputStream.flush();
@@ -285,13 +285,20 @@ public class DesignUtils {
         return key.startsWith("TextField.") || key.startsWith("PasswordField.");
     }
 
+    /**
+     * 获取当前系统语言下设计器用的默认字体
+     *
+     * @return 默认字体
+     */
     private static FRFont getCurrentLocaleFont() {
         FRFont guiFRFont;
         Locale defaultLocale = Locale.getDefault();
-
-        if (isDisplaySimSun(defaultLocale)) {
+        // JDK9 之后宋体在计算label中字母的空间上出现问题，暂时先用雅黑兼容，以后再统一字体
+        if (StableUtils.getMajorJavaVersion() >= 9 && OperatingSystem.isWindows()) {
+            guiFRFont = getNamedFont("Microsoft YaHei");
+        } else if (isDisplaySimSun(defaultLocale)) {
             guiFRFont = getNamedFont("SimSun");
-        }  else {
+        } else {
             guiFRFont = getNamedFont("Dialog");
         }
 

designer-base/src/main/java/com/fr/design/web/CustomIconPane.java

@@ -4,6 +4,7 @@ import com.fr.base.BaseUtils;
 import com.fr.base.GraphHelper;
 import com.fr.base.Icon;
 import com.fr.base.IconManager;
+import com.fr.design.designer.IntervalConstants;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.dialog.FineJOptionPane;
@@ -401,9 +402,9 @@ public class CustomIconPane extends BasicPane {
         private void init() {
             this.setLayout(FRGUIPaneFactory.createBorderLayout());
             double p = TableLayout.PREFERRED;
-            double rowSize[] = {p, p};
-            double columnSize[] = {p, p, p};
-
+            double[] rowSize = {p, p};
+            double[] columnSize = {p, p};
+            int[][] rowCount = {{1, 1}, {1, 1}};
             UIButton browseButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Icon_SelectIcon"));
             browseButton.setPreferredSize(new Dimension(80, 25));
             browseButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Click_this_button"));
@@ -442,7 +443,7 @@ public class CustomIconPane extends BasicPane {
             imagePane.add(browseButton);
             Component[][] components = {{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Name") + ":"), nameTextField}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Icon") + ":"), imagePane}};
 
-            JPanel centerPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
+            JPanel centerPane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W0, IntervalConstants.INTERVAL_L1);
             this.add(centerPane, BorderLayout.CENTER);
         }
 

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

@@ -1,7 +1,5 @@
 package com.fr.env;
 
-import com.fr.base.FRContext;
-import com.fr.base.ServerConfig;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.beans.BasicBeanPane;
@@ -444,38 +442,6 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
                 new double[]{FILL}
         ));
 
-        setDefaultAppAndServlet();
-    }
-
-    /**
-     * 设置 app 和 servlet 默认值
-     */
-    private void setDefaultAppAndServlet() {
-        setWrap(webAppNameInput, () -> FRContext.getCommonOperator().getAppName(), RemoteWorkspaceURL.DEFAULT_WEB_APP_NAME);
-        setWrap(servletNameInput, () -> ServerConfig.getInstance().getServletName(), RemoteWorkspaceURL.DEFAULT_SERVLET_NAME);
-    }
-
-    private void setWrap(final UITextField textField, final Supplier<String> supplier, final String defaultName) {
-        new SwingWorker<String, Void>() {
-
-            @Override
-            protected String doInBackground() throws Exception {
-                return supplier.get();
-            }
-
-            @Override
-            protected void done() {
-                String name = defaultName;
-                try {
-                    name = get();
-                } catch (Exception e) {
-                    FineLoggerFactory.getLogger().error(e.getMessage() , e);
-                }
-                if (StringUtils.isEmpty(textField.getText())) {
-                    textField.setText(name);
-                }
-            }
-        }.execute();
     }
 
 

designer-chart/src/main/java/com/fr/van/chart/box/VanChartBoxTooltipContentPane.java

@@ -1,19 +1,28 @@
 package com.fr.van.chart.box;
 
+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.plugin.chart.base.AttrTooltipContent;
+import com.fr.plugin.chart.base.format.AttrTooltipCategoryFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipSeriesFormat;
 import com.fr.plugin.chart.box.attr.AttrBoxTooltipContent;
+import com.fr.van.chart.designer.TableLayout4VanChartHelper;
 import com.fr.van.chart.designer.component.VanChartTooltipContentPane;
 import com.fr.van.chart.designer.component.format.CategoryNameFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.CategoryNameFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.SeriesNameFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.SeriesNameFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.VanChartFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.VanChartFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
 import javax.swing.JPanel;
 import java.awt.BorderLayout;
 import java.awt.Component;
+import java.util.Map;
 
 public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
 
@@ -27,6 +36,14 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
     private VanChartFormatPaneWithCheckBox min;
     private VanChartFormatPaneWithCheckBox outlier;
 
+    private VanChartFormatPaneWithoutCheckBox richTextNumber;
+    private VanChartFormatPaneWithoutCheckBox richTextMax;
+    private VanChartFormatPaneWithoutCheckBox richTextQ3;
+    private VanChartFormatPaneWithoutCheckBox richTextMedian;
+    private VanChartFormatPaneWithoutCheckBox richTextQ1;
+    private VanChartFormatPaneWithoutCheckBox richTextMin;
+    private VanChartFormatPaneWithoutCheckBox richTextOutlier;
+
     private JPanel dataNumberPane;
     private JPanel dataOutlierPane;
 
@@ -36,8 +53,8 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
     }
 
     protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) {
-        categoryNameFormatPane = new CategoryNameFormatPaneWithCheckBox(parent, showOnPane);
-        seriesNameFormatPane = new SeriesNameFormatPaneWithCheckBox(parent, showOnPane);
+        setCategoryNameFormatPane(new CategoryNameFormatPaneWithCheckBox(parent, showOnPane));
+        setSeriesNameFormatPane(new SeriesNameFormatPaneWithCheckBox(parent, showOnPane));
 
         number = new VanChartFormatPaneWithCheckBox(parent, showOnPane) {
             protected String getCheckBoxText() {
@@ -76,7 +93,48 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
         };
     }
 
-    protected JPanel createCommonPanel() {
+    protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
+        setRichTextCategoryNameFormatPane(new CategoryNameFormatPaneWithoutCheckBox(parent, showOnPane));
+        setRichTextSeriesNameFormatPane(new SeriesNameFormatPaneWithoutCheckBox(parent, showOnPane));
+
+        richTextNumber = new VanChartFormatPaneWithoutCheckBox(parent, showOnPane) {
+            protected String getCheckBoxText() {
+                return Toolkit.i18nText("Fine-Design_Chart_Data_Number");
+            }
+        };
+        richTextMax = new VanChartFormatPaneWithoutCheckBox(parent, showOnPane) {
+            protected String getCheckBoxText() {
+                return Toolkit.i18nText("Fine-Design_Chart_Max_Value");
+            }
+        };
+        richTextQ3 = new VanChartFormatPaneWithoutCheckBox(parent, showOnPane) {
+            protected String getCheckBoxText() {
+                return Toolkit.i18nText("Fine-Design_Chart_Data_Q3");
+            }
+        };
+        richTextMedian = new VanChartFormatPaneWithoutCheckBox(parent, showOnPane) {
+            protected String getCheckBoxText() {
+                return Toolkit.i18nText("Fine-Design_Chart_Data_Median");
+            }
+        };
+        richTextQ1 = new VanChartFormatPaneWithoutCheckBox(parent, showOnPane) {
+            protected String getCheckBoxText() {
+                return Toolkit.i18nText("Fine-Design_Chart_Data_Q1");
+            }
+        };
+        richTextMin = new VanChartFormatPaneWithoutCheckBox(parent, showOnPane) {
+            protected String getCheckBoxText() {
+                return Toolkit.i18nText("Fine-Design_Chart_Min_Value");
+            }
+        };
+        richTextOutlier = new VanChartFormatPaneWithoutCheckBox(parent, showOnPane) {
+            protected String getCheckBoxText() {
+                return Toolkit.i18nText("Fine-Design_Chart_Outlier_Value");
+            }
+        };
+    }
+
+    protected JPanel createCommonFormatPanel() {
         JPanel commonPanel = new JPanel(new BorderLayout());
 
         commonPanel.add(createCateAndSeriesPane(), BorderLayout.NORTH);
@@ -86,6 +144,20 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
         return commonPanel;
     }
 
+    protected Component[][] getRichTextComponents() {
+        return new Component[][]{
+                new Component[]{getRichTextCategoryNameFormatPane(), null},
+                new Component[]{getRichTextSeriesNameFormatPane(), null},
+                new Component[]{richTextNumber, null},
+                new Component[]{richTextMax, null},
+                new Component[]{richTextQ3, null},
+                new Component[]{richTextMedian, null},
+                new Component[]{richTextQ1, null},
+                new Component[]{richTextMin, null},
+                new Component[]{richTextOutlier, null}
+        };
+    }
+
     protected double[] getRowSize(double p) {
         return new double[]{p, p, p, p, p, p, p, p, p, p, p, p};
     }
@@ -93,13 +165,15 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
     private JPanel createCateAndSeriesPane() {
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
+        double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
 
-        double[] columnSize = {f, p};
-        double[] rowSize = {p, p};
+        double[] columnSize = {f, e};
+        double[] rowSize = {p, p, p};
 
         Component[][] cateAndSeries = new Component[][]{
-                new Component[]{categoryNameFormatPane, null},
-                new Component[]{seriesNameFormatPane, null}
+                new Component[]{null, null},
+                new Component[]{null, getCategoryNameFormatPane()},
+                new Component[]{null, getSeriesNameFormatPane()}
         };
 
         return TableLayoutHelper.createTableLayoutPane(cateAndSeries, rowSize, columnSize);
@@ -108,13 +182,14 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
     private JPanel createDataNumberPane() {
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
+        double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
 
-        double[] columnSize = {f, p};
+        double[] columnSize = {f, e};
         double[] rowSize = {p, p};
 
         Component[][] dataNumber = new Component[][]{
                 new Component[]{null, null},
-                new Component[]{number, null},
+                new Component[]{null, number},
         };
 
         dataNumberPane = TableLayoutHelper.createTableLayoutPane(dataNumber, rowSize, columnSize);
@@ -125,22 +200,24 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
     private JPanel createDataDetailPane() {
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
-        double[] columnSize = {f, p};
+        double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
+
+        double[] columnSize = {f, e};
 
         JPanel detailPane = new JPanel(new BorderLayout());
 
         Component[][] dataDetail = new Component[][]{
                 new Component[]{null, null},
-                new Component[]{max, null},
-                new Component[]{q3, null},
-                new Component[]{median, null},
-                new Component[]{q1, null},
-                new Component[]{min, null}
+                new Component[]{null, max},
+                new Component[]{new UILabel(getLabelContentTitle()), q3},
+                new Component[]{null, median},
+                new Component[]{null, q1},
+                new Component[]{null, min}
         };
 
         Component[][] dataOutlier = new Component[][]{
                 new Component[]{null, null},
-                new Component[]{outlier, null},
+                new Component[]{null, outlier},
         };
 
         dataOutlierPane = TableLayoutHelper.createTableLayoutPane(dataOutlier, new double[]{p, p}, columnSize);
@@ -152,8 +229,8 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
     }
 
     public boolean isDirty() {
-        return categoryNameFormatPane.isDirty()
-                || seriesNameFormatPane.isDirty()
+        return getCategoryNameFormatPane().isDirty()
+                || getSeriesNameFormatPane().isDirty()
                 || number.isDirty()
                 || max.isDirty()
                 || q3.isDirty()
@@ -164,8 +241,8 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
     }
 
     public void setDirty(boolean isDirty) {
-        categoryNameFormatPane.setDirty(isDirty);
-        seriesNameFormatPane.setDirty(isDirty);
+        getCategoryNameFormatPane().setDirty(isDirty);
+        getSeriesNameFormatPane().setDirty(isDirty);
         number.setDirty(isDirty);
         max.setDirty(isDirty);
         q3.setDirty(isDirty);
@@ -180,8 +257,8 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
     }
 
     protected void populateFormatPane(AttrTooltipContent attrTooltipContent) {
-        categoryNameFormatPane.populate(attrTooltipContent.getCategoryFormat());
-        seriesNameFormatPane.populate(attrTooltipContent.getSeriesFormat());
+        getCategoryNameFormatPane().populate(attrTooltipContent.getCategoryFormat());
+        getSeriesNameFormatPane().populate(attrTooltipContent.getSeriesFormat());
 
         if (attrTooltipContent instanceof AttrBoxTooltipContent) {
             AttrBoxTooltipContent boxTooltipContent = (AttrBoxTooltipContent) attrTooltipContent;
@@ -198,9 +275,43 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
         }
     }
 
+    protected void populateRichEditor(AttrTooltipContent attrTooltipContent) {
+        Map<String, String> params = getRichTextAttr().getParams();
+
+        AttrTooltipCategoryFormat categoryFormat = attrTooltipContent.getRichTextCategoryFormat();
+        getRichTextCategoryNameFormatPane().populate(categoryFormat);
+        getRichTextCategoryNameFormatPane().updateFormatParams(params, categoryFormat.getJs());
+
+        AttrTooltipSeriesFormat seriesFormat = attrTooltipContent.getRichTextSeriesFormat();
+        getRichTextSeriesNameFormatPane().populate(seriesFormat);
+        getRichTextSeriesNameFormatPane().updateFormatParams(params, seriesFormat.getJs());
+
+        if (attrTooltipContent instanceof AttrBoxTooltipContent) {
+            AttrBoxTooltipContent boxTooltipContent = (AttrBoxTooltipContent) attrTooltipContent;
+
+            VanChartFormatPaneWithoutCheckBox[] formatPaneGroup = new VanChartFormatPaneWithoutCheckBox[]{
+                    richTextNumber, richTextMax, richTextQ3, richTextMedian,
+                    richTextQ1, richTextMin, richTextOutlier
+            };
+
+            AttrTooltipFormat[] formatGroup = new AttrTooltipFormat[]{
+                    boxTooltipContent.getRichTextNumber(),
+                    boxTooltipContent.getRichTextMax(),
+                    boxTooltipContent.getRichTextQ3(),
+                    boxTooltipContent.getRichTextMedian(),
+                    boxTooltipContent.getRichTextQ1(),
+                    boxTooltipContent.getRichTextMin(),
+                    boxTooltipContent.getRichTextOutlier()
+            };
+
+            populateRichTextFormat(formatPaneGroup, formatGroup);
+            populateRichText(attrTooltipContent.getRichTextAttr());
+        }
+    }
+
     protected void updateFormatPane(AttrTooltipContent attrTooltipContent) {
-        categoryNameFormatPane.update(attrTooltipContent.getCategoryFormat());
-        seriesNameFormatPane.update(attrTooltipContent.getSeriesFormat());
+        getCategoryNameFormatPane().update(attrTooltipContent.getCategoryFormat());
+        getSeriesNameFormatPane().update(attrTooltipContent.getSeriesFormat());
 
         if (attrTooltipContent instanceof AttrBoxTooltipContent) {
             AttrBoxTooltipContent boxTooltipContent = (AttrBoxTooltipContent) attrTooltipContent;
@@ -217,6 +328,23 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
         }
     }
 
+    protected void updateRichEditor(AttrTooltipContent attrTooltipContent) {
+        getRichTextCategoryNameFormatPane().update(attrTooltipContent.getRichTextCategoryFormat());
+        getRichTextSeriesNameFormatPane().update(attrTooltipContent.getRichTextSeriesFormat());
+
+        if (attrTooltipContent instanceof AttrBoxTooltipContent) {
+            AttrBoxTooltipContent boxTooltipContent = (AttrBoxTooltipContent) attrTooltipContent;
+
+            richTextNumber.update(boxTooltipContent.getRichTextNumber());
+            richTextMax.update(boxTooltipContent.getRichTextMax());
+            richTextQ3.update(boxTooltipContent.getRichTextQ3());
+            richTextMedian.update(boxTooltipContent.getRichTextMedian());
+            richTextQ1.update(boxTooltipContent.getRichTextQ1());
+            richTextMin.update(boxTooltipContent.getRichTextMin());
+            richTextOutlier.update(boxTooltipContent.getRichTextOutlier());
+        }
+    }
+
     public void checkFormatVisible(boolean detailed) {
         this.detailed = detailed;
 

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

@@ -0,0 +1,17 @@
+package com.fr.van.chart.column;
+
+import com.fr.chart.chartattr.Plot;
+import com.fr.plugin.chart.column.VanChartColumnPlot;
+import com.fr.van.chart.designer.style.VanChartStylePane;
+import com.fr.van.chart.designer.style.label.VanChartPlotLabelDetailPane;
+
+public class VanChartColumnPlotLabelDetailPane extends VanChartPlotLabelDetailPane {
+
+    public VanChartColumnPlotLabelDetailPane(Plot plot, VanChartStylePane parent) {
+        super(plot, parent);
+    }
+
+    protected boolean hasLabelOrientationPane() {
+        return !((VanChartColumnPlot) this.getPlot()).isBar();
+    }
+}

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

@@ -0,0 +1,20 @@
+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/VanChartCustomStackAndAxisConditionPane.java

@@ -6,18 +6,19 @@ import com.fr.data.condition.ListCondition;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.condition.LiteConditionPane;
 import com.fr.design.gui.ibutton.UIButtonGroup;
+import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.utils.gui.GUICoreUtils;
-
 import com.fr.plugin.chart.base.AttrSeriesStackAndAxis;
 import com.fr.van.chart.designer.style.series.VanChartSeriesConditionPane;
 
 import javax.swing.BorderFactory;
 import javax.swing.BoxLayout;
 import javax.swing.JPanel;
+import javax.swing.ScrollPaneConstants;
 import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
@@ -46,10 +47,13 @@ public class VanChartCustomStackAndAxisConditionPane extends BasicBeanPane<Condi
 
         //配置界面
         JPanel deployPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
-        this.add(deployPane);
 
         deployPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Deploy") + ":", null));
         deployPane.add(createDeployPane());
+        UIScrollPane scrollPane = new UIScrollPane(deployPane);
+        scrollPane.setBorder(BorderFactory.createEmptyBorder());
+        scrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER);
+        this.add(scrollPane);
 
         //条件界面
         JPanel conditionPane = FRGUIPaneFactory.createBorderLayout_L_Pane();

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

@@ -7,6 +7,7 @@ import com.fr.design.gui.icombobox.UIComboBoxRenderer;
 import com.fr.design.gui.style.FormatPane;
 import com.fr.general.ComparatorUtils;
 import com.fr.log.FineLoggerFactory;
+import com.fr.plugin.chart.PiePlot4VanChart;
 import com.fr.plugin.chart.area.VanChartAreaPlot;
 import com.fr.plugin.chart.bubble.VanChartBubblePlot;
 import com.fr.plugin.chart.column.VanChartColumnPlot;
@@ -23,6 +24,7 @@ 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.designer.component.VanChartLabelContentPane;
 import com.fr.van.chart.designer.component.VanChartRefreshTooltipContentPane;
 import com.fr.van.chart.designer.component.VanChartTooltipContentPane;
@@ -39,7 +41,7 @@ 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.VanChartGanttLabelContentPane;
+import com.fr.van.chart.gantt.designer.style.label.VanChartGanttPlotLabelPane;
 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;
@@ -54,10 +56,10 @@ import com.fr.van.chart.multilayer.style.VanChartMutiPieRefreshTooltipContentPan
 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.VanChartStructureLabelContentPane;
+import com.fr.van.chart.structure.desinger.style.VanChartStructurePlotLabelPane;
 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.VanChartWordCloudRefreshTootipContentPane;
+import com.fr.van.chart.wordcloud.designer.style.VanChartWordCloudRefreshTooltipContentPane;
 import com.fr.van.chart.wordcloud.designer.style.VanChartWordCloudTooltipContentPane;
 
 import javax.swing.BorderFactory;
@@ -77,7 +79,7 @@ import java.awt.Component;
  */
 public class PlotFactory {
 
-    private static Set<Class<? extends Plot>> autoAdjustLabelPlots = new HashSet<Class<? extends Plot>>();
+    private static Set<Class<? extends Plot>> autoAdjustLabelPlots = new HashSet<>();
 
     static {
         autoAdjustLabelPlots.add(VanChartColumnPlot.class);
@@ -90,15 +92,31 @@ public class PlotFactory {
         return autoAdjustLabelPlots.contains(plot.getClass());
     }
 
+    private static Set<Class<? extends Plot>> borderAndBackgroundLabelPlots = new HashSet<>();
+
+    static {
+        borderAndBackgroundLabelPlots.add(PiePlot4VanChart.class);
+        borderAndBackgroundLabelPlots.add(VanChartColumnPlot.class);
+        borderAndBackgroundLabelPlots.add(VanChartLinePlot.class);
+        borderAndBackgroundLabelPlots.add(VanChartAreaPlot.class);
+    }
+
+    public static boolean hasBorderAndBackgroundPlotLabel(Plot plot) {
+        return borderAndBackgroundLabelPlots.contains(plot.getClass());
+    }
+
     /**
      * 标签Map
      */
-    private static Map<Class<? extends Plot>, Class<? extends VanChartPlotLabelPane>> labelMap = new HashMap<Class<? extends Plot>, Class<? extends VanChartPlotLabelPane>>();
+    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);
     }
 
     /**
@@ -140,8 +158,6 @@ public class PlotFactory {
         labelContentMap.put(VanChartTreeMapPlot.class, VanChartMultiPieLabelContentPane.class);
         labelContentMap.put(VanChartFunnelPlot.class, VanChartFunnelLabelContentPane.class);
         labelContentMap.put(VanChartHeatMapPlot.class, VanChartMapLabelContentPane.class);
-        labelContentMap.put(VanChartGanttPlot.class, VanChartGanttLabelContentPane.class);
-        labelContentMap.put(VanChartStructurePlot.class, VanChartStructureLabelContentPane.class);
     }
 
     private static Map<Class<? extends Plot>, Class<? extends VanChartTooltipContentPane>> tooltipContentMap = new HashMap<Class<? extends Plot>, Class<? extends VanChartTooltipContentPane>>();
@@ -183,7 +199,7 @@ public class PlotFactory {
         refreshTooltipContentMap.put(VanChartMultiPiePlot.class, VanChartMutiPieRefreshTooltipContentPane.class);
         refreshTooltipContentMap.put(VanChartTreeMapPlot.class, VanChartMutiPieRefreshTooltipContentPane.class);
         refreshTooltipContentMap.put(VanChartFunnelPlot.class, VanChartFunnelRefreshTooltipContentPane.class);
-        refreshTooltipContentMap.put(VanChartWordCloudPlot.class, VanChartWordCloudRefreshTootipContentPane.class);
+        refreshTooltipContentMap.put(VanChartWordCloudPlot.class, VanChartWordCloudRefreshTooltipContentPane.class);
         refreshTooltipContentMap.put(VanChartStructurePlot.class, VanChartStructureRefreshTooltipContentPane.class);
 
     }

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

@@ -0,0 +1,361 @@
+package com.fr.van.chart.designer.component;
+
+import com.fr.design.beans.BasicBeanPane;
+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.layout.TableLayoutHelper;
+import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane;
+import com.fr.plugin.chart.base.AttrTooltipContent;
+import com.fr.van.chart.designer.TableLayout4VanChartHelper;
+import com.fr.van.chart.designer.component.format.CategoryNameFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.ChangedPercentFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.ChangedValueFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.PercentFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.SeriesNameFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.ValueFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.style.VanChartStylePane;
+
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.CardLayout;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+public class VanChartLabelContentPaneWithoutRichText extends BasicBeanPane<AttrTooltipContent> {
+
+    private UIButtonGroup<Integer> content;
+
+    private ValueFormatPaneWithCheckBox valueFormatPane;
+    private PercentFormatPaneWithCheckBox percentFormatPane;
+    private CategoryNameFormatPaneWithCheckBox categoryNameFormatPane;
+    private SeriesNameFormatPaneWithCheckBox seriesNameFormatPane;
+
+    //监控刷新时，自动数据点提示使用
+    private ChangedValueFormatPaneWithCheckBox changedValueFormatPane;
+    private ChangedPercentFormatPaneWithCheckBox changedPercentFormatPane;
+    private UIButtonGroup<Integer> styleButton;
+    private ChartTextAttrPane textAttrPane;
+    private JPanel centerPane;
+    private JPanel commonPanel;
+    private JPanel stylePanel;
+    private VanChartHtmlLabelPane htmlLabelPane;
+
+    private VanChartStylePane parent;
+    private JPanel showOnPane;
+
+    public VanChartLabelContentPaneWithoutRichText(VanChartStylePane parent, JPanel showOnPane) {
+        this.parent = parent;
+        this.showOnPane = showOnPane;
+
+        this.setLayout(new BorderLayout());
+        this.add(createLabelContentPane(), BorderLayout.CENTER);
+    }
+
+    public ValueFormatPaneWithCheckBox getValueFormatPane() {
+        return valueFormatPane;
+    }
+
+    public void setValueFormatPane(ValueFormatPaneWithCheckBox valueFormatPane) {
+        this.valueFormatPane = valueFormatPane;
+    }
+
+    public PercentFormatPaneWithCheckBox getPercentFormatPane() {
+        return percentFormatPane;
+    }
+
+    public void setPercentFormatPane(PercentFormatPaneWithCheckBox percentFormatPane) {
+        this.percentFormatPane = percentFormatPane;
+    }
+
+    public CategoryNameFormatPaneWithCheckBox getCategoryNameFormatPane() {
+        return categoryNameFormatPane;
+    }
+
+    public void setCategoryNameFormatPane(CategoryNameFormatPaneWithCheckBox categoryNameFormatPane) {
+        this.categoryNameFormatPane = categoryNameFormatPane;
+    }
+
+    public SeriesNameFormatPaneWithCheckBox getSeriesNameFormatPane() {
+        return seriesNameFormatPane;
+    }
+
+    public void setSeriesNameFormatPane(SeriesNameFormatPaneWithCheckBox seriesNameFormatPane) {
+        this.seriesNameFormatPane = seriesNameFormatPane;
+    }
+
+    private JPanel createLabelContentPane() {
+        content = new UIButtonGroup<>(new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_Common"),
+                Toolkit.i18nText("Fine-Design_Chart_Custom")
+        });
+
+        initFormatPane(parent, showOnPane);
+
+        double p = TableLayout.PREFERRED;
+        double f = TableLayout.FILL;
+        double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
+
+        commonPanel = createCommonPanel();
+        htmlLabelPane = createHtmlLabelPane();
+        htmlLabelPane.setParent(parent);
+        stylePanel = createTextStylePane();
+        centerPane = new JPanel(new CardLayout()) {
+            @Override
+            public Dimension getPreferredSize() {
+                if (content.getSelectedIndex() == 0) {
+                    return commonPanel.getPreferredSize();
+                } else {
+                    return new Dimension(commonPanel.getPreferredSize().width, htmlLabelPane.getPreferredSize().height);
+                }
+            }
+        };
+        centerPane.add(htmlLabelPane, Toolkit.i18nText("Fine-Design_Chart_Custom"));
+        centerPane.add(commonPanel, Toolkit.i18nText("Fine-Design_Chart_Common"));
+
+        double[] column = {f, e};
+        double[] row = {p, p, p};
+        Component[][] components = new Component[][]{
+                new Component[]{null, null},
+                new Component[]{new UILabel(getLabelContentTitle()), content},
+                new Component[]{null, centerPane},
+        };
+        initContentListener();
+        JPanel paramsPanel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, column);
+
+        JPanel contentPane = new JPanel(new BorderLayout());
+        contentPane.add(paramsPanel, BorderLayout.CENTER);
+        contentPane.add(stylePanel, BorderLayout.SOUTH);
+
+        return getLabelContentPane(contentPane);
+    }
+
+    protected boolean hasTextStylePane() {
+        return true;
+    }
+
+    private JPanel createTextStylePane() {
+        styleButton = new UIButtonGroup<>(new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_Automatic"),
+                Toolkit.i18nText("Fine-Design_Chart_Custom")
+        });
+
+        textAttrPane = new ChartTextAttrPane() {
+            protected Component[][] getComponents(JPanel buttonPane) {
+                return new Component[][]{
+                        new Component[]{null, null},
+                        new Component[]{null, getFontNameComboBox()},
+                        new Component[]{null, buttonPane}
+                };
+            }
+        };
+
+        JPanel buttonPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Toolkit.i18nText("Fine-Design_Chart_Widget_Style"), styleButton);
+
+        JPanel stylePanel = new JPanel(new BorderLayout());
+        stylePanel.add(buttonPane, BorderLayout.CENTER);
+        stylePanel.add(textAttrPane, BorderLayout.SOUTH);
+
+        initStyleButtonListener();
+
+        return stylePanel;
+    }
+
+    private void initStyleButtonListener() {
+        styleButton.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                checkStylePane();
+            }
+        });
+    }
+
+    private void checkStylePane() {
+        if (hasTextStylePane()) {
+            stylePanel.setVisible(true);
+            textAttrPane.setVisible(styleButton.getSelectedIndex() == 1);
+        } else {
+            stylePanel.setVisible(false);
+        }
+    }
+
+    protected String getLabelContentTitle() {
+        return Toolkit.i18nText("Fine-Design_Report_Text");
+    }
+
+    protected JPanel getLabelContentPane(JPanel contentPane) {
+        return createTableLayoutPaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Content"), contentPane);
+    }
+
+    protected VanChartHtmlLabelPane createHtmlLabelPane() {
+        return new VanChartHtmlLabelPane();
+    }
+
+    protected JPanel createCommonPanel() {
+        double p = TableLayout.PREFERRED;
+        double f = TableLayout.FILL;
+
+        double[] columnSize = {f, p};
+        double[] rowSize = getRowSize(p);
+
+        return TableLayoutHelper.createTableLayoutPane(getPaneComponents(), rowSize, columnSize);
+    }
+
+    protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) {
+        categoryNameFormatPane = new CategoryNameFormatPaneWithCheckBox(parent, showOnPane);
+        seriesNameFormatPane = new SeriesNameFormatPaneWithCheckBox(parent, showOnPane);
+        valueFormatPane = new ValueFormatPaneWithCheckBox(parent, showOnPane);
+        percentFormatPane = new PercentFormatPaneWithCheckBox(parent, showOnPane);
+    }
+
+    protected JPanel createTableLayoutPaneWithTitle(String title, JPanel panel) {
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(title, panel);
+    }
+
+    protected double[] getRowSize(double p) {
+        return new double[]{p, p, p, p};
+    }
+
+    protected Component[][] getPaneComponents() {
+        return new Component[][]{
+                new Component[]{categoryNameFormatPane, null},
+                new Component[]{seriesNameFormatPane, null},
+                new Component[]{valueFormatPane, null},
+                new Component[]{percentFormatPane, null},
+        };
+    }
+
+    private void initContentListener() {
+        content.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                checkCardPane();
+            }
+        });
+    }
+
+
+    private void checkCardPane() {
+        CardLayout cardLayout = (CardLayout) centerPane.getLayout();
+        if (content.getSelectedIndex() == 1) {
+            cardLayout.show(centerPane, Toolkit.i18nText("Fine-Design_Chart_Custom"));
+            if (isDirty()) {
+                setCustomFormatterText();
+                setDirty(false);
+            }
+        } else {
+            cardLayout.show(centerPane, Toolkit.i18nText("Fine-Design_Chart_Common"));
+        }
+    }
+
+    protected void setCustomFormatterText() {
+        htmlLabelPane.setCustomFormatterText(updateBean().getFormatterTextFromCommon());
+    }
+
+    public boolean isDirty() {
+        return categoryNameFormatPane.isDirty() || seriesNameFormatPane.isDirty() || valueFormatPane.isDirty() || percentFormatPane.isDirty()
+                || (changedValueFormatPane != null && changedValueFormatPane.isDirty()) || (changedValueFormatPane != null && changedPercentFormatPane.isDirty());
+    }
+
+    public void setDirty(boolean isDirty) {
+        categoryNameFormatPane.setDirty(isDirty);
+        seriesNameFormatPane.setDirty(isDirty);
+        valueFormatPane.setDirty(isDirty);
+        percentFormatPane.setDirty(isDirty);
+
+        if (changedValueFormatPane != null) {
+            changedValueFormatPane.setDirty(isDirty);
+        }
+        if (changedPercentFormatPane != null) {
+            changedPercentFormatPane.setDirty(isDirty);
+        }
+    }
+
+    @Override
+    protected String title4PopupWindow() {
+        return "";
+    }
+
+
+    @Override
+    public void populateBean(AttrTooltipContent attrTooltipContent) {
+        if (attrTooltipContent == null) {
+            return;
+        }
+
+        content.setSelectedIndex(attrTooltipContent.isCommon() ? 0 : 1);
+
+        populateFormatPane(attrTooltipContent);
+
+        htmlLabelPane.populate(attrTooltipContent.getHtmlLabel());
+        if (!attrTooltipContent.isCommon()) {
+            setDirty(false);
+        }
+        if (hasTextStylePane()) {
+            this.styleButton.setSelectedIndex(attrTooltipContent.isCustom() ? 1 : 0);
+            this.textAttrPane.populate(attrTooltipContent.getTextAttr());
+        }
+        checkCardPane();
+        checkStylePane();
+    }
+
+    protected void populateFormatPane(AttrTooltipContent attrTooltipContent) {
+        categoryNameFormatPane.populate(attrTooltipContent.getCategoryFormat());
+        seriesNameFormatPane.populate(attrTooltipContent.getSeriesFormat());
+        valueFormatPane.populate(attrTooltipContent.getValueFormat());
+        percentFormatPane.populate(attrTooltipContent.getPercentFormat());
+
+        if (changedValueFormatPane != null) {
+            changedValueFormatPane.populate(attrTooltipContent.getChangedValueFormat());
+        }
+        if (changedPercentFormatPane != null) {
+            changedPercentFormatPane.populate(attrTooltipContent.getChangedPercentFormat());
+        }
+    }
+
+    public AttrTooltipContent updateBean() {
+        AttrTooltipContent attrTooltipContent = createAttrTooltip();
+
+        attrTooltipContent.setCommon(content.getSelectedIndex() == 0);
+
+        updateFormatPane(attrTooltipContent);
+
+        updateFormatsWithPaneWidth(attrTooltipContent);
+
+        htmlLabelPane.update(attrTooltipContent.getHtmlLabel());
+
+        if (hasTextStylePane()) {
+            attrTooltipContent.setCustom(styleButton.getSelectedIndex() == 1);
+            attrTooltipContent.setTextAttr(this.textAttrPane.update());
+        }
+
+        return attrTooltipContent;
+    }
+
+    protected AttrTooltipContent createAttrTooltip() {
+        return new AttrTooltipContent();
+    }
+
+    protected void updateFormatPane(AttrTooltipContent attrTooltipContent) {
+        categoryNameFormatPane.update(attrTooltipContent.getCategoryFormat());
+        seriesNameFormatPane.update(attrTooltipContent.getSeriesFormat());
+        valueFormatPane.update(attrTooltipContent.getValueFormat());
+        percentFormatPane.update(attrTooltipContent.getPercentFormat());
+
+        if (changedValueFormatPane != null) {
+            changedValueFormatPane.update(attrTooltipContent.getChangedValueFormat());
+        }
+        if (changedPercentFormatPane != null) {
+            changedPercentFormatPane.update(attrTooltipContent.getChangedPercentFormat());
+        }
+    }
+
+    private void updateFormatsWithPaneWidth(AttrTooltipContent attrTooltipContent) {
+        int paneWidth = seriesNameFormatPane.getWidth();
+        if (paneWidth == 0) {
+            attrTooltipContent.getSeriesFormat().setEnable(false);
+        }
+    }
+}

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

@@ -1,7 +1,9 @@
 package com.fr.van.chart.designer.component;
 
 import com.fr.van.chart.designer.component.format.ChangedPercentFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.ChangedPercentFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.ChangedValueFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.ChangedValueFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
 import javax.swing.JPanel;
@@ -24,18 +26,37 @@ public class VanChartRefreshTooltipContentPane extends VanChartTooltipContentPan
     protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) {
         super.initFormatPane(parent, showOnPane);
 
-        changedValueFormatPane = new ChangedValueFormatPaneWithCheckBox(parent, showOnPane);
-        changedPercentFormatPane = new ChangedPercentFormatPaneWithCheckBox(parent, showOnPane);
+        setChangedValueFormatPane(new ChangedValueFormatPaneWithCheckBox(parent, showOnPane));
+        setChangedPercentFormatPane(new ChangedPercentFormatPaneWithCheckBox(parent, showOnPane));
+    }
+
+    @Override
+    protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
+        super.initRichTextFormatPane(parent, showOnPane);
+
+        setRichTextChangedValueFormatPane(new ChangedValueFormatPaneWithoutCheckBox(parent, showOnPane));
+        setRichTextChangedPercentFormatPane(new ChangedPercentFormatPaneWithoutCheckBox(parent, showOnPane));
     }
 
     protected Component[][] getPaneComponents(){
         return new Component[][]{
-                new Component[]{categoryNameFormatPane,null},
-                new Component[]{seriesNameFormatPane,null},
-                new Component[]{valueFormatPane,null},
-                new Component[]{changedValueFormatPane,null},
-                new Component[]{percentFormatPane,null},
-                new Component[]{changedPercentFormatPane,null},
+                new Component[]{getCategoryNameFormatPane(), null},
+                new Component[]{getSeriesNameFormatPane(), null},
+                new Component[]{getValueFormatPane(), null},
+                new Component[]{getChangedValueFormatPane(), null},
+                new Component[]{getPercentFormatPane(), null},
+                new Component[]{getChangedPercentFormatPane(), null},
+        };
+    }
+
+    protected Component[][] getRichTextComponents() {
+        return new Component[][]{
+                new Component[]{getRichTextCategoryNameFormatPane(), null},
+                new Component[]{getRichTextSeriesNameFormatPane(), null},
+                new Component[]{getRichTextValueFormatPane(), null},
+                new Component[]{getRichTextChangedValueFormatPane(), null},
+                new Component[]{getRichTextPercentFormatPane(), null},
+                new Component[]{getRichTextChangedPercentFormatPane(), null}
         };
     }
 

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

@@ -8,9 +8,6 @@ import com.teamdev.jxbrowser.chromium.JSValue;
 import com.teamdev.jxbrowser.chromium.events.ScriptContextAdapter;
 import com.teamdev.jxbrowser.chromium.events.ScriptContextEvent;
 
-import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 
 public class VanChartRichEditorPane {
@@ -75,23 +72,6 @@ public class VanChartRichEditorPane {
         return new RichEditorModel(richText.getContent(), richText.isAuto(), paramsStr.toString());
     }
 
-    public static List<String> richParamsParser(String content, Map<String, String> paramsMap) {
-        if (content == null || paramsMap == null) {
-            return null;
-        }
-
-        List<String> result = new ArrayList<>();
-
-        for (Map.Entry<String, String> entry : paramsMap.entrySet()) {
-            String param = entry.getValue();
-            if (content.contains(URLEncoder.encode(param))) {
-                result.add(param);
-            }
-        }
-
-        return result;
-    }
-
     public static class RichEditorModel {
         private String content;
         private boolean auto;

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

@@ -9,19 +9,26 @@ 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.mainframe.chart.gui.style.ChartTextAttrPane;
 import com.fr.design.ui.ModernUIPane;
-import com.fr.general.ComparatorUtils;
 import com.fr.plugin.chart.base.AttrTooltipContent;
 import com.fr.plugin.chart.base.AttrTooltipRichText;
 import com.fr.plugin.chart.base.format.AttrTooltipFormat;
 import com.fr.van.chart.designer.TableLayout4VanChartHelper;
 import com.fr.van.chart.designer.component.format.CategoryNameFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.CategoryNameFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.ChangedPercentFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.ChangedPercentFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.ChangedValueFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.ChangedValueFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.PercentFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.PercentFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.SeriesNameFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.SeriesNameFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.ValueFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.ValueFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.VanChartFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.VanChartFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
 import javax.swing.JComponent;
@@ -36,28 +43,39 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.util.List;
 
 /**
- * 内容界面 。数据点提示
+ * 数据点提示内容界面，含有通用设置、富文本编辑器、自定义JS界面
  */
 public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent> {
 
     private static final long serialVersionUID = 8825929000117843641L;
 
-    protected UIButtonGroup<Integer> content;
-    protected ValueFormatPaneWithCheckBox valueFormatPane;
-    protected PercentFormatPaneWithCheckBox percentFormatPane;
-    protected CategoryNameFormatPaneWithCheckBox categoryNameFormatPane;
-    protected SeriesNameFormatPaneWithCheckBox seriesNameFormatPane;
+    private UIButtonGroup<Integer> content;
+
+    private CategoryNameFormatPaneWithCheckBox categoryNameFormatPane;
+    private SeriesNameFormatPaneWithCheckBox seriesNameFormatPane;
+    private ValueFormatPaneWithCheckBox valueFormatPane;
+    private PercentFormatPaneWithCheckBox percentFormatPane;
 
     //监控刷新时，自动数据点提示使用
-    protected ChangedValueFormatPaneWithCheckBox changedValueFormatPane;
-    protected ChangedPercentFormatPaneWithCheckBox changedPercentFormatPane;
+    private ChangedValueFormatPaneWithCheckBox changedValueFormatPane;
+    private ChangedPercentFormatPaneWithCheckBox changedPercentFormatPane;
+
+    private CategoryNameFormatPaneWithoutCheckBox richTextCategoryNameFormatPane;
+    private SeriesNameFormatPaneWithoutCheckBox richTextSeriesNameFormatPane;
+    private ValueFormatPaneWithoutCheckBox richTextValueFormatPane;
+    private PercentFormatPaneWithoutCheckBox richTextPercentFormatPane;
+    private ChangedValueFormatPaneWithoutCheckBox richTextChangedValueFormatPane;
+    private ChangedPercentFormatPaneWithoutCheckBox richTextChangedPercentFormatPane;
 
-    private JPanel centerPane;
+    private JPanel centerPanel;
     private JPanel commonPanel;
-    private JPanel editorPane;
+    private JPanel editorPanel;
+    private JPanel htmlPanel;
+    private JPanel stylePanel;
+    private UIButtonGroup<Integer> styleButton;
+    private ChartTextAttrPane textAttrPane;
     private VanChartHtmlLabelPane htmlLabelPane;
 
     private VanChartStylePane parent;
@@ -65,68 +83,159 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
 
     private AttrTooltipRichText richText;
 
-    public VanChartTooltipContentPane(VanChartStylePane parent, JPanel showOnPane){
+    public VanChartTooltipContentPane(VanChartStylePane parent, JPanel showOnPane) {
         this.parent = parent;
         this.showOnPane = showOnPane;
         this.richText = new AttrTooltipRichText();
 
+        initFormatPane(parent, showOnPane);
+        initRichTextFormatPane(parent, showOnPane);
+
         this.setLayout(new BorderLayout());
-        this.add(createLabelContentPane(),BorderLayout.CENTER);
+        this.add(createLabelContentPane(), BorderLayout.CENTER);
     }
 
-    private JPanel createLabelContentPane() {
-        content = new UIButtonGroup<>(new String[]{
-                Toolkit.i18nText("Fine-Design_Chart_Common"),
-                Toolkit.i18nText("Fine-Design_Chart_Custom")
-        });
+    public CategoryNameFormatPaneWithCheckBox getCategoryNameFormatPane() {
+        return categoryNameFormatPane;
+    }
 
-        initFormatPane(parent, showOnPane);
+    public void setCategoryNameFormatPane(CategoryNameFormatPaneWithCheckBox categoryNameFormatPane) {
+        this.categoryNameFormatPane = categoryNameFormatPane;
+    }
 
-        double p = TableLayout.PREFERRED;
-        double f = TableLayout.FILL;
-        double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
+    public SeriesNameFormatPaneWithCheckBox getSeriesNameFormatPane() {
+        return seriesNameFormatPane;
+    }
 
-        commonPanel = createCommonPanel();
-        htmlLabelPane = createHtmlLabelPane();
-        htmlLabelPane.setParent(parent);
+    public void setSeriesNameFormatPane(SeriesNameFormatPaneWithCheckBox seriesNameFormatPane) {
+        this.seriesNameFormatPane = seriesNameFormatPane;
+    }
 
-        centerPane = new JPanel(new CardLayout()){
-            @Override
-            public Dimension getPreferredSize() {
-                if(content.getSelectedIndex() == 0){
-                    return commonPanel.getPreferredSize();
-                } else {
-                    return new Dimension(commonPanel.getPreferredSize().width,htmlLabelPane.getPreferredSize().height);
-                }
-            }
-        };
-        centerPane.add(htmlLabelPane, Toolkit.i18nText("Fine-Design_Chart_Custom"));
-        centerPane.add(commonPanel, Toolkit.i18nText("Fine-Design_Chart_Common"));
+    public ValueFormatPaneWithCheckBox getValueFormatPane() {
+        return valueFormatPane;
+    }
 
-        double[] column = {f, e};
-        double[] row = {p,p,p};
-        Component[][] components = new Component[][]{
-                new Component[]{null,null},
-                new Component[]{new UILabel(getLabelContentTitle()),content},
-                new Component[]{null,centerPane},
-        };
+    public void setValueFormatPane(ValueFormatPaneWithCheckBox valueFormatPane) {
+        this.valueFormatPane = valueFormatPane;
+    }
+
+    public PercentFormatPaneWithCheckBox getPercentFormatPane() {
+        return percentFormatPane;
+    }
+
+    public void setPercentFormatPane(PercentFormatPaneWithCheckBox percentFormatPane) {
+        this.percentFormatPane = percentFormatPane;
+    }
+
+    public ChangedValueFormatPaneWithCheckBox getChangedValueFormatPane() {
+        return changedValueFormatPane;
+    }
+
+    public void setChangedValueFormatPane(ChangedValueFormatPaneWithCheckBox changedValueFormatPane) {
+        this.changedValueFormatPane = changedValueFormatPane;
+    }
+
+    public ChangedPercentFormatPaneWithCheckBox getChangedPercentFormatPane() {
+        return changedPercentFormatPane;
+    }
+
+    public void setChangedPercentFormatPane(ChangedPercentFormatPaneWithCheckBox changedPercentFormatPane) {
+        this.changedPercentFormatPane = changedPercentFormatPane;
+    }
+
+    public CategoryNameFormatPaneWithoutCheckBox getRichTextCategoryNameFormatPane() {
+        return richTextCategoryNameFormatPane;
+    }
+
+    public void setRichTextCategoryNameFormatPane(CategoryNameFormatPaneWithoutCheckBox richTextCategoryNameFormatPane) {
+        this.richTextCategoryNameFormatPane = richTextCategoryNameFormatPane;
+    }
+
+    public SeriesNameFormatPaneWithoutCheckBox getRichTextSeriesNameFormatPane() {
+        return richTextSeriesNameFormatPane;
+    }
+
+    public void setRichTextSeriesNameFormatPane(SeriesNameFormatPaneWithoutCheckBox richTextSeriesNameFormatPane) {
+        this.richTextSeriesNameFormatPane = richTextSeriesNameFormatPane;
+    }
+
+    public ValueFormatPaneWithoutCheckBox getRichTextValueFormatPane() {
+        return richTextValueFormatPane;
+    }
+
+    public void setRichTextValueFormatPane(ValueFormatPaneWithoutCheckBox richTextValueFormatPane) {
+        this.richTextValueFormatPane = richTextValueFormatPane;
+    }
 
-        JPanel contentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, column);
+    public PercentFormatPaneWithoutCheckBox getRichTextPercentFormatPane() {
+        return richTextPercentFormatPane;
+    }
+
+    public void setRichTextPercentFormatPane(PercentFormatPaneWithoutCheckBox richTextPercentFormatPane) {
+        this.richTextPercentFormatPane = richTextPercentFormatPane;
+    }
+
+    public ChangedValueFormatPaneWithoutCheckBox getRichTextChangedValueFormatPane() {
+        return richTextChangedValueFormatPane;
+    }
+
+    public void setRichTextChangedValueFormatPane(ChangedValueFormatPaneWithoutCheckBox richTextChangedValueFormatPane) {
+        this.richTextChangedValueFormatPane = richTextChangedValueFormatPane;
+    }
 
-        // editorPane = createRichEditorPanel();
+    public ChangedPercentFormatPaneWithoutCheckBox getRichTextChangedPercentFormatPane() {
+        return richTextChangedPercentFormatPane;
+    }
+
+    public void setRichTextChangedPercentFormatPane(ChangedPercentFormatPaneWithoutCheckBox richTextChangedPercentFormatPane) {
+        this.richTextChangedPercentFormatPane = richTextChangedPercentFormatPane;
+    }
+
+    public AttrTooltipRichText getRichTextAttr() {
+        return richText;
+    }
+
+    private JPanel createLabelContentPane() {
+        initDetailPane();
+        initCenterPane();
 
-        JPanel panel = new JPanel();
-        panel.setLayout(new BorderLayout());
+        JPanel content = new JPanel(new BorderLayout());
 
-        panel.add(contentPane, BorderLayout.CENTER);
-        // panel.add(editorPane, BorderLayout.SOUTH);
+        content.add(createButtonPane(), BorderLayout.NORTH);
+        content.add(centerPanel, BorderLayout.CENTER);
+        content.add(stylePanel, BorderLayout.SOUTH);
 
         initContentListener();
 
-        return getLabelContentPane(panel);
+        return getLabelContentPane(content);
     }
 
-    protected String getLabelContentTitle () {
+    private void initDetailPane() {
+        commonPanel = createCommonFormatPanel();
+        editorPanel = createRichEditorPanel();
+        htmlPanel = createHtmlPane();
+        stylePanel = createCommonStylePane();
+    }
+
+    private void initCenterPane() {
+        centerPanel = new JPanel(new CardLayout()) {
+            public Dimension getPreferredSize() {
+                if (content.getSelectedIndex() == 0) {
+                    return commonPanel.getPreferredSize();
+                } else if (content.getSelectedIndex() == 1) {
+                    return editorPanel.getPreferredSize();
+                } else {
+                    return htmlPanel.getPreferredSize();
+                }
+            }
+        };
+
+        centerPanel.add(commonPanel, Toolkit.i18nText("Fine-Design_Chart_Common"));
+        centerPanel.add(editorPanel, Toolkit.i18nText("Fine-Design_Chart_Rich_Text"));
+        centerPanel.add(htmlPanel, Toolkit.i18nText("Fine-Design_Chart_Custom"));
+    }
+
+    protected String getLabelContentTitle() {
         return Toolkit.i18nText("Fine-Design_Report_Text");
     }
 
@@ -134,18 +243,79 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         return createTableLayoutPaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Content"), contentPane);
     }
 
-    protected VanChartHtmlLabelPane createHtmlLabelPane() {
-        return new VanChartHtmlLabelPaneWithOutWidthAndHeight();
+    private JPanel createButtonPane() {
+        double p = TableLayout.PREFERRED;
+        double f = TableLayout.FILL;
+
+        double[] column = {f, p};
+        double[] row = {p, p};
+
+        content = new UIButtonGroup<>(new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_Common"),
+                Toolkit.i18nText("Fine-Design_Chart_Rich_Text"),
+                Toolkit.i18nText("Fine-Design_Chart_Custom")
+        });
+
+        Component[][] components = new Component[][]{
+                new Component[]{null, null},
+                new Component[]{content, null}
+        };
+
+        return TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, column);
     }
 
-    protected JPanel createCommonPanel() {
+    protected JPanel createCommonFormatPanel() {
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
+        double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
 
-        double[] columnSize = {f, p};
-        double[] rowSize = getRowSize(p);
+        JPanel formatContent = TableLayoutHelper.createTableLayoutPane(getPaneComponents(), getRowSize(p), new double[]{f, p});
 
-        return TableLayoutHelper.createTableLayoutPane(getPaneComponents(), rowSize, columnSize);
+        Component[][] components = new Component[][]{
+                new Component[]{null, null},
+                new Component[]{new UILabel(getLabelContentTitle()), formatContent}
+        };
+
+        return TableLayoutHelper.createTableLayoutPane(components, new double[]{p, p}, new double[]{f, e});
+    }
+
+    protected JPanel createCommonStylePane() {
+        styleButton = new UIButtonGroup<>(new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_Automatic"),
+                Toolkit.i18nText("Fine-Design_Chart_Custom")
+        });
+
+        textAttrPane = new ChartTextAttrPane() {
+            protected Component[][] getComponents(JPanel buttonPane) {
+                return new Component[][]{
+                        new Component[]{null, null},
+                        new Component[]{null, getFontNameComboBox()},
+                        new Component[]{null, buttonPane}
+                };
+            }
+        };
+
+        JPanel buttonPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Toolkit.i18nText("Fine-Design_Chart_Widget_Style"), styleButton);
+
+        JPanel stylePanel = new JPanel(new BorderLayout());
+        stylePanel.add(buttonPane, BorderLayout.CENTER);
+        stylePanel.add(textAttrPane, BorderLayout.SOUTH);
+
+        initStyleButtonListener();
+
+        return stylePanel;
+    }
+
+    private void initStyleButtonListener() {
+        styleButton.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                checkStylePane();
+            }
+        });
+    }
+
+    protected void checkStylePane() {
+        textAttrPane.setVisible(styleButton.getSelectedIndex() == 1);
     }
 
     private JPanel createRichEditorPanel() {
@@ -154,18 +324,21 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
 
         double[] columnSize = {f, e};
-        double[] rowSize = {p, p};
+        double[] rowSize = {p, p, p};
+
+        JPanel formatContent = TableLayoutHelper.createTableLayoutPane(getRichTextComponents(), getRowSize(p), new double[]{f, p});
 
         Component[][] components = new Component[][]{
                 new Component[]{null, null},
-                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Content_Style")), createContentStylePane()}
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Content_Style")), createRichEditorButton()},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Use_Format")), formatContent}
         };
 
         return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
     }
 
-    private JComponent createContentStylePane() {
-        UIButton contentTextArea = new UIButton(Toolkit.i18nText("Fine-Design_Report_RichTextEditor"));
+    private JComponent createRichEditorButton() {
+        UIButton contentTextArea = new UIButton(Toolkit.i18nText("Fine-Design_Chart_Rich_Text_Edit"));
 
         contentTextArea.addMouseListener(new MouseAdapter() {
             public void mouseClicked(MouseEvent e) {
@@ -188,8 +361,6 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
                 VanChartRichEditorPane.RichEditorModel model = pane.update();
 
                 String content = model.getContent();
-                List<String> params = VanChartRichEditorPane.richParamsParser(content, richText.getParams());
-                populateFormatParams(params);
                 updateLocalRichText(content, model.isAuto());
 
                 SwingUtilities.getWindowAncestor(pane).setVisible(false);
@@ -207,27 +378,65 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         }
     }
 
-    protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane){
+    private JPanel createHtmlPane() {
+        double p = TableLayout.PREFERRED;
+        double f = TableLayout.FILL;
+
+        double[] column = {f, p};
+        double[] row = {p, p};
+
+        htmlLabelPane = createHtmlLabelPane();
+        htmlLabelPane.setParent(parent);
+
+        Component[][] htmlComponents = new Component[][]{
+                new Component[]{null, null},
+                new Component[]{htmlLabelPane, null}
+        };
+
+        return TableLayout4VanChartHelper.createGapTableLayoutPane(htmlComponents, row, column);
+    }
+
+    protected VanChartHtmlLabelPane createHtmlLabelPane() {
+        return new VanChartHtmlLabelPaneWithOutWidthAndHeight();
+    }
+
+    protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) {
         categoryNameFormatPane = new CategoryNameFormatPaneWithCheckBox(parent, showOnPane);
         seriesNameFormatPane = new SeriesNameFormatPaneWithCheckBox(parent, showOnPane);
         valueFormatPane = new ValueFormatPaneWithCheckBox(parent, showOnPane);
         percentFormatPane = new PercentFormatPaneWithCheckBox(parent, showOnPane);
     }
 
+    protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
+        richTextCategoryNameFormatPane = new CategoryNameFormatPaneWithoutCheckBox(parent, showOnPane);
+        richTextSeriesNameFormatPane = new SeriesNameFormatPaneWithoutCheckBox(parent, showOnPane);
+        richTextValueFormatPane = new ValueFormatPaneWithoutCheckBox(parent, showOnPane);
+        richTextPercentFormatPane = new PercentFormatPaneWithoutCheckBox(parent, showOnPane);
+    }
+
     protected JPanel createTableLayoutPaneWithTitle(String title, JPanel panel) {
         return TableLayout4VanChartHelper.createExpandablePaneWithTitle(title, panel);
     }
 
-    protected double[] getRowSize(double p){
-        return new double[]{p,p,p,p};
+    protected double[] getRowSize(double p) {
+        return new double[]{p, p, p, p};
     }
 
-    protected Component[][] getPaneComponents(){
+    protected Component[][] getPaneComponents() {
         return new Component[][]{
-                new Component[]{categoryNameFormatPane,null},
-                new Component[]{seriesNameFormatPane,null},
-                new Component[]{valueFormatPane,null},
-                new Component[]{percentFormatPane,null},
+                new Component[]{categoryNameFormatPane, null},
+                new Component[]{seriesNameFormatPane, null},
+                new Component[]{valueFormatPane, null},
+                new Component[]{percentFormatPane, null},
+        };
+    }
+
+    protected Component[][] getRichTextComponents() {
+        return new Component[][]{
+                new Component[]{richTextCategoryNameFormatPane, null},
+                new Component[]{richTextSeriesNameFormatPane, null},
+                new Component[]{richTextValueFormatPane, null},
+                new Component[]{richTextPercentFormatPane, null},
         };
     }
 
@@ -235,27 +444,27 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         content.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-               checkCardPane();
+                checkCardPane();
             }
         });
     }
 
 
     private void checkCardPane() {
-        CardLayout cardLayout = (CardLayout) centerPane.getLayout();
-        if (content.getSelectedIndex() == 1) {
-            cardLayout.show(centerPane, Toolkit.i18nText("Fine-Design_Chart_Custom"));
-            if(isDirty()){
+        CardLayout cardLayout = (CardLayout) centerPanel.getLayout();
+        if (content.getSelectedIndex() == 2) {
+            cardLayout.show(centerPanel, Toolkit.i18nText("Fine-Design_Chart_Custom"));
+            if (isDirty()) {
                 setCustomFormatterText();
                 setDirty(false);
             }
+        } else if (content.getSelectedIndex() == 1) {
+            cardLayout.show(centerPanel, Toolkit.i18nText("Fine-Design_Chart_Rich_Text"));
         } else {
-            cardLayout.show(centerPane, Toolkit.i18nText("Fine-Design_Chart_Common"));
+            cardLayout.show(centerPanel, Toolkit.i18nText("Fine-Design_Chart_Common"));
         }
 
-        if (editorPane != null) {
-            editorPane.setVisible(content.getSelectedIndex() == 0);
-        }
+        stylePanel.setVisible(content.getSelectedIndex() != 1);
     }
 
     protected void setCustomFormatterText() {
@@ -263,8 +472,13 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
     }
 
     public boolean isDirty() {
-        return categoryNameFormatPane.isDirty() || seriesNameFormatPane.isDirty() || valueFormatPane.isDirty() || percentFormatPane.isDirty()
-                || (changedValueFormatPane != null && changedValueFormatPane.isDirty()) || (changedValueFormatPane != null && changedPercentFormatPane.isDirty());
+
+        return categoryNameFormatPane.isDirty()
+                || seriesNameFormatPane.isDirty()
+                || valueFormatPane.isDirty()
+                || percentFormatPane.isDirty()
+                || (changedValueFormatPane != null && changedValueFormatPane.isDirty())
+                || (changedValueFormatPane != null && changedPercentFormatPane.isDirty());
     }
 
     public void setDirty(boolean isDirty) {
@@ -281,59 +495,6 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         }
     }
 
-    protected VanChartFormatPaneWithCheckBox[] getFormatPaneGroup() {
-        return  new VanChartFormatPaneWithCheckBox[]{
-                categoryNameFormatPane, seriesNameFormatPane,
-                valueFormatPane, percentFormatPane,
-                changedValueFormatPane, changedPercentFormatPane
-        };
-    }
-
-    protected VanChartFormatPaneWithCheckBox getTargetFormatPane(Object param) {
-        VanChartFormatPaneWithCheckBox[] formatPaneGroup = getFormatPaneGroup();
-
-        Object[] params = richText.getParams().values().toArray();
-
-        for (int i = 0, len = Math.min(params.length, formatPaneGroup.length); i < len; i++) {
-            if (ComparatorUtils.equals(params[i], param) && formatPaneGroup[i] != null) {
-                return formatPaneGroup[i];
-            }
-        }
-
-        return null;
-    }
-
-    private String getParamsRichText() {
-        VanChartFormatPaneWithCheckBox[] formatPaneGroup = getFormatPaneGroup();
-
-        // todo 获取参数对应的富文本字符串，正确的流程是：
-        // 在BI的富文本组件中，先清空content，然后addParam，最后读取最新的content，
-        // 但是当前接口还没开出来，暂时先在本地写死，模拟类似的效果
-        String[] richTextGroup = new String[]{
-                "<img  alt=\"%24%7BCATEGORY%7D\" class=\"rich-editor-param\" style=\"background-color: rgba(54, 133, 242, 0.1);vertical-align: middle; margin: 0 1px; width:86.095703125px;height: 16px; max-width:86.095703125px;max-height: 16px; min-width:86.095703125px;min-height: 16px\" name=\"%24%7BCATEGORY%7D\" />",
-                "<img  alt=\"%24%7BSERIES%7D\" class=\"rich-editor-param\" style=\"background-color: rgba(54, 133, 242, 0.1);vertical-align: middle; margin: 0 1px; width:63.8828125px;height: 16px; max-width:63.8828125px;max-height: 16px; min-width:63.8828125px;min-height: 16px\" name=\"%24%7BSERIES%7D\" />",
-                "<img  alt=\"%24%7BVALUE%7D\" class=\"rich-editor-param\" style=\"background-color: rgba(54, 133, 242, 0.1);vertical-align: middle; margin: 0 1px; width:61.849609375px;height: 16px; max-width:61.849609375px;max-height: 16px; min-width:61.849609375px;min-height: 16px\" name=\"%24%7BVALUE%7D\" />",
-                "<img  alt=\"%24%7BPERCENT%7D\" class=\"rich-editor-param\" style=\"background-color: rgba(54, 133, 242, 0.1);vertical-align: middle; margin: 0 1px; width:77.39453125px;height: 16px; max-width:77.39453125px;max-height: 16px; min-width:77.39453125px;min-height: 16px\" name=\"%24%7BPERCENT%7D\" />",
-                "<img  alt=\"%24%7BCHANGEDVALUE%7D\" class=\"rich-editor-param\" style=\"background-color: rgba(54, 133, 242, 0.1);vertical-align: middle; margin: 0 1px; width:122.119140625px;height: 16px; max-width:122.119140625px;max-height: 16px; min-width:122.119140625px;min-height: 16px\" name=\"%24%7BCHANGEDVALUE%7D\" />",
-                "<img  alt=\"%24%7BCHANGEDPERCENT%7D\" class=\"rich-editor-param\" style=\"background-color: rgba(54, 133, 242, 0.1);vertical-align: middle; margin: 0 1px; width:137.6640625px;height: 16px; max-width:137.6640625px;max-height: 16px; min-width:137.6640625px;min-height: 16px\" name=\"%24%7BCHANGEDPERCENT%7D\" />"
-        };
-
-        StringBuilder result = new StringBuilder("<p>");
-
-        for (int i = 0, len = formatPaneGroup.length; i < len; i++) {
-            VanChartFormatPaneWithCheckBox formatPane = formatPaneGroup[i];
-            String paramRichText = richTextGroup[i];
-
-            if (formatPane != null && formatPane.isSelected()) {
-                result.append(paramRichText);
-            }
-        }
-
-        result.append("</p>");
-
-        return result.toString();
-    }
-
     @Override
     protected String title4PopupWindow() {
         return "";
@@ -341,24 +502,48 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
 
 
     @Override
-    public void populateBean(AttrTooltipContent attrTooltipContent){
-        if(attrTooltipContent == null){
+    public void populateBean(AttrTooltipContent attrTooltipContent) {
+        if (attrTooltipContent == null) {
             return;
         }
 
-        content.setSelectedIndex(attrTooltipContent.isCommon() ? 0 : 1);
+        if (attrTooltipContent.isCommon()) {
+            content.setSelectedIndex(0);
+        } else if (attrTooltipContent.isRichText()) {
+            content.setSelectedIndex(1);
+        } else {
+            content.setSelectedIndex(2);
+        }
+
+        if (attrTooltipContent.isCustom()) {
+            styleButton.setSelectedIndex(1);
+        } else {
+            styleButton.setSelectedIndex(0);
+        }
+
+        this.textAttrPane.populate(attrTooltipContent.getTextAttr());
 
         populateFormatPane(attrTooltipContent);
+        populateRichEditor(attrTooltipContent);
 
         htmlLabelPane.populate(attrTooltipContent.getHtmlLabel());
-        if(!attrTooltipContent.isCommon()){
+        if (!attrTooltipContent.isCommon()) {
             setDirty(false);
         }
+
         checkCardPane();
+        checkStylePane();
     }
 
     protected void populateFormatPane(AttrTooltipContent attrTooltipContent) {
-        VanChartFormatPaneWithCheckBox[] formatPaneGroup = getFormatPaneGroup();
+        VanChartFormatPaneWithCheckBox[] formatPaneGroup = new VanChartFormatPaneWithCheckBox[]{
+                categoryNameFormatPane,
+                seriesNameFormatPane,
+                valueFormatPane,
+                percentFormatPane,
+                changedValueFormatPane,
+                changedPercentFormatPane
+        };
 
         AttrTooltipFormat[] formatGroup = new AttrTooltipFormat[]{
                 attrTooltipContent.getCategoryFormat(),
@@ -375,54 +560,63 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
 
             if (formatPane != null && format != null) {
                 formatPane.populate(format);
-
-                // 填充面板时，更新富文本编辑器参数
-                formatPane.updateFormatParams(richText.getParams(), format.getJs());
             }
         }
+    }
 
-        AttrTooltipRichText tooltipRichText = attrTooltipContent.getRichText();
+    protected void populateRichEditor(AttrTooltipContent attrTooltipContent) {
+        VanChartFormatPaneWithoutCheckBox[] formatPaneGroup = new VanChartFormatPaneWithoutCheckBox[]{
+                richTextCategoryNameFormatPane,
+                richTextSeriesNameFormatPane,
+                richTextValueFormatPane,
+                richTextPercentFormatPane,
+                richTextChangedValueFormatPane,
+                richTextChangedPercentFormatPane
+        };
 
-        if (tooltipRichText != null) {
-            updateLocalRichText(tooltipRichText.getContent(), tooltipRichText.isAuto());
-            setDirty(false);
-        }
+        AttrTooltipFormat[] formatGroup = new AttrTooltipFormat[]{
+                attrTooltipContent.getRichTextCategoryFormat(),
+                attrTooltipContent.getRichTextSeriesFormat(),
+                attrTooltipContent.getRichTextValueFormat(),
+                attrTooltipContent.getRichTextPercentFormat(),
+                attrTooltipContent.getRichTextChangedValueFormat(),
+                attrTooltipContent.getRichTextChangedPercentFormat()
+        };
+
+        populateRichTextFormat(formatPaneGroup, formatGroup);
+        populateRichText(attrTooltipContent.getRichTextAttr());
     }
 
-    private void populateFormatParams(List<String> params) {
-        if (params == null) {
-            return;
-        }
+    protected void populateRichTextFormat(VanChartFormatPaneWithCheckBox[] formatPaneGroup, AttrTooltipFormat[] formatGroup) {
+        for (int i = 0, len = formatPaneGroup.length; i < len; i++) {
+            VanChartFormatPaneWithCheckBox formatPane = formatPaneGroup[i];
+            AttrTooltipFormat format = formatGroup[i];
 
-        VanChartFormatPaneWithCheckBox[] formatPaneGroup = getFormatPaneGroup();
+            if (formatPane != null && format != null) {
+                formatPane.populate(format);
 
-        for (VanChartFormatPaneWithCheckBox formatPane : formatPaneGroup) {
-            if (formatPane != null) {
-                formatPane.setSelected(false);
+                // 填充面板时，更新富文本编辑器参数
+                formatPane.updateFormatParams(richText.getParams(), format.getJs());
             }
         }
+    }
 
-        for (String param : params) {
-            VanChartFormatPaneWithCheckBox formatPane = getTargetFormatPane(param);
-
-            if (formatPane != null) {
-                formatPane.setSelected(true);
-            }
+    protected void populateRichText(AttrTooltipRichText tooltipRichText) {
+        if (tooltipRichText != null) {
+            updateLocalRichText(tooltipRichText.getContent(), tooltipRichText.isAuto());
         }
     }
 
     public AttrTooltipContent updateBean() {
         AttrTooltipContent attrTooltipContent = createAttrTooltip();
 
-        boolean isCommon = content.getSelectedIndex() == 0;
-
-        attrTooltipContent.setCommon(isCommon);
-        if (isDirty() && isCommon) {
-            updateLocalRichText(getParamsRichText(), false);
-            setDirty(false);
-        }
+        attrTooltipContent.setCommon(content.getSelectedIndex() == 0);
+        attrTooltipContent.setRichText(content.getSelectedIndex() == 1);
+        attrTooltipContent.setCustom(styleButton.getSelectedIndex() == 1);
+        attrTooltipContent.setTextAttr(this.textAttrPane.update());
 
         updateFormatPane(attrTooltipContent);
+        updateRichEditor(attrTooltipContent);
         updateTooltipRichText(attrTooltipContent);
         updateFormatsWithPaneWidth(attrTooltipContent);
 
@@ -436,11 +630,18 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
     }
 
     protected void updateFormatPane(AttrTooltipContent attrTooltipContent) {
-        categoryNameFormatPane.update(attrTooltipContent.getCategoryFormat());
-        seriesNameFormatPane.update(attrTooltipContent.getSeriesFormat());
-        valueFormatPane.update(attrTooltipContent.getValueFormat());
-        percentFormatPane.update(attrTooltipContent.getPercentFormat());
-
+        if (categoryNameFormatPane != null) {
+            categoryNameFormatPane.update(attrTooltipContent.getCategoryFormat());
+        }
+        if (seriesNameFormatPane != null) {
+            seriesNameFormatPane.update(attrTooltipContent.getSeriesFormat());
+        }
+        if (valueFormatPane != null) {
+            valueFormatPane.update(attrTooltipContent.getValueFormat());
+        }
+        if (percentFormatPane != null) {
+            percentFormatPane.update(attrTooltipContent.getPercentFormat());
+        }
         if (changedValueFormatPane != null) {
             changedValueFormatPane.update(attrTooltipContent.getChangedValueFormat());
         }
@@ -449,6 +650,27 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         }
     }
 
+    protected void updateRichEditor(AttrTooltipContent attrTooltipContent) {
+        if (richTextCategoryNameFormatPane != null) {
+            richTextCategoryNameFormatPane.update(attrTooltipContent.getRichTextCategoryFormat());
+        }
+        if (richTextSeriesNameFormatPane != null) {
+            richTextSeriesNameFormatPane.update(attrTooltipContent.getRichTextSeriesFormat());
+        }
+        if (richTextValueFormatPane != null) {
+            richTextValueFormatPane.update(attrTooltipContent.getRichTextValueFormat());
+        }
+        if (richTextPercentFormatPane != null) {
+            richTextPercentFormatPane.update(attrTooltipContent.getRichTextPercentFormat());
+        }
+        if (richTextChangedValueFormatPane != null) {
+            richTextChangedValueFormatPane.update(attrTooltipContent.getRichTextChangedValueFormat());
+        }
+        if (richTextChangedPercentFormatPane != null) {
+            richTextChangedPercentFormatPane.update(attrTooltipContent.getRichTextChangedPercentFormat());
+        }
+    }
+
     private void updateLocalRichText(String content, boolean isAuto) {
         richText.setContent(content);
         richText.setAuto(isAuto);
@@ -456,7 +678,7 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
 
     private void updateTooltipRichText(AttrTooltipContent attrTooltipContent) {
         if (attrTooltipContent != null) {
-            AttrTooltipRichText tooltipRichText = attrTooltipContent.getRichText();
+            AttrTooltipRichText tooltipRichText = attrTooltipContent.getRichTextAttr();
             tooltipRichText.setContent(richText.getContent());
             tooltipRichText.setAuto(richText.isAuto());
         }
@@ -466,9 +688,10 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
      * CHART-1295
      * 通过格式的面板宽度来判断在自定义js代码中是否显示this.seriesName字符串。
      * 图表对于其他的格式有要求也可以在这里继续添加。
+     *
      * @param attrTooltipContent
      */
-    private void updateFormatsWithPaneWidth (AttrTooltipContent attrTooltipContent) {
+    private void updateFormatsWithPaneWidth(AttrTooltipContent attrTooltipContent) {
         int paneWidth = seriesNameFormatPane.getWidth();
         if (paneWidth == 0) {
             attrTooltipContent.getSeriesFormat().setEnable(false);

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

@@ -53,13 +53,11 @@ public class VanChartBorderPane extends BasicPane {
     }
 
     protected void initContent() {
-        double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
         double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
         double[] columnSize = {f, e};
-        double[] rowSize = {p, p, p, p};
         Component[][] components = getUseComponent();
-        JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize);
+        JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, getRowSize(), columnSize);
         this.setLayout(new BorderLayout());
         this.add(panel, BorderLayout.CENTER);
     }
@@ -87,6 +85,11 @@ public class VanChartBorderPane extends BasicPane {
         colorPanel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize);
     }
 
+    protected double[] getRowSize() {
+        double p = TableLayout.PREFERRED;
+        return new double[]{p, p, p, p};
+    }
+
     protected Component[][] getUseComponent() {
         UILabel lineStyleLabel = FRWidgetFactory.createLineWrapLabel(Toolkit.i18nText("Fine-Design_Chart_Line_Style"));
 

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

@@ -4,6 +4,7 @@ import com.fr.chart.base.AttrBorder;
 import com.fr.chart.chartglyph.GeneralInfo;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ispinner.UISpinner;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.utils.gui.UIComponentUtils;
 import com.fr.design.widget.FRWidgetFactory;
 
@@ -26,6 +27,10 @@ public class VanChartBorderWithRadiusPane extends VanChartBorderPane {
         super(hasAuto);
     }
 
+    public UISpinner getRadius() {
+        return radius;
+    }
+
     @Override
     protected void initComponents() {
         super.initComponents();
@@ -43,11 +48,11 @@ public class VanChartBorderWithRadiusPane extends VanChartBorderPane {
         return new Component[][]{
                 new Component[]{null,null},
                 new Component[]{
-                        FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),
+                        FRWidgetFactory.createLineWrapLabel(Toolkit.i18nText("Fine-Design_Chart_Line_Style")),
                         UIComponentUtils.wrapWithBorderLayoutPane(currentLineCombo)
                 },
                 new Component[]{colorPanel, null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Radius")),radius}
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Report_Radius")),radius}
         } ;
     }
 

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

@@ -0,0 +1,58 @@
+package com.fr.van.chart.designer.component.border;
+
+import com.fr.chart.base.AttrBorder;
+import com.fr.chart.chartglyph.Marker;
+import com.fr.chart.chartglyph.MarkerFactory;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.gui.xcombox.MarkerComboBox;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.TableLayout;
+import com.fr.design.utils.gui.UIComponentUtils;
+import com.fr.design.widget.FRWidgetFactory;
+import com.fr.plugin.chart.base.AttrBorderWithShape;
+import com.fr.plugin.chart.marker.type.MarkerType;
+
+import java.awt.Component;
+
+public class VanChartBorderWithShapePane extends VanChartBorderWithRadiusPane {
+
+    private MarkerComboBox shapePane;
+
+    protected void initComponents() {
+        shapePane = new MarkerComboBox(MarkerFactory.getLabelShapeMarkers());
+        super.initComponents();
+    }
+
+    protected Component[][] getUseComponent() {
+        return new Component[][]{
+                new Component[]{null, null},
+                new Component[]{FRWidgetFactory.createLineWrapLabel(Toolkit.i18nText("Fine-Design_Chart_Line_Style")),
+                        UIComponentUtils.wrapWithBorderLayoutPane(currentLineCombo)},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Color")), currentLineColorPane},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Shape")),
+                        UIComponentUtils.wrapWithBorderLayoutPane(shapePane)},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Report_Radius")), getRadius()}
+        };
+    }
+
+    protected double[] getRowSize() {
+        double p = TableLayout.PREFERRED;
+        return new double[]{p, p, p, p, p};
+    }
+
+    public void populate(AttrBorder border) {
+        super.populate(border);
+
+        if (border instanceof AttrBorderWithShape) {
+            shapePane.setSelectedMarker((Marker.createMarker(((AttrBorderWithShape) border).getShape())));
+        }
+    }
+
+    public void update(AttrBorder border) {
+        super.update(border);
+
+        if (border instanceof AttrBorderWithShape) {
+            ((AttrBorderWithShape) border).setShape(MarkerType.parse(shapePane.getSelectedMarkder().getMarkerType()));
+        }
+    }
+}

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

@@ -0,0 +1,17 @@
+package com.fr.van.chart.designer.component.format;
+
+import com.fr.design.i18n.Toolkit;
+import com.fr.van.chart.designer.style.VanChartStylePane;
+
+import javax.swing.JPanel;
+
+public class CategoryNameFormatPaneWithoutCheckBox extends VanChartFormatPaneWithoutCheckBox {
+
+    public CategoryNameFormatPaneWithoutCheckBox(VanChartStylePane parent, JPanel showOnPane) {
+        super(parent, showOnPane);
+    }
+
+    protected String getCheckBoxText() {
+        return Toolkit.i18nText("Fine-Design_Chart_Category_Use_Name");
+    }
+}

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

@@ -0,0 +1,21 @@
+package com.fr.van.chart.designer.component.format;
+
+import com.fr.design.i18n.Toolkit;
+import com.fr.van.chart.designer.style.VanChartStylePane;
+
+import javax.swing.JPanel;
+
+public class ChangedPercentFormatPaneWithoutCheckBox extends VanChartFormatPaneWithoutCheckBox {
+
+    public ChangedPercentFormatPaneWithoutCheckBox(VanChartStylePane parent, JPanel showOnPane) {
+        super(parent, showOnPane);
+    }
+
+    protected String getCheckBoxText() {
+        return Toolkit.i18nText("Fine-Design_Chart_Change_Percent");
+    }
+
+    protected boolean isPercent() {
+        return true;
+    }
+}

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

@@ -0,0 +1,17 @@
+package com.fr.van.chart.designer.component.format;
+
+import com.fr.design.i18n.Toolkit;
+import com.fr.van.chart.designer.style.VanChartStylePane;
+
+import javax.swing.JPanel;
+
+public class ChangedValueFormatPaneWithoutCheckBox extends VanChartFormatPaneWithoutCheckBox {
+
+    public ChangedValueFormatPaneWithoutCheckBox(VanChartStylePane parent, JPanel showOnPane) {
+        super(parent, showOnPane);
+    }
+
+    protected String getCheckBoxText() {
+        return Toolkit.i18nText("Fine-Design_Chart_Change_Value");
+    }
+}

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

@@ -0,0 +1,17 @@
+package com.fr.van.chart.designer.component.format;
+
+import com.fr.design.i18n.Toolkit;
+import com.fr.van.chart.designer.style.VanChartStylePane;
+
+import javax.swing.JPanel;
+
+public class MapAreaNameFormatPaneWithoutCheckBox extends CategoryNameFormatPaneWithoutCheckBox {
+
+    public MapAreaNameFormatPaneWithoutCheckBox(VanChartStylePane parent, JPanel showOnPane) {
+        super(parent, showOnPane);
+    }
+
+    protected String getCheckBoxText() {
+        return Toolkit.i18nText("Fine-Design_Chart_Area_Name");
+    }
+}

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

@@ -0,0 +1,21 @@
+package com.fr.van.chart.designer.component.format;
+
+import com.fr.design.i18n.Toolkit;
+import com.fr.van.chart.designer.style.VanChartStylePane;
+
+import javax.swing.JPanel;
+
+public class PercentFormatPaneWithoutCheckBox extends VanChartFormatPaneWithoutCheckBox {
+
+    public PercentFormatPaneWithoutCheckBox(VanChartStylePane parent, JPanel showOnPane) {
+        super(parent, showOnPane);
+    }
+
+    protected String getCheckBoxText() {
+        return Toolkit.i18nText("Fine-Design_Chart_Use_Percent");
+    }
+
+    protected boolean isPercent() {
+        return true;
+    }
+}

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

@@ -0,0 +1,17 @@
+package com.fr.van.chart.designer.component.format;
+
+import com.fr.design.i18n.Toolkit;
+import com.fr.van.chart.designer.style.VanChartStylePane;
+
+import javax.swing.JPanel;
+
+public class SeriesNameFormatPaneWithoutCheckBox extends VanChartFormatPaneWithoutCheckBox {
+
+    public SeriesNameFormatPaneWithoutCheckBox(VanChartStylePane parent, JPanel showOnPane) {
+        super(parent, showOnPane);
+    }
+
+    protected String getCheckBoxText() {
+        return Toolkit.i18nText("Fine-Design_Chart_Series_Name");
+    }
+}

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

@@ -0,0 +1,17 @@
+package com.fr.van.chart.designer.component.format;
+
+import com.fr.design.i18n.Toolkit;
+import com.fr.van.chart.designer.style.VanChartStylePane;
+
+import javax.swing.JPanel;
+
+public class ValueFormatPaneWithoutCheckBox extends VanChartFormatPaneWithoutCheckBox {
+
+    public ValueFormatPaneWithoutCheckBox(VanChartStylePane parent, JPanel showOnPane) {
+        super(parent, showOnPane);
+    }
+
+    protected String getCheckBoxText() {
+        return Toolkit.i18nText("Fine-Design_Chart_Use_Value");
+    }
+}

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

@@ -5,6 +5,7 @@ import com.fr.design.gui.frpane.AbstractAttrNoScrollPane;
 import com.fr.design.gui.frpane.UIBubbleFloatPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icheckbox.UICheckBox;
+import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.style.FormatPane;
 import com.fr.design.i18n.Toolkit;
 import com.fr.plugin.chart.base.format.AttrTooltipFormat;
@@ -15,6 +16,7 @@ import java.awt.BorderLayout;
 import java.awt.Point;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
 import java.text.Format;
 import java.util.Map;
 
@@ -37,26 +39,55 @@ public abstract class VanChartFormatPaneWithCheckBox extends JPanel{
     public VanChartFormatPaneWithCheckBox(AbstractAttrNoScrollPane parent, JPanel showOnPane) {
         this.parent = parent;
         this.showOnPane = showOnPane;
-        this.isDirty = false;
+        this.isDirty = true;
 
         this.setLayout(new BorderLayout());
+        isSelectedBox = new UICheckBox(getCheckBoxText());
+        formatButton = new UIButton(Toolkit.i18nText("Fine-Design_Chart_Use_Format"));
 
-        isSelectedBox = new UICheckBox(getCheckBoxText()) {
-            protected void attributeChange() {
-                isDirty = true;
-                super.attributeChange();
-            }
-        };
+        if (showSelectBox()) {
+            this.add(isSelectedBox, BorderLayout.CENTER);
+        } else {
+            this.add(new UILabel(getCheckBoxText()), BorderLayout.CENTER);
+        }
 
-        formatButton = new UIButton(Toolkit.i18nText("Fine-Design_Chart_Use_Format"));
-        this.add(isSelectedBox, BorderLayout.CENTER);
         this.add(formatButton, BorderLayout.EAST);
 
         initFormatListener();
+        isSelectedBox.addMouseListener(new MouseListener() {
+            @Override
+            public void mouseClicked(MouseEvent e) {
+                isDirty = 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) {
+
+            }
+        });
     }
 
     protected abstract String getCheckBoxText();
 
+    protected boolean showSelectBox() {
+        return true;
+    }
+
     protected boolean isPercent() {
         return false;
     }
@@ -107,14 +138,6 @@ public abstract class VanChartFormatPaneWithCheckBox extends JPanel{
         this.isDirty = isDirty;
     }
 
-    public boolean isSelected() {
-        return this.isSelectedBox.isSelected();
-    }
-
-    public void setSelected(boolean isSelected) {
-        this.isSelectedBox.setSelected(isSelected);
-    }
-
     public void populate(AttrTooltipFormat tooltipFormat) {
         this.isSelectedBox.setSelected(tooltipFormat.isEnable());
         this.format = tooltipFormat.getFormat();

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

@@ -0,0 +1,16 @@
+package com.fr.van.chart.designer.component.format;
+
+import com.fr.van.chart.designer.style.VanChartStylePane;
+
+import javax.swing.JPanel;
+
+public abstract class VanChartFormatPaneWithoutCheckBox extends VanChartFormatPaneWithCheckBox {
+
+    public VanChartFormatPaneWithoutCheckBox(VanChartStylePane parent, JPanel showOnPane) {
+        super(parent, showOnPane);
+    }
+
+    protected boolean showSelectBox() {
+        return false;
+    }
+}

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

@@ -0,0 +1,16 @@
+package com.fr.van.chart.designer.component.format;
+
+import com.fr.van.chart.designer.style.VanChartStylePane;
+
+import javax.swing.JPanel;
+
+public class XFormatPaneWithoutCheckBox extends VanChartFormatPaneWithoutCheckBox {
+
+    public XFormatPaneWithoutCheckBox(VanChartStylePane parent, JPanel showOnPane) {
+        super(parent, showOnPane);
+    }
+
+    protected String getCheckBoxText() {
+        return "x";
+    }
+}

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

@@ -0,0 +1,16 @@
+package com.fr.van.chart.designer.component.format;
+
+import com.fr.van.chart.designer.style.VanChartStylePane;
+
+import javax.swing.JPanel;
+
+public class YFormatPaneWithoutCheckBox extends VanChartFormatPaneWithoutCheckBox {
+
+    public YFormatPaneWithoutCheckBox(VanChartStylePane parent, JPanel showOnPane) {
+        super(parent, showOnPane);
+    }
+
+    protected String getCheckBoxText() {
+        return "y";
+    }
+}

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

@@ -1,7 +1,8 @@
 package com.fr.van.chart.designer.component.label;
 
 
-import com.fr.van.chart.designer.component.VanChartLabelContentPane;
+import com.fr.design.i18n.Toolkit;
+import com.fr.van.chart.designer.component.VanChartLabelContentPaneWithoutRichText;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
 import javax.swing.JPanel;
@@ -9,18 +10,21 @@ import javax.swing.JPanel;
 /**
  * Created by mengao on 2017/8/13.
  */
-public class GaugeLabelContentPane extends VanChartLabelContentPane {
+public class GaugeLabelContentPane extends VanChartLabelContentPaneWithoutRichText {
 
     public GaugeLabelContentPane(VanChartStylePane parent, JPanel showOnPane) {
         super(parent, showOnPane);
     }
 
     protected String getLabelContentTitle() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Content");
+        return Toolkit.i18nText("Fine-Design_Chart_Content");
     }
 
     protected JPanel getLabelContentPane(JPanel contentPane) {
         return contentPane;
     }
 
+    protected boolean hasTextStylePane() {
+        return false;
+    }
 }

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

@@ -27,7 +27,7 @@ public class LabelContentPaneWithCate extends GaugeLabelContentPane {
 
     protected Component[][] getPaneComponents(){
         return new Component[][]{
-                new Component[]{categoryNameFormatPane,null},
+                new Component[]{getCategoryNameFormatPane(),null},
         };
     }
 }

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

@@ -27,8 +27,8 @@ public class LabelContentPaneWithCateValue extends GaugeLabelContentPane {
 
     protected Component[][] getPaneComponents(){
         return new Component[][]{
-                new Component[]{categoryNameFormatPane,null},
-                new Component[]{valueFormatPane,null},
+                new Component[]{getCategoryNameFormatPane(),null},
+                new Component[]{getValueFormatPane(),null},
         };
     }
 }

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

@@ -27,9 +27,9 @@ public class LabelContentPaneWithOutCate extends GaugeLabelContentPane {
 
     protected Component[][] getPaneComponents(){
         return new Component[][]{
-                new Component[]{seriesNameFormatPane, null},
-                new Component[]{valueFormatPane, null},
-                new Component[]{percentFormatPane, null},
+                new Component[]{getSeriesNameFormatPane(), null},
+                new Component[]{getValueFormatPane(), null},
+                new Component[]{getPercentFormatPane(), null},
         };
     }
 }

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

@@ -26,7 +26,7 @@ public class LabelContentPaneWithPercent extends GaugeLabelContentPane {
 
     protected Component[][] getPaneComponents(){
         return new Component[][]{
-                new Component[]{percentFormatPane, null},
+                new Component[]{getPercentFormatPane(), null},
         };
     }
 }

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

@@ -1,7 +1,9 @@
 package com.fr.van.chart.designer.component.tooltip;
 
 import com.fr.van.chart.designer.component.format.ChangedPercentFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.ChangedPercentFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.ChangedValueFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.ChangedValueFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
 import javax.swing.JPanel;
@@ -19,8 +21,16 @@ public class RefreshTooltipContentPaneWithOutSeries extends TooltipContentPaneWi
     protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) {
         super.initFormatPane(parent, showOnPane);
 
-        changedValueFormatPane = new ChangedValueFormatPaneWithCheckBox(parent, showOnPane);
-        changedPercentFormatPane = new ChangedPercentFormatPaneWithCheckBox(parent, showOnPane);
+        setChangedValueFormatPane(new ChangedValueFormatPaneWithCheckBox(parent, showOnPane));
+        setChangedPercentFormatPane(new ChangedPercentFormatPaneWithCheckBox(parent, showOnPane));
+    }
+
+    @Override
+    protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
+        super.initRichTextFormatPane(parent, showOnPane);
+
+        setRichTextChangedValueFormatPane(new ChangedValueFormatPaneWithoutCheckBox(parent, showOnPane));
+        setRichTextChangedPercentFormatPane(new ChangedPercentFormatPaneWithoutCheckBox(parent, showOnPane));
     }
 
     protected double[] getRowSize(double p){
@@ -29,11 +39,21 @@ public class RefreshTooltipContentPaneWithOutSeries extends TooltipContentPaneWi
 
     protected Component[][] getPaneComponents(){
         return new Component[][]{
-                new Component[]{categoryNameFormatPane,null},
-                new Component[]{valueFormatPane,null},
-                new Component[]{changedValueFormatPane,null},
-                new Component[]{percentFormatPane,null},
-                new Component[]{changedPercentFormatPane,null},
+                new Component[]{getCategoryNameFormatPane(),null},
+                new Component[]{getValueFormatPane(),null},
+                new Component[]{getChangedValueFormatPane(),null},
+                new Component[]{getPercentFormatPane(),null},
+                new Component[]{getChangedPercentFormatPane(),null},
+        };
+    }
+
+    protected Component[][] getRichTextComponents() {
+        return new Component[][]{
+                new Component[]{getRichTextCategoryNameFormatPane(), null},
+                new Component[]{getRichTextValueFormatPane(), null},
+                new Component[]{getRichTextChangedValueFormatPane(), null},
+                new Component[]{getRichTextPercentFormatPane(), null},
+                new Component[]{getRichTextChangedPercentFormatPane(), null}
         };
     }
 }

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

@@ -23,9 +23,17 @@ public class TooltipContentPaneWithOutSeries extends VanChartTooltipContentPane
 
     protected Component[][] getPaneComponents(){
         return new Component[][]{
-                new Component[]{categoryNameFormatPane,null},
-                new Component[]{valueFormatPane,null},
-                new Component[]{percentFormatPane,null},
+                new Component[]{getCategoryNameFormatPane(),null},
+                new Component[]{getValueFormatPane(),null},
+                new Component[]{getPercentFormatPane(),null},
+        };
+    }
+
+    protected Component[][] getRichTextComponents() {
+        return new Component[][]{
+                new Component[]{getRichTextCategoryNameFormatPane(), null},
+                new Component[]{getRichTextValueFormatPane(), null},
+                new Component[]{getRichTextPercentFormatPane(), null}
         };
     }
 }

designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartLabelConditionPane.java

@@ -4,6 +4,7 @@ import com.fr.chart.base.DataSeriesCondition;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.plugin.chart.base.AttrLabel;
+import com.fr.van.chart.designer.style.label.VanChartPlotLabelNoCheckPane;
 import com.fr.van.chart.designer.style.label.VanChartPlotLabelPane;
 
 import javax.swing.JPanel;
@@ -25,7 +26,7 @@ public class VanChartLabelConditionPane extends AbstractNormalMultiLineCondition
     }
 
     protected VanChartPlotLabelPane createLabelPane() {
-        return new VanChartPlotLabelPane(getPlot(),null, true);
+        return new VanChartPlotLabelNoCheckPane(getPlot(),null);
     }
 
     public VanChartLabelConditionPane(ConditionAttributesPane conditionAttributesPane, Plot plot) {

designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/component/VanChartAxisButtonPane.java

@@ -8,7 +8,6 @@ import com.fr.design.gui.imenu.UIMenuItem;
 import com.fr.design.gui.imenu.UIPopupMenu;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.ComparatorUtils;
-
 import com.fr.plugin.chart.VanChartAttrHelper;
 import com.fr.plugin.chart.attr.axis.VanChartAxis;
 import com.fr.plugin.chart.attr.plot.VanChartAxisPlot;
@@ -18,6 +17,8 @@ import javax.swing.BorderFactory;
 import javax.swing.BoxLayout;
 import javax.swing.Icon;
 import javax.swing.JPanel;
+import java.util.ArrayList;
+import java.util.List;
 import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.awt.FlowLayout;
@@ -29,8 +30,6 @@ import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.awt.geom.Rectangle2D;
 import java.awt.image.BufferedImage;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * 坐标轴-上方按钮界面
@@ -41,9 +40,12 @@ public class VanChartAxisButtonPane extends BasicBeanPane<VanChartAxisPlot> {
     private static final int B_W = 56;
     private static final int B_H = 21;
     private static final int COL_COUNT = 3;
+    private static final int MAX_COUNT = 20;
 
     private UIButton addButton;
     private UIPopupMenu popupMenu;
+    private UIMenuItem itemX;
+    private UIMenuItem itemY;
 
     private List<ChartAxisButton> indexList_X = new ArrayList<ChartAxisButton>();
     private List<ChartAxisButton> indexList_Y = new ArrayList<ChartAxisButton>();
@@ -51,7 +53,7 @@ public class VanChartAxisButtonPane extends BasicBeanPane<VanChartAxisPlot> {
 
     private VanChartAxisPane parent;
 
-    public VanChartAxisButtonPane(VanChartAxisPane vanChartAxisPane){
+    public VanChartAxisButtonPane(VanChartAxisPane vanChartAxisPane) {
         this.parent = vanChartAxisPane;
         this.setLayout(new BorderLayout());
 
@@ -66,6 +68,20 @@ public class VanChartAxisButtonPane extends BasicBeanPane<VanChartAxisPlot> {
         buttonPane.setBorder(BorderFactory.createEmptyBorder(0, 5, 10, 0));
         this.add(buttonPane, BorderLayout.CENTER);
 
+        itemX = new UIMenuItem(VanChartAttrHelper.X_AXIS_PREFIX);
+        itemX.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                addXAxis();
+            }
+        });
+        itemY = new UIMenuItem(VanChartAttrHelper.Y_AXIS_PREFIX);
+        itemY.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                addYAxis();
+            }
+        });
         addButton.addActionListener(addListener);
     }
 
@@ -92,12 +108,12 @@ public class VanChartAxisButtonPane extends BasicBeanPane<VanChartAxisPlot> {
                 pane = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0));
                 buttonPane.add(pane);
             }
-            if(pane != null) {
+            if (pane != null) {
                 pane.add(indexList_Y.get(i));
             }
         }
 
-        if(popupMenu != null){
+        if (popupMenu != null) {
             popupMenu.setVisible(false);
         }
 
@@ -114,19 +130,19 @@ public class VanChartAxisButtonPane extends BasicBeanPane<VanChartAxisPlot> {
         indexList_X.clear();
         indexList_Y.clear();
         List<VanChartAxis> xList = plot.getXAxisList();
-        for(VanChartAxis axis : xList){
+        for (VanChartAxis axis : xList) {
             ChartAxisButton x = new ChartAxisButton(plot.getXAxisName(axis));
             x.setToolTipText(plot.getXAxisName(axis));
             indexList_X.add(x);
         }
         List<VanChartAxis> yList = plot.getYAxisList();
-        for(VanChartAxis axis : yList){
+        for (VanChartAxis axis : yList) {
             ChartAxisButton y = new ChartAxisButton(plot.getYAxisName(axis));
             y.setToolTipText(plot.getYAxisName(axis));
             indexList_Y.add(y);
         }
 
-        if(indexList_X.isEmpty()){
+        if (indexList_X.isEmpty()) {
             this.removeAll();
         } else {
             indexList_X.get(0).setSelected(true);
@@ -143,7 +159,7 @@ public class VanChartAxisButtonPane extends BasicBeanPane<VanChartAxisPlot> {
         return null;
     }
 
-    public String getNewChartName(List<ChartAxisButton> existList, String prefix){
+    public String getNewChartName(List<ChartAxisButton> existList, String prefix) {
         int count = existList.size() + 1;
         while (true) {
             String name_test = prefix + count;
@@ -165,31 +181,19 @@ public class VanChartAxisButtonPane extends BasicBeanPane<VanChartAxisPlot> {
     ActionListener addListener = new ActionListener() {
         @Override
         public void actionPerformed(ActionEvent e) {
-            if(popupMenu == null){
-                popupMenu = new UIPopupMenu();
-                UIMenuItem item_x = new UIMenuItem(VanChartAttrHelper.X_AXIS_PREFIX);
-                item_x.addActionListener(new ActionListener() {
-                    @Override
-                    public void actionPerformed(ActionEvent e) {
-                        addXAxis();
-                    }
-                });
-                UIMenuItem item_y = new UIMenuItem(VanChartAttrHelper.Y_AXIS_PREFIX);
-                item_y.addActionListener(new ActionListener() {
-                    @Override
-                    public void actionPerformed(ActionEvent e) {
-                        addYAxis();
-                    }
-                });
-                popupMenu.add(item_x);
-                popupMenu.add(item_y);
+            popupMenu = new UIPopupMenu();
+            if (indexList_X.size() < MAX_COUNT) {
+                popupMenu.add(itemX);
+            }
+            if (indexList_Y.size() < MAX_COUNT) {
+                popupMenu.add(itemY);
             }
             popupMenu.setVisible(true);
             GUICoreUtils.showPopupMenu(popupMenu, addButton, addButton.getWidth() - popupMenu.getPreferredSize().width, addButton.getY() - 1 + addButton.getHeight());
         }
     };
 
-    private void addXAxis(){
+    private void addXAxis() {
         String name = getNewChartName(indexList_X, VanChartAttrHelper.X_AXIS_PREFIX);
         ChartAxisButton button = new ChartAxisButton(name);
 
@@ -199,7 +203,7 @@ public class VanChartAxisButtonPane extends BasicBeanPane<VanChartAxisPlot> {
         layoutPane();
     }
 
-    private void addYAxis(){
+    private void addYAxis() {
         String name = getNewChartName(indexList_Y, VanChartAttrHelper.Y_AXIS_PREFIX);
         ChartAxisButton button = new ChartAxisButton(name);
 
@@ -216,9 +220,10 @@ public class VanChartAxisButtonPane extends BasicBeanPane<VanChartAxisPlot> {
 
     private class AddButton extends UIButton {
 
-        public AddButton(Icon icon){
+        public AddButton(Icon icon) {
             super(icon);
         }
+
         /**
          * 组件是否需要响应添加的观察者事件
          *
@@ -277,19 +282,19 @@ public class VanChartAxisButtonPane extends BasicBeanPane<VanChartAxisPlot> {
         }
 
         private void noSelected() {
-            for(ChartAxisButton button : indexList_X){
+            for (ChartAxisButton button : indexList_X) {
                 button.setSelected(false);
             }
-            for(ChartAxisButton button : indexList_Y){
+            for (ChartAxisButton button : indexList_Y) {
                 button.setSelected(false);
             }
         }
 
         private void checkMoveOn(boolean moveOn) {
-            for(ChartAxisButton button : indexList_X){
+            for (ChartAxisButton button : indexList_X) {
                 button.isMoveOn = false;
             }
-            for(ChartAxisButton button : indexList_Y){
+            for (ChartAxisButton button : indexList_Y) {
                 button.isMoveOn = false;
             }
 

designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugeCateOrPercentLabelDetailPane.java

@@ -22,7 +22,7 @@ public class VanChartGaugeCateOrPercentLabelDetailPane extends VanChartGaugeLabe
     }
 
     protected double[] getLabelPaneRowSize(Plot plot, double p) {
-        if (hasLabelAlign(plot)) {
+        if (hasLabelAlignPane()) {
             return new double[]{p, p, p, p};
         }
 
@@ -37,10 +37,10 @@ public class VanChartGaugeCateOrPercentLabelDetailPane extends VanChartGaugeLabe
         switch (getGaugeStyle()) {
             case POINTER:
             case POINTER_SEMI:
-                dataLabelContentPane = new LabelContentPaneWithCate(parent, VanChartGaugeCateOrPercentLabelDetailPane.this);
+                setDataLabelContentPane(new LabelContentPaneWithCate(getParentPane(), VanChartGaugeCateOrPercentLabelDetailPane.this));
                 break;
             default:
-                dataLabelContentPane = new LabelContentPaneWithPercent(parent, VanChartGaugeCateOrPercentLabelDetailPane.this);
+                setDataLabelContentPane(new LabelContentPaneWithPercent(getParentPane(), VanChartGaugeCateOrPercentLabelDetailPane.this));
                 break;
         }
     }

designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugeLabelDetailPane.java

@@ -24,6 +24,8 @@ 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;
 
 /**
  * Created by mengao on 2017/8/13.
@@ -35,6 +37,8 @@ public class VanChartGaugeLabelDetailPane extends VanChartPlotLabelDetailPane {
     private UIButtonGroup<Integer> align;
     private JPanel alignPane;
     private Integer[] oldAlignValues;
+    private UIButtonGroup<Integer> style;
+    private ChartTextAttrPane textFontPane;
 
     public VanChartGaugeLabelDetailPane(Plot plot, VanChartStylePane parent) {
         super(plot, parent);
@@ -63,6 +67,15 @@ public class VanChartGaugeLabelDetailPane extends VanChartPlotLabelDetailPane {
         return TableLayoutHelper.createTableLayoutPane(getLabelStyleComponents(plot), row, col);
     }
 
+    protected void initStyleListener() {
+        style.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                checkStyleUse();
+            }
+        });
+    }
+
     protected boolean isFontSizeAuto() {
         return false;
     }
@@ -101,8 +114,9 @@ public class VanChartGaugeLabelDetailPane extends VanChartPlotLabelDetailPane {
         };
     }
 
-    protected JPanel getLabelPositionPane(Component[][] comps, double[] row, double[] col) {
-        return TableLayoutHelper.createTableLayoutPane(comps, row, col);
+    // 仪表盘标签内无布局tab
+    protected JPanel getLabelLayoutPane(JPanel panel, String title) {
+        return panel;
     }
 
     protected JPanel createTableLayoutPaneWithTitle(String title, JPanel panel) {
@@ -110,17 +124,20 @@ public class VanChartGaugeLabelDetailPane extends VanChartPlotLabelDetailPane {
     }
 
     protected Component[][] getLabelPaneComponents(Plot plot, double p, double[] columnSize) {
-        if (hasLabelAlign(plot)) {
+        if (hasLabelAlignPane()) {
 
             return new Component[][]{
-                    new Component[]{dataLabelContentPane, null},
+                    new Component[]{getDataLabelContentPane(), null},
                     new Component[]{createLabelPositionPane(Toolkit.i18nText("Fine-Design_Chart_Layout_Vertical"), plot), null},
                     new Component[]{createLabelAlignPane(Toolkit.i18nText("Fine-Design_Chart_Layout_Horizontal")), null},
                     new Component[]{createLabelStylePane(getLabelStyleRowSize(p), columnSize, plot), null},
             };
         } else {
 
-            return super.getLabelPaneComponents(plot, p, columnSize);
+            return new Component[][]{
+                    new Component[]{getDataLabelContentPane(), null},
+                    new Component[]{createLabelStylePane(getLabelStyleRowSize(p), columnSize, plot), null},
+            };
         }
     }
 
@@ -170,8 +187,8 @@ public class VanChartGaugeLabelDetailPane extends VanChartPlotLabelDetailPane {
         alignPane.setLayout(new BorderLayout());
         alignPane.add(getLabelPositionPane(comps, row, col), BorderLayout.CENTER);
 
-        if (parent != null) {
-            parent.initListener(alignPane);
+        if (getParentPane() != null) {
+            getParentPane().initListener(alignPane);
         }
     }
 
@@ -206,19 +223,29 @@ public class VanChartGaugeLabelDetailPane extends VanChartPlotLabelDetailPane {
         return getGaugeStyle() == GaugeStyle.THERMOMETER && !((VanChartGaugePlot) plot).getGaugeDetailStyle().isHorizontalLayout();
     }
 
+    protected boolean hasLabelAlignPane() {
+        return getGaugeStyle() == GaugeStyle.THERMOMETER;
+    }
+
     public void populate(AttrLabelDetail detail) {
         super.populate(detail);
 
         style.setSelectedIndex(1);
+        textFontPane.populate(detail.getTextAttr());
         if (hasLabelAlign(this.getPlot()) && align != null) {
             align.setSelectedItem(detail.getAlign());
         }
+
+        checkStyleUse();
     }
 
     public void update(AttrLabelDetail detail) {
         super.update(detail);
 
         detail.setCustom(true);
+        if (textFontPane != null) {
+            detail.setTextAttr(textFontPane.update());
+        }
         if (align != null) {
             if (align.getSelectedItem() != null) {
                 detail.setAlign(align.getSelectedItem());

designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugePlotLabelPane.java

@@ -1,13 +1,15 @@
 package com.fr.van.chart.designer.style.label;
 
 import com.fr.chart.chartattr.Plot;
-
+import com.fr.design.gui.ibutton.UIButtonGroup;
+import com.fr.design.i18n.Toolkit;
+import com.fr.plugin.chart.attr.GaugeDetailStyle;
 import com.fr.plugin.chart.base.AttrLabel;
+import com.fr.plugin.chart.base.AttrLabelDetail;
 import com.fr.plugin.chart.gauge.VanChartGaugePlot;
 import com.fr.plugin.chart.type.GaugeStyle;
 import com.fr.van.chart.designer.TableLayout4VanChartHelper;
 import com.fr.van.chart.designer.style.VanChartStylePane;
-import com.fr.design.i18n.Toolkit;
 
 import javax.swing.JPanel;
 import java.awt.BorderLayout;
@@ -18,6 +20,9 @@ import java.awt.BorderLayout;
 public class VanChartGaugePlotLabelPane extends VanChartPlotLabelPane {
     private static final long serialVersionUID = -322148616244458359L;
 
+    private UIButtonGroup<Integer> orientation;
+    private JPanel layoutPane;
+
     private VanChartPlotLabelDetailPane gaugeValueLabelPane;
 
     public VanChartGaugePlotLabelPane(Plot plot, VanChartStylePane parent) {
@@ -25,10 +30,10 @@ public class VanChartGaugePlotLabelPane extends VanChartPlotLabelPane {
     }
 
     protected void createLabelPane() {
-        labelPane = new JPanel(new BorderLayout(0, 4));
-        labelDetailPane = new VanChartGaugeCateOrPercentLabelDetailPane(this.plot, this.parent);
-        gaugeValueLabelPane = new VanChartGaugeValueLabelDetailPane(this.plot, this.parent);
-        GaugeStyle gaugeStyle = ((VanChartGaugePlot)this.plot).getGaugeStyle();
+        setLabelPane(new JPanel(new BorderLayout(0, 4)));
+        setLabelDetailPane(new VanChartGaugeCateOrPercentLabelDetailPane(getPlot(), getParentPane()));
+        gaugeValueLabelPane = new VanChartGaugeValueLabelDetailPane(getPlot(), getParentPane());
+        GaugeStyle gaugeStyle = ((VanChartGaugePlot)getPlot()).getGaugeStyle();
         String cateTitle, valueTitle = Toolkit.i18nText("Fine-Design_Chart_Value_Label");
         switch (gaugeStyle){
             case POINTER:
@@ -39,25 +44,67 @@ public class VanChartGaugePlotLabelPane extends VanChartPlotLabelPane {
                 cateTitle = Toolkit.i18nText("Fine-Design_Chart_Percent_Label");
                 break;
         }
-        JPanel cateOrPercentPane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(cateTitle, labelDetailPane);
+        JPanel cateOrPercentPane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(cateTitle, getLabelDetailPane());
         JPanel valuePane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(valueTitle, gaugeValueLabelPane);
-        labelPane.add(cateOrPercentPane, BorderLayout.NORTH);
-        labelPane.add(valuePane, BorderLayout.SOUTH);
+
+        layoutPane = createGaugeLabelLayoutPane();
+
+        getLabelPane().add(cateOrPercentPane, BorderLayout.NORTH);
+        getLabelPane().add(valuePane, BorderLayout.CENTER);
+        getLabelPane().add(layoutPane, BorderLayout.SOUTH);
+
+        checkLayoutPaneVisible();
+    }
+
+    private void checkLayoutPaneVisible() {
+        layoutPane.setVisible(showLayoutPane());
+    }
+
+    private boolean showLayoutPane() {
+        VanChartGaugePlot plot = (VanChartGaugePlot) this.getPlot();
+        GaugeDetailStyle gaugeDetailStyle = plot.getGaugeDetailStyle();
+
+        return plot.getGaugeStyle() == GaugeStyle.THERMOMETER && gaugeDetailStyle != null && gaugeDetailStyle.isHorizontalLayout();
+    }
+
+    // 试管仪表盘横行布局时，正常标签外增加布局tab，同时控制百分比和值标签的文本方向
+    private JPanel createGaugeLabelLayoutPane() {
+        orientation = new UIButtonGroup<>(new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_Direction_Horizontal"),
+                Toolkit.i18nText("Fine-Design_Chart_Direction_Vertical"),
+        });
+
+        JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(Toolkit.i18nText("Fine-Design_Chart_Text_Orientation"), orientation);
+
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Form_Attr_Layout"), panel);
     }
 
     public void populate(AttrLabel attr) {
         super.populate(attr);
 
         if(gaugeValueLabelPane != null && attr != null){
-            gaugeValueLabelPane.populate(attr.getGaugeValueLabelDetail());
+            AttrLabelDetail labelDetail = attr.getGaugeValueLabelDetail();
+            gaugeValueLabelPane.populate(labelDetail);
+            orientation.setSelectedIndex(labelDetail.isHorizontal() ? 0 : 1);
+
+            checkLayoutPaneVisible();
         }
     }
 
     public AttrLabel update() {
         AttrLabel attrLabel = super.update();
+
         if(gaugeValueLabelPane != null && attrLabel != null){
-            gaugeValueLabelPane.update(attrLabel.getGaugeValueLabelDetail());
+            AttrLabelDetail defaultLabelDetail = attrLabel.getAttrLabelDetail();
+            AttrLabelDetail valueLabelDetail = attrLabel.getGaugeValueLabelDetail();
+
+            gaugeValueLabelPane.update(valueLabelDetail);
+
+            boolean horizontal = orientation.getSelectedIndex() == 0;
+            defaultLabelDetail.setHorizontal(horizontal);
+            valueLabelDetail.setHorizontal(horizontal);
         }
+
         return attrLabel;
     }
 }

designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugeValueLabelDetailPane.java

@@ -24,10 +24,10 @@ public class VanChartGaugeValueLabelDetailPane extends VanChartGaugeLabelDetailP
         switch (getGaugeStyle()) {
             case POINTER:
             case POINTER_SEMI:
-                dataLabelContentPane = new LabelContentPaneWithOutCate(parent, VanChartGaugeValueLabelDetailPane.this);
+                setDataLabelContentPane(new LabelContentPaneWithOutCate(getParentPane(), VanChartGaugeValueLabelDetailPane.this));
                 break;
             default:
-                dataLabelContentPane = new LabelContentPaneWithCateValue(parent, VanChartGaugeValueLabelDetailPane.this);
+                setDataLabelContentPane(new LabelContentPaneWithCateValue(getParentPane(), VanChartGaugeValueLabelDetailPane.this));
                 break;
         }
     }
@@ -44,7 +44,7 @@ public class VanChartGaugeValueLabelDetailPane extends VanChartGaugeLabelDetailP
 
     private Component[][] getLabelPaneComponentsWithBackground(Plot plot, double p, double[] columnSize) {
         return new Component[][]{
-                new Component[]{dataLabelContentPane, null},
+                new Component[]{getDataLabelContentPane(), null},
                 new Component[]{createLabelStylePane(new double[]{p}, columnSize, plot), null},
                 new Component[]{createBackgroundColorPane(), null},
         };

designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartPlotLabelDetailPane.java

@@ -11,7 +11,6 @@ import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane;
-import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPaneWithPreStyle;
 import com.fr.design.style.color.ColorSelectBox;
 import com.fr.general.ComparatorUtils;
 import com.fr.plugin.chart.attr.plot.VanChartLabelPositionPlot;
@@ -20,6 +19,8 @@ import com.fr.plugin.chart.base.AttrTooltipContent;
 import com.fr.stable.Constants;
 import com.fr.van.chart.designer.PlotFactory;
 import com.fr.van.chart.designer.TableLayout4VanChartHelper;
+import com.fr.van.chart.designer.component.background.VanChartBackgroundWithOutImagePane;
+import com.fr.van.chart.designer.component.border.VanChartBorderWithShapePane;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
 import javax.swing.JPanel;
@@ -28,9 +29,6 @@ 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.event.ActionEvent;
-import java.awt.event.ActionListener;
 
 /**
  * Created by Mitisky on 15/12/7.
@@ -38,41 +36,47 @@ import java.awt.event.ActionListener;
 public class VanChartPlotLabelDetailPane extends BasicPane {
     private static final long serialVersionUID = -22438250307946275L;
 
-    protected BasicBeanPane<AttrTooltipContent> dataLabelContentPane;
+    private BasicBeanPane<AttrTooltipContent> dataLabelContentPane;
 
-    protected UIButtonGroup<Integer> position;
-    protected UIButtonGroup<Boolean> autoAdjust;
-    protected UIToggleButton tractionLine;
+    private UIButtonGroup<Integer> position;
+    private UIButtonGroup<Boolean> autoAdjust;
+    private UIButtonGroup<Integer> orientation;
+    private UIToggleButton tractionLine;
 
-    protected UIButtonGroup<Integer> style;
-    protected ChartTextAttrPane textFontPane;
-
-    protected ColorSelectBox backgroundColor;
+    private ColorSelectBox backgroundColor;
+    private VanChartBorderWithShapePane borderPane;
+    private VanChartBackgroundWithOutImagePane backgroundPane;
 
     private JPanel tractionLinePane;
     private JPanel positionPane;
     private Integer[] oldPositionValues;
 
-    protected VanChartStylePane parent;
+    private VanChartStylePane parent;
     private Plot plot;
-    private boolean inCondition;
 
     public VanChartPlotLabelDetailPane(Plot plot, VanChartStylePane parent) {
-        this(plot, parent, false);
-    }
-
-    public VanChartPlotLabelDetailPane(Plot plot, VanChartStylePane parent, boolean inCondition) {
         this.parent = parent;
         this.plot = plot;
-        this.inCondition = inCondition;
         initLabelDetailPane(plot);
     }
 
-    protected void initLabelDetailPane(Plot plot) {
+    public BasicBeanPane<AttrTooltipContent> getDataLabelContentPane() {
+        return dataLabelContentPane;
+    }
+
+    public void setDataLabelContentPane(BasicBeanPane<AttrTooltipContent> dataLabelContentPane) {
+        this.dataLabelContentPane = dataLabelContentPane;
+    }
+
+    public VanChartStylePane getParentPane() {
+        return parent;
+    }
+
+    protected void initLabelDetailPane (Plot plot) {
         this.setLayout(new BorderLayout());
         initToolTipContentPane(plot);
         JPanel contentPane = createLabelPane(plot);
-        this.add(contentPane, BorderLayout.CENTER);
+        this.add(contentPane,BorderLayout.CENTER);
     }
 
     public Plot getPlot() {
@@ -96,18 +100,49 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
     }
 
     protected Component[][] getLabelPaneComponents(Plot plot, double p, double[] columnSize) {
-        if (hasLabelPosition(plot)) {
-            return new Component[][]{
-                    new Component[]{dataLabelContentPane, null},
-                    new Component[]{createLabelPositionPane(Toolkit.i18nText("Fine-Design_Chart_Layout_Position"), plot), null},
-                    new Component[]{createLabelStylePane(getLabelStyleRowSize(p), columnSize, plot), null},
-            };
-        } else {
+        if(hasLabelPosition(plot)){
+
+            // 仅饼图、柱形图、条形图、折线图、面积图含有边框和背景
+            if (hasBorderAndBackground(plot)) {
+                return new Component[][]{
+                        new Component[]{dataLabelContentPane,null},
+                        new Component[]{createLabelPositionPane(Toolkit.i18nText("Fine-Design_Chart_Layout_Position"), plot), null},
+                        new Component[]{createLabelBorderPane(), null},
+                        new Component[]{createLabelBackgroundPane(), null}
+                };
+            }
+
             return new Component[][]{
-                    new Component[]{dataLabelContentPane, null},
-                    new Component[]{createLabelStylePane(getLabelStyleRowSize(p), columnSize, plot), null},
+                    new Component[]{dataLabelContentPane,null},
+                    new Component[]{createLabelPositionPane(Toolkit.i18nText("Fine-Design_Chart_Layout_Position"), plot), null}
             };
         }
+
+        return  new Component[][]{
+                new Component[]{dataLabelContentPane,null}
+        };
+    }
+
+    private JPanel createLabelBorderPane() {
+        borderPane  = new VanChartBorderWithShapePane();
+
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Border"), borderPane);
+    }
+
+    private JPanel createLabelBackgroundPane() {
+        backgroundPane = new VanChartBackgroundWithOutImagePane(){
+
+            protected Component[][] getPaneComponents() {
+                return new Component[][]{
+                        new Component[]{null, null},
+                        new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Report_Fill")), typeComboBox},
+                        new Component[]{null, centerPane},
+                        new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Report_Alpha")), transparent},
+                };
+            }
+        };
+
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Background"), backgroundPane);
     }
 
     protected double[] getLabelStyleRowSize(double p) {
@@ -115,13 +150,17 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
     }
 
     protected double[] getLabelPaneRowSize(Plot plot, double p) {
-        return hasLabelPosition(plot) ? new double[]{p, p, p, p, p} : new double[]{p, p, p};
+        return hasLabelPosition(plot) ? new double[]{p,p,p,p,p} : new double[]{p,p,p};
     }
 
     protected boolean hasLabelPosition(Plot plot) {
         return plot instanceof VanChartLabelPositionPlot;
     }
 
+    private boolean hasBorderAndBackground(Plot plot) {
+        return PlotFactory.hasBorderAndBackgroundPlotLabel(plot);
+    }
+
     protected JPanel createTableLayoutPaneWithTitle(String title, JPanel panel) {
         return TableLayout4VanChartHelper.createExpandablePaneWithTitle(title, panel);
     }
@@ -156,8 +195,11 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
 
         positionPane = new JPanel();
         checkPositionPane(title);
-        panel.add(positionPane, BorderLayout.CENTER);
+        panel.add(positionPane, BorderLayout.NORTH);
 
+        if (hasLabelOrientationPane()) {
+            panel.add(createLabelOrientationPane(), BorderLayout.CENTER);
+        }
 
         if (plot.isSupportLeadLine()) {
             tractionLine = new UIToggleButton(Toolkit.i18nText("Fine-Design_Chart_Show_Guideline"));
@@ -167,7 +209,25 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
         } else if (PlotFactory.plotAutoAdjustLabelPosition(plot)) {
             panel.add(TableLayout4VanChartHelper.createGapTableLayoutPane(Toolkit.i18nText("Fine-Design_Chart_Auto_Adjust"), autoAdjust), BorderLayout.SOUTH);
         }
-        return panel;
+
+        return getLabelLayoutPane(panel, Toolkit.i18nText("Fine-Design_Form_Attr_Layout"));
+    }
+
+    protected JPanel getLabelLayoutPane(JPanel panel, String title) {
+        return createTableLayoutPaneWithTitle(title, panel);
+    }
+
+    protected boolean hasLabelOrientationPane() {
+        return false;
+    }
+
+    private JPanel createLabelOrientationPane() {
+        orientation = new UIButtonGroup<>(new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_Direction_Horizontal"),
+                Toolkit.i18nText("Fine-Design_Chart_Direction_Vertical"),
+        });
+
+        return TableLayout4VanChartHelper.createGapTableLayoutPane(Toolkit.i18nText("Fine-Design_Chart_Text_Orientation"), orientation);
     }
 
     protected void checkPositionPane(String title) {
@@ -204,13 +264,10 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
         }
     }
 
-
-    protected JPanel getLabelPositionPane(Component[][] comps, double[] row, double[] col) {
-        JPanel panel = TableLayoutHelper.createTableLayoutPane(comps, row, col);
-        return createTableLayoutPaneWithTitle(Toolkit.i18nText("Fine-Design_Form_Attr_Layout"), panel);
+    protected JPanel getLabelPositionPane (Component[][] comps, double[] row, double[] col){
+        return TableLayoutHelper.createTableLayoutPane(comps, row, col);
     }
 
-
     protected void initPositionListener() {
         position.addChangeListener(new ChangeListener() {
             @Override
@@ -220,49 +277,16 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
         });
     }
 
-    protected JPanel createLabelStylePane(double[] row, double[] col, Plot plot) {
-        style = new UIButtonGroup<Integer>(new String[]{Toolkit.i18nText("Fine-Design_Chart_Automatic"),
-                Toolkit.i18nText("Fine-Design_Chart_Custom")});
-        textFontPane = initTextFontPane();
-
-        initStyleListener();
-
-        JPanel panel = inCondition ? TableLayout4VanChartHelper.createGapTableLayoutPane(getLabelStyleComponents(plot), row, col) :
-                textFontPane;
-        return createTableLayoutPaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Widget_Style"), panel);
-    }
-
-    protected ChartTextAttrPane initTextFontPane() {
-        if (inCondition) {
-            return new ChartTextAttrPane() {
-                protected Component[][] getComponents(JPanel buttonPane) {
-                    return new Component[][]{
-                            new Component[]{null, null},
-                            new Component[]{null, getFontNameComboBox()},
-                            new Component[]{null, buttonPane}
-                    };
-                }
-            };
-        }
-        return new ChartTextAttrPaneWithPreStyle();
-    }
-
-    protected Component[][] getLabelStyleComponents(Plot plot) {
-        UILabel text = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Character"), SwingConstants.LEFT);
-        return new Component[][]{
-                new Component[]{null, null},
-                new Component[]{text, style},
-                new Component[]{textFontPane, null},
-        };
-    }
-
-    protected void initStyleListener() {
-        style.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                checkStyleUse();
+    protected ChartTextAttrPane initTextFontPane () {
+        return new ChartTextAttrPane(){
+            protected Component[][] getComponents(JPanel buttonPane) {
+                return new Component[][]{
+                        new Component[]{null, null},
+                        new Component[]{null, getFontNameComboBox()},
+                        new Component[]{null, buttonPane}
+                };
             }
-        });
+        };
     }
 
     protected JPanel createBackgroundColorPane() {
@@ -275,51 +299,49 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
     }
 
     private void checkAllUse() {
-        checkStyleUse();
-        if (tractionLine == null) {
+        if(tractionLine == null){
             return;
         }
         checkPositionEnabled();
     }
 
-    protected void checkStyleUse() {
-        if (inCondition) {
-            textFontPane.setVisible(style.getSelectedIndex() == 1);
-            textFontPane.setPreferredSize(style.getSelectedIndex() == 1 ? new Dimension(0, 60) : new Dimension(0, 0));
-        }
-    }
-
     private void checkPosition() {
         tractionLine.setSelected(position.getSelectedItem() == Constants.OUTSIDE);
         checkPositionEnabled();
     }
-
     private void checkPositionEnabled() {
         tractionLinePane.setVisible(position.getSelectedItem() == Constants.OUTSIDE);
     }
 
-    protected void checkPane() {
+    protected void checkPane(){
         checkPositionPane(Toolkit.i18nText("Fine-Design_Chart_Layout_Position"));
     }
 
     public void populate(AttrLabelDetail detail) {
         checkPane();
         dataLabelContentPane.populateBean(detail.getContent());
-        if (position != null) {
+        if(position != null){
             position.setSelectedItem(detail.getPosition());
         }
-        if (tractionLine != null) {
+        if(orientation != null){
+            orientation.setSelectedIndex(detail.isHorizontal() ? 0 : 1);
+        }
+        if(tractionLine != null){
             tractionLine.setSelected(detail.isShowGuidLine());
         }
-        if (autoAdjust != null) {
-            autoAdjust.setSelectedIndex(detail.isAutoAdjust() == true ? 0 : 1);
+        if(autoAdjust != null){
+            autoAdjust.setSelectedIndex(detail.isAutoAdjust() ? 0 : 1);
         }
-        style.setSelectedIndex(detail.isCustom() ? 1 : 0);
-        textFontPane.populate(detail.getTextAttr());
 
-        if (backgroundColor != null) {
+        if(backgroundColor != null){
             backgroundColor.setSelectObject(detail.getBackgroundColor());
         }
+        if(borderPane != null){
+            borderPane.populate(detail.getBorder());
+        }
+        if(backgroundPane != null){
+            backgroundPane.populate(detail.getBackground());
+        }
 
         checkAllUse();
     }
@@ -328,25 +350,30 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
     public void update(AttrLabelDetail detail) {
         detail.setContent(dataLabelContentPane.updateBean());
 
-        if (position != null && position.getSelectedItem() != null) {
+        if(position != null && position.getSelectedItem() != null){
             detail.setPosition(position.getSelectedItem());
 
-        } else if (position != null) {
+        } else if(position != null){
             position.setSelectedItem(detail.getPosition());
         }
 
         detail.setAutoAdjust(autoAdjust != null && autoAdjust.getSelectedItem());
 
-        if (tractionLine != null) {
-            detail.setShowGuidLine(tractionLine.isSelected() && detail.getPosition() == Constants.OUTSIDE);
+        if(orientation != null){
+            detail.setHorizontal(orientation.getSelectedIndex() == 0);
         }
-        detail.setCustom(style.getSelectedIndex() == 1);
-        if (textFontPane != null) {
-            textFontPane.update(detail.getTextAttr());
+        if(tractionLine != null){
+            detail.setShowGuidLine(tractionLine.isSelected() && detail.getPosition() == Constants.OUTSIDE);
         }
-        if (backgroundColor != null) {
+        if(backgroundColor != null){
             detail.setBackgroundColor(backgroundColor.getSelectObject());
         }
+        if(borderPane != null){
+            borderPane.update(detail.getBorder());
+        }
+        if(backgroundPane != null){
+            backgroundPane.update(detail.getBackground());
+        }
     }
 
-}
+}

designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartPlotLabelNoCheckPane.java

@@ -0,0 +1,30 @@
+package com.fr.van.chart.designer.style.label;
+
+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 VanChartPlotLabelNoCheckPane extends VanChartPlotLabelPane {
+
+    private static final long serialVersionUID = 8124894034484334810L;
+
+    public VanChartPlotLabelNoCheckPane(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/designer/style/label/VanChartPlotLabelPane.java

@@ -3,6 +3,7 @@ package com.fr.van.chart.designer.style.label;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.icheckbox.UICheckBox;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 
@@ -19,61 +20,76 @@ import java.awt.event.ActionListener;
 
 public class VanChartPlotLabelPane extends BasicPane {
     private static final long serialVersionUID = -1701936672446232396L;
-    protected UICheckBox isLabelShow;
+    private UICheckBox isLabelShow;
 
-    protected VanChartPlotLabelDetailPane labelDetailPane;
+    private VanChartPlotLabelDetailPane labelDetailPane;
 
-    protected VanChartStylePane parent;
-    protected Plot plot;
+    private VanChartStylePane parent;
+    private Plot plot;
 
-    protected JPanel labelPane;
-
-    protected boolean inCondition;
+    private JPanel labelPane;
 
     public VanChartPlotLabelPane(Plot plot, VanChartStylePane parent) {
-        this(plot, parent, false);
-    }
-
-    public VanChartPlotLabelPane(Plot plot, VanChartStylePane parent, boolean inCondition) {
         this.parent = parent;
         this.plot = plot;
-        this.inCondition = inCondition;
-        isLabelShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Label"));
+        isLabelShow = new UICheckBox(Toolkit.i18nText("Fine-Design_Chart_Use_Label"));
         labelPane = new JPanel(new BorderLayout(0, 4));
         createLabelPane();
         addComponents();
     }
 
+    public UICheckBox getLabelShowCheckBox() {
+        return isLabelShow;
+    }
+
+    public VanChartPlotLabelDetailPane getLabelDetailPane() {
+        return labelDetailPane;
+    }
+
+    public void setLabelDetailPane(VanChartPlotLabelDetailPane labelDetailPane) {
+        this.labelDetailPane = labelDetailPane;
+    }
+
+    public VanChartStylePane getParentPane() {
+        return parent;
+    }
+
+    public Plot getPlot() {
+        return plot;
+    }
+
+    public JPanel getLabelPane() {
+        return labelPane;
+    }
+
+    public void setLabelPane(JPanel labelPane) {
+        this.labelPane = labelPane;
+    }
+
     protected void createLabelPane() {
-        labelDetailPane = new VanChartPlotLabelDetailPane(this.plot, this.parent, inCondition);
+        labelDetailPane = new VanChartPlotLabelDetailPane(this.plot, this.parent);
         labelPane.add(labelDetailPane, BorderLayout.CENTER);
     }
 
     protected void addComponents() {
+        double p = TableLayout.PREFERRED;
+        double f = TableLayout.FILL;
+        double[] columnSize = {f};
+        double[] rowSize = {p,p};
+        Component[][] components = new Component[][]{
+                new Component[]{isLabelShow},
+                new Component[]{labelPane}
+        };
+
+        JPanel panel = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
         this.setLayout(new BorderLayout());
-        if (inCondition) {
-            isLabelShow.setSelected(true);
-            this.add(labelPane, BorderLayout.CENTER);
-        } else {
-            double p = TableLayout.PREFERRED;
-            double f = TableLayout.FILL;
-            double[] columnSize = {f};
-            double[] rowSize = {p, p};
-            Component[][] components = new Component[][]{
-                    new Component[]{isLabelShow},
-                    new Component[]{labelPane}
-            };
-
-            JPanel panel = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
-            this.setLayout(new BorderLayout());
-            this.add(panel, BorderLayout.CENTER);
-
-            isLabelShow.addActionListener(new ActionListener() {
-                public void actionPerformed(ActionEvent e) {
-                    checkBoxUse();
-                }
-            });
-        }
+        this.add(panel,BorderLayout.CENTER);
+
+        isLabelShow.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                checkBoxUse();
+            }
+        });
     }
 
     @Override
@@ -83,7 +99,7 @@ public class VanChartPlotLabelPane extends BasicPane {
 
     private void checkBoxUse() {
         labelPane.setVisible(isLabelShow.isSelected());
-        if (checkEnabled4Large()) {
+        if(checkEnabled4Large()) {
             isLabelShow.setEnabled(!PlotFactory.largeDataModel(plot));
         }
     }
@@ -93,21 +109,19 @@ public class VanChartPlotLabelPane extends BasicPane {
     }
 
     public void populate(AttrLabel attr) {
-        if (attr == null) {
-            attr = ((VanChartPlot) this.plot).getDefaultAttrLabel();
+        if(attr == null) {
+            attr = ((VanChartPlot)this.plot).getDefaultAttrLabel();
         }
+        isLabelShow.setSelected(attr.isEnable());
 
         labelDetailPane.populate(attr.getAttrLabelDetail());
 
-        if (!inCondition) {
-            isLabelShow.setSelected(attr.isEnable());
-            checkBoxUse();
-        }
+        checkBoxUse();
     }
 
     public AttrLabel update() {
         //刪除返回null,否則無法保存不顯示標籤的屬性
-        AttrLabel attrLabel = ((VanChartPlot) this.plot).getDefaultAttrLabel();
+        AttrLabel attrLabel = ((VanChartPlot)this.plot).getDefaultAttrLabel();
         attrLabel.setEnable(isLabelShow.isSelected());
 
         labelDetailPane.update(attrLabel.getAttrLabelDetail());

designer-chart/src/main/java/com/fr/van/chart/designer/style/tooltip/VanChartPlotRefreshTooltipPane.java

@@ -72,7 +72,6 @@ public class VanChartPlotRefreshTooltipPane extends VanChartPlotTooltipNoCheckPa
         Component[][] components = new Component[][]{
                 new Component[]{refreshTooltipContentPane,null},
                 new Component[]{initDurationPane(),null},
-                new Component[]{createLabelStylePane(),null},
                 new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border"),borderPane),null},
                 new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Background"), backgroundPane),null},
 

designer-chart/src/main/java/com/fr/van/chart/designer/style/tooltip/VanChartPlotTooltipPane.java

@@ -7,8 +7,6 @@ import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
-import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane;
-
 import com.fr.design.utils.gui.UIComponentUtils;
 import com.fr.design.widget.FRWidgetFactory;
 import com.fr.plugin.chart.base.AttrTooltip;
@@ -28,13 +26,11 @@ import java.awt.event.ActionListener;
 public class VanChartPlotTooltipPane extends BasicPane {
     private static final long serialVersionUID = 6087381131907589370L;
 
+    // todo 使用private
     protected UICheckBox isTooltipShow;
 
     protected VanChartTooltipContentPane tooltipContentPane;
 
-    protected UIButtonGroup<Integer> style;
-    protected ChartTextAttrPane textFontPane;
-
     protected VanChartBorderWithRadiusPane borderPane;
 
     protected VanChartBackgroundWithOutImagePane backgroundPane;
@@ -95,7 +91,6 @@ public class VanChartPlotTooltipPane extends BasicPane {
     protected Component[][] createComponents(Plot plot) {
         Component[][] components = new Component[][]{
                 new Component[]{tooltipContentPane,null},
-                new Component[]{createLabelStylePane(),null},
                 new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Border"),borderPane),null},
                 new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Background"), backgroundPane),null},
                 new Component[]{createDisplayStrategy(plot),null},
@@ -108,38 +103,6 @@ public class VanChartPlotTooltipPane extends BasicPane {
         tooltipContentPane = PlotFactory.createPlotTooltipContentPane(plot, parent, VanChartPlotTooltipPane.this);
     }
 
-    protected JPanel createLabelStylePane() {
-        style = new UIButtonGroup<Integer>(new String[]{Toolkit.i18nText("Fine-Design_Chart_Automatic"),Toolkit.i18nText("Fine-Design_Chart_Custom")});
-        textFontPane = new ChartTextAttrPane() {
-            protected Component[][] getComponents(JPanel buttonPane) {
-                return new Component[][]{
-                        new Component[]{null, null},
-                        new Component[]{null, getFontNameComboBox()},
-                        new Component[]{null, buttonPane}
-                };
-            }
-        };
-
-        JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(Toolkit.i18nText("Fine-Design_Chart_Character"), style);
-        JPanel panel1 = new JPanel(new BorderLayout());
-        panel1.add(panel, BorderLayout.CENTER);
-        panel1.add(textFontPane, BorderLayout.SOUTH);
-
-        initStyleListener();
-
-        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Widget_Style"), panel1);
-    }
-
-
-    private void initStyleListener() {
-        style.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                checkStyleUse();
-            }
-        });
-    }
-
     protected JPanel createDisplayStrategy(Plot plot) {
         showAllSeries = new UICheckBox(getShowAllSeriesLabelText());
         followMouse = new UIButtonGroup(new String[]{Toolkit.i18nText("Fine-Design_Chart_Follow_Mouse"),
@@ -175,7 +138,6 @@ public class VanChartPlotTooltipPane extends BasicPane {
 
     private void checkAllUse() {
         checkBoxUse();
-        checkStyleUse();
     }
     /**
      * 检查box使用.
@@ -184,10 +146,6 @@ public class VanChartPlotTooltipPane extends BasicPane {
         tooltipPane.setVisible(isTooltipShow.isSelected());
     }
 
-    private void checkStyleUse() {
-        textFontPane.setVisible(style.getSelectedIndex() == 1);
-    }
-
     protected AttrTooltip getAttrTooltip() {
         return new AttrTooltip();
     }
@@ -202,8 +160,6 @@ public class VanChartPlotTooltipPane extends BasicPane {
             tooltipContentPane.populateBean(attr.getContent());
         }
 
-        style.setSelectedIndex(attr.isCustom() ? 1 : 0);
-        textFontPane.populate(attr.getTextAttr());
         borderPane.populate(attr.getGeneralInfo());
         backgroundPane.populate(attr.getGeneralInfo());
         if(showAllSeries != null) {
@@ -224,10 +180,6 @@ public class VanChartPlotTooltipPane extends BasicPane {
             attrTooltip.setContent(tooltipContentPane.updateBean());
         }
 
-        attrTooltip.setCustom(style.getSelectedIndex() == 1);
-        if(textFontPane != null){
-            attrTooltip.setTextAttr(textFontPane.update());
-        }
         borderPane.update(attrTooltip.getGeneralInfo());
         backgroundPane.update(attrTooltip.getGeneralInfo());
         if(showAllSeries != null) {

designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/data/comp/MapDataTree.java

@@ -1,13 +1,13 @@
 package com.fr.van.chart.drillmap.designer.data.comp;
 
 import com.fr.design.constants.UIConstants;
-import com.fr.design.gui.ilable.UILabel;
 import com.fr.general.ComparatorUtils;
 import com.fr.plugin.chart.map.designer.type.GEOJSONTreeHelper;
 import com.fr.plugin.chart.map.server.ChartGEOJSONHelper;
 import com.fr.plugin.chart.map.server.CompatibleGEOJSONHelper;
 import com.fr.stable.StringUtils;
 
+import javax.swing.BorderFactory;
 import javax.swing.JTree;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeCellRenderer;
@@ -15,7 +15,6 @@ import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreeNode;
 import javax.swing.tree.TreePath;
 import java.awt.Component;
-import java.awt.Dimension;
 import java.util.Enumeration;
 
 /**
@@ -23,7 +22,7 @@ import java.util.Enumeration;
  */
 public class MapDataTree extends JTree {
 
-    public MapDataTree(TreeNode root){
+    public MapDataTree(TreeNode root) {
         super();
         this.setModel(model);
         model.setRoot(root);
@@ -49,54 +48,54 @@ public class MapDataTree extends JTree {
         if (children.hasMoreElements()) {
             DefaultMutableTreeNode child = (DefaultMutableTreeNode) children.nextElement();
 
-            if(GEOJSONTreeHelper.getInstance().isSelectableTreeNode(child)){
+            if (GEOJSONTreeHelper.isSelectableTreeNode(child)) {
                 selectTreeNode(child, m_model);
-            }else{
+            } else {
                 setFirstChildTreeNode(child, m_model);
             }
 
         }
     }
 
-    private void setFirstChildTreeNode(DefaultMutableTreeNode parent, DefaultTreeModel m_model){
+    private void setFirstChildTreeNode(DefaultMutableTreeNode parent, DefaultTreeModel m_model) {
         Enumeration<TreeNode> children = parent.children();
-        if (children.hasMoreElements()){
+        if (children.hasMoreElements()) {
             DefaultMutableTreeNode node = (DefaultMutableTreeNode) children.nextElement();
             selectTreeNode(node, m_model);
         }
     }
 
-    public void changeRootNode(TreeNode node){
+    public void changeRootNode(TreeNode node) {
         DefaultTreeModel m_model = (DefaultTreeModel) this.getModel();
         m_model.setRoot(node);
     }
 
     public String getSelectNodeJSONPath() {
-        if(this.getLastSelectedPathComponent() == null){
+        if (this.getLastSelectedPathComponent() == null) {
             return StringUtils.EMPTY;
         }
 
-        DefaultMutableTreeNode currentSel = (DefaultMutableTreeNode)this.getLastSelectedPathComponent();
+        DefaultMutableTreeNode currentSel = (DefaultMutableTreeNode) this.getLastSelectedPathComponent();
 
         return CompatibleGEOJSONHelper.getJsonUrlByPathIncludeParam(currentSel.getUserObject().toString());
     }
 
     //根据路径精确查找
     public DefaultMutableTreeNode setSelectNodePath(String jsonUrl) {
-        if(StringUtils.isEmpty(jsonUrl) || CompatibleGEOJSONHelper.isDeprecated(jsonUrl)){
+        if (StringUtils.isEmpty(jsonUrl) || CompatibleGEOJSONHelper.isDeprecated(jsonUrl)) {
             return null;
         }
         DefaultTreeModel m_model = (DefaultTreeModel) this.getModel();
         DefaultMutableTreeNode root = (DefaultMutableTreeNode) m_model.getRoot();
 
         Enumeration<TreeNode> els = root.postorderEnumeration();
-        while(els.hasMoreElements()){
+        while (els.hasMoreElements()) {
             DefaultMutableTreeNode el = (DefaultMutableTreeNode) els.nextElement();
-            if(el == null || el.getUserObject() == null){
+            if (el == null || el.getUserObject() == null) {
                 return null;
             }
             String dirPath = el.getUserObject().toString();
-            String url =  CompatibleGEOJSONHelper.getJsonUrlByPathIncludeParam(dirPath);
+            String url = CompatibleGEOJSONHelper.getJsonUrlByPathIncludeParam(dirPath);
             //先equals再valid原因：valid 远程下实时去服务器看有没有json文件
             if (ComparatorUtils.equals(jsonUrl, url) && GEOJSONTreeHelper.isValidDirPath(dirPath)) {
                 selectTreeNode(el, m_model);
@@ -115,14 +114,7 @@ public class MapDataTree extends JTree {
             DefaultMutableTreeNode treeNode = (DefaultMutableTreeNode) value;
             String name = getPresentName(treeNode);
             this.setText(name);
-
-            UILabel label = new UILabel();
-            label.setText(getText());
-            label.setIcon(getIcon());
-            this.setSize(label.getPreferredSize());
-            Dimension dim = label.getPreferredSize();
-            dim.height += 2;
-            this.setPreferredSize(dim);
+            this.setBorder(BorderFactory.createEmptyBorder(1, 0, 1, 0));
             this.setBackgroundNonSelectionColor(UIConstants.NORMAL_BACKGROUND);
             this.setForeground(UIConstants.FONT_COLOR);
             this.setBackgroundSelectionColor(UIConstants.FLESH_BLUE);
@@ -131,25 +123,25 @@ public class MapDataTree extends JTree {
     };
 
     protected String getPresentName(DefaultMutableTreeNode treeNode) {
-        if(treeNode == null || treeNode.getUserObject() == null){
+        if (treeNode == null || treeNode.getUserObject() == null) {
             return StringUtils.EMPTY;
         }
         return ChartGEOJSONHelper.getPresentNameWithPath(treeNode.getUserObject().toString());
     }
 
     //模糊搜索 深度优先.
-    public void search(String text){
-        if(StringUtils.isEmpty(text)){
+    public void search(String text) {
+        if (StringUtils.isEmpty(text)) {
             return;
         }
         DefaultTreeModel m_model = (DefaultTreeModel) this.getModel();
         DefaultMutableTreeNode root = (DefaultMutableTreeNode) m_model.getRoot();
 
         Enumeration<TreeNode> els = root.postorderEnumeration();
-        while(els.hasMoreElements()){
+        while (els.hasMoreElements()) {
 
             DefaultMutableTreeNode el = (DefaultMutableTreeNode) els.nextElement();
-            String path =  el.getUserObject().toString();
+            String path = el.getUserObject().toString();
             String fileName = ChartGEOJSONHelper.getPresentNameWithPath(path);
             if (StringUtils.contains(fileName, text) && GEOJSONTreeHelper.isValidDirPath(path)) {
                 selectTreeNode(el, m_model);
@@ -158,7 +150,7 @@ public class MapDataTree extends JTree {
         }
     }
 
-    public void selectTreeNode(DefaultMutableTreeNode node, DefaultTreeModel m_model){
+    public void selectTreeNode(DefaultMutableTreeNode node, DefaultTreeModel m_model) {
         TreeNode[] nodes = m_model.getPathToRoot(node);
         TreePath treePath = new TreePath(nodes);
         setSelectionPath(treePath);

designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/FunnelPercentFormatPaneWithoutCheckBox.java

@@ -0,0 +1,18 @@
+package com.fr.van.chart.funnel.designer.style;
+
+import com.fr.design.i18n.Toolkit;
+import com.fr.van.chart.designer.component.format.PercentFormatPaneWithoutCheckBox;
+import com.fr.van.chart.designer.style.VanChartStylePane;
+
+import javax.swing.JPanel;
+
+public class FunnelPercentFormatPaneWithoutCheckBox extends PercentFormatPaneWithoutCheckBox {
+
+    public FunnelPercentFormatPaneWithoutCheckBox(VanChartStylePane parent, JPanel showOnPane) {
+        super(parent, showOnPane);
+    }
+
+    protected String getCheckBoxText() {
+        return Toolkit.i18nText("Fine-Design_Chart_Value_Conversion");
+    }
+}

designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/VanChartFunnelLabelContentPane.java

@@ -4,8 +4,11 @@ import com.fr.plugin.chart.base.AttrTooltipContent;
 import com.fr.plugin.chart.base.format.AttrTooltipNameFormat;
 import com.fr.van.chart.designer.component.VanChartLabelContentPane;
 import com.fr.van.chart.designer.component.format.CategoryNameFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.CategoryNameFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.SeriesNameFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.SeriesNameFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.ValueFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.ValueFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
 import javax.swing.JPanel;
@@ -25,18 +28,34 @@ public class VanChartFunnelLabelContentPane extends VanChartLabelContentPane {
 
     protected Component[][] getPaneComponents(){
         return new Component[][]{
-                new Component[]{seriesNameFormatPane,null},
-                new Component[]{valueFormatPane,null},
-                new Component[]{percentFormatPane,null},
+                new Component[]{getSeriesNameFormatPane(), null},
+                new Component[]{getValueFormatPane(), null},
+                new Component[]{getPercentFormatPane(), null},
+        };
+    }
+
+    protected Component[][] getRichTextComponents() {
+        return new Component[][]{
+                new Component[]{getRichTextSeriesNameFormatPane(), null},
+                new Component[]{getRichTextValueFormatPane(), null},
+                new Component[]{getRichTextPercentFormatPane(), null}
         };
     }
 
     @Override
     protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) {
-        categoryNameFormatPane = new CategoryNameFormatPaneWithCheckBox(parent, showOnPane);
-        seriesNameFormatPane = new SeriesNameFormatPaneWithCheckBox(parent, showOnPane);
-        valueFormatPane = new ValueFormatPaneWithCheckBox(parent, showOnPane);
-        percentFormatPane = new FunnelPercentFormatPaneWithCheckBox(parent, showOnPane);
+        setCategoryNameFormatPane(new CategoryNameFormatPaneWithCheckBox(parent, showOnPane));
+        setSeriesNameFormatPane(new SeriesNameFormatPaneWithCheckBox(parent, showOnPane));
+        setValueFormatPane(new ValueFormatPaneWithCheckBox(parent, showOnPane));
+        setPercentFormatPane(new FunnelPercentFormatPaneWithCheckBox(parent, showOnPane));
+    }
+
+    @Override
+    protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
+        setRichTextCategoryNameFormatPane(new CategoryNameFormatPaneWithoutCheckBox(parent, showOnPane));
+        setRichTextSeriesNameFormatPane(new SeriesNameFormatPaneWithoutCheckBox(parent, showOnPane));
+        setRichTextValueFormatPane(new ValueFormatPaneWithoutCheckBox(parent, showOnPane));
+        setRichTextPercentFormatPane(new FunnelPercentFormatPaneWithoutCheckBox(parent, showOnPane));
     }
 
     protected AttrTooltipContent createAttrTooltip() {

designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/VanChartFunnelRefreshTooltipContentPane.java

@@ -1,7 +1,9 @@
 package com.fr.van.chart.funnel.designer.style;
 
 import com.fr.van.chart.designer.component.format.ChangedPercentFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.ChangedPercentFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.ChangedValueFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.ChangedValueFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
 import javax.swing.JPanel;
@@ -18,8 +20,16 @@ public class VanChartFunnelRefreshTooltipContentPane extends VanChartFunnelToolt
     protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) {
         super.initFormatPane(parent, showOnPane);
 
-        changedValueFormatPane = new ChangedValueFormatPaneWithCheckBox(parent, showOnPane);
-        changedPercentFormatPane = new ChangedPercentFormatPaneWithCheckBox(parent, showOnPane);
+        setChangedValueFormatPane(new ChangedValueFormatPaneWithCheckBox(parent, showOnPane));
+        setChangedPercentFormatPane(new ChangedPercentFormatPaneWithCheckBox(parent, showOnPane));
+    }
+
+    @Override
+    protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
+        super.initRichTextFormatPane(parent, showOnPane);
+
+        setRichTextChangedValueFormatPane(new ChangedValueFormatPaneWithoutCheckBox(parent, showOnPane));
+        setRichTextChangedPercentFormatPane(new ChangedPercentFormatPaneWithoutCheckBox(parent, showOnPane));
     }
 
     protected double[] getRowSize(double p){
@@ -28,11 +38,21 @@ public class VanChartFunnelRefreshTooltipContentPane extends VanChartFunnelToolt
 
     protected Component[][] getPaneComponents(){
         return new Component[][]{
-                new Component[]{seriesNameFormatPane,null},
-                new Component[]{valueFormatPane,null},
-                new Component[]{changedValueFormatPane,null},
-                new Component[]{percentFormatPane,null},
-                new Component[]{changedPercentFormatPane,null},
+                new Component[]{getSeriesNameFormatPane(), null},
+                new Component[]{getValueFormatPane(), null},
+                new Component[]{getChangedValueFormatPane(), null},
+                new Component[]{getPercentFormatPane(), null},
+                new Component[]{getChangedPercentFormatPane(), null},
+        };
+    }
+
+    protected Component[][] getRichTextComponents() {
+        return new Component[][]{
+                new Component[]{getRichTextSeriesNameFormatPane(), null},
+                new Component[]{getRichTextValueFormatPane(), null},
+                new Component[]{getRichTextChangedValueFormatPane(), null},
+                new Component[]{getRichTextPercentFormatPane(), null},
+                new Component[]{getRichTextChangedPercentFormatPane(), null}
         };
     }
 }

designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/VanChartFunnelTooltipContentPane.java

@@ -4,8 +4,11 @@ import com.fr.plugin.chart.base.AttrTooltipContent;
 import com.fr.plugin.chart.base.format.AttrTooltipNameFormat;
 import com.fr.van.chart.designer.component.VanChartTooltipContentPane;
 import com.fr.van.chart.designer.component.format.CategoryNameFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.CategoryNameFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.SeriesNameFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.SeriesNameFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.ValueFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.ValueFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
 import javax.swing.JPanel;
@@ -25,18 +28,34 @@ public class VanChartFunnelTooltipContentPane extends VanChartTooltipContentPane
 
     protected Component[][] getPaneComponents(){
         return new Component[][]{
-                new Component[]{seriesNameFormatPane,null},
-                new Component[]{valueFormatPane,null},
-                new Component[]{percentFormatPane,null},
+                new Component[]{getSeriesNameFormatPane(), null},
+                new Component[]{getValueFormatPane(), null},
+                new Component[]{getPercentFormatPane(), null},
+        };
+    }
+
+    protected Component[][] getRichTextComponents() {
+        return new Component[][]{
+                new Component[]{getRichTextSeriesNameFormatPane(), null},
+                new Component[]{getRichTextValueFormatPane(), null},
+                new Component[]{getRichTextPercentFormatPane(), null}
         };
     }
 
     @Override
     protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) {
-        categoryNameFormatPane = new CategoryNameFormatPaneWithCheckBox(parent, showOnPane);
-        seriesNameFormatPane = new SeriesNameFormatPaneWithCheckBox(parent, showOnPane);
-        valueFormatPane = new ValueFormatPaneWithCheckBox(parent, showOnPane);
-        percentFormatPane = new FunnelPercentFormatPaneWithCheckBox(parent, showOnPane);
+        setCategoryNameFormatPane(new CategoryNameFormatPaneWithCheckBox(parent, showOnPane));
+        setSeriesNameFormatPane(new SeriesNameFormatPaneWithCheckBox(parent, showOnPane));
+        setValueFormatPane(new ValueFormatPaneWithCheckBox(parent, showOnPane));
+        setPercentFormatPane(new FunnelPercentFormatPaneWithCheckBox(parent, showOnPane));
+    }
+
+    @Override
+    protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
+        setRichTextCategoryNameFormatPane(new CategoryNameFormatPaneWithoutCheckBox(parent, showOnPane));
+        setRichTextSeriesNameFormatPane(new SeriesNameFormatPaneWithoutCheckBox(parent, showOnPane));
+        setRichTextValueFormatPane(new ValueFormatPaneWithoutCheckBox(parent, showOnPane));
+        setRichTextPercentFormatPane(new FunnelPercentFormatPaneWithoutCheckBox(parent, showOnPane));
     }
 
     protected AttrTooltipContent createAttrTooltip() {

designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/VanChartGanttLabelContentPane.java

@@ -1,20 +0,0 @@
-package com.fr.van.chart.gantt.designer.style;
-
-import com.fr.van.chart.designer.component.VanChartHtmlLabelPane;
-import com.fr.van.chart.designer.style.VanChartStylePane;
-import com.fr.van.chart.gantt.designer.style.tooltip.VanChartGanttTooltipContentPane;
-
-import javax.swing.JPanel;
-
-/**
- * Created by hufan on 2017/1/13.
- */
-public class VanChartGanttLabelContentPane extends VanChartGanttTooltipContentPane {
-    public VanChartGanttLabelContentPane(VanChartStylePane parent, JPanel showOnPane) {
-        super(parent, showOnPane);
-    }
-
-    protected VanChartHtmlLabelPane createHtmlLabelPane() {
-        return new VanChartHtmlLabelPane();
-    }
-}

designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/label/VanChartGanttLabelContentPane.java

@@ -0,0 +1,121 @@
+package com.fr.van.chart.gantt.designer.style.label;
+
+import com.fr.design.i18n.Toolkit;
+import com.fr.plugin.chart.base.AttrTooltipContent;
+import com.fr.plugin.chart.gantt.attr.AttrGanttTooltipContent;
+import com.fr.van.chart.designer.component.VanChartLabelContentPaneWithoutRichText;
+import com.fr.van.chart.designer.component.format.SeriesNameFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.VanChartFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.style.VanChartStylePane;
+import com.fr.van.chart.gantt.designer.style.tooltip.VanChartDateFormatPaneWithCheckBox;
+import com.fr.van.chart.gantt.designer.style.tooltip.VanChartFormatComBoxWithCheckBox;
+
+import javax.swing.JPanel;
+import java.awt.Component;
+
+/**
+ * Created by hufan on 2017/1/13.
+ */
+public class VanChartGanttLabelContentPane extends VanChartLabelContentPaneWithoutRichText {
+
+    private VanChartFormatPaneWithCheckBox processesFormatPane;
+    private VanChartDateFormatPaneWithCheckBox startTimeFormatPane;
+    private VanChartDateFormatPaneWithCheckBox endTimeFormatPane;
+    private VanChartFormatComBoxWithCheckBox durationFormatPane;
+    private VanChartFormatPaneWithCheckBox progressFormatPane;
+
+    public VanChartGanttLabelContentPane(VanChartStylePane parent, JPanel showOnPane) {
+        super(parent, showOnPane);
+    }
+
+    protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) {
+        processesFormatPane = new VanChartFormatPaneWithCheckBox(parent, showOnPane) {
+            @Override
+            protected String getCheckBoxText() {
+                return Toolkit.i18nText("Fine-Design_Chart_Project_Name");
+            }
+        };
+        setSeriesNameFormatPane(new SeriesNameFormatPaneWithCheckBox(parent, showOnPane));
+        startTimeFormatPane = new VanChartDateFormatPaneWithCheckBox(parent, showOnPane) {
+            @Override
+            protected String getCheckBoxText() {
+                return Toolkit.i18nText("Fine-Design_Chart_Start_Time");
+            }
+        };
+        endTimeFormatPane = new VanChartDateFormatPaneWithCheckBox(parent, showOnPane) {
+            @Override
+            protected String getCheckBoxText() {
+                return Toolkit.i18nText("Fine-Design_Chart_End_Time");
+            }
+        };
+        durationFormatPane = new VanChartFormatComBoxWithCheckBox();
+        progressFormatPane = new VanChartFormatPaneWithCheckBox(parent, showOnPane) {
+            @Override
+            protected String getCheckBoxText() {
+                return Toolkit.i18nText("Fine-Design_Chart_Process");
+            }
+        };
+    }
+
+    protected Component[][] getPaneComponents() {
+        return new Component[][]{
+                new Component[]{processesFormatPane, null},
+                new Component[]{getSeriesNameFormatPane(), null},
+                new Component[]{startTimeFormatPane, null},
+                new Component[]{endTimeFormatPane, null},
+                new Component[]{durationFormatPane, null},
+                new Component[]{progressFormatPane, null}
+        };
+    }
+
+    protected double[] getRowSize(double p) {
+        return new double[]{p, p, p, p, p, p};
+    }
+
+    @Override
+    protected void populateFormatPane(AttrTooltipContent attrTooltipContent) {
+        if (attrTooltipContent instanceof AttrGanttTooltipContent) {
+            AttrGanttTooltipContent ganttTooltipContent = (AttrGanttTooltipContent) attrTooltipContent;
+            processesFormatPane.populate(ganttTooltipContent.getProcessesFormat());
+            getSeriesNameFormatPane().populate(ganttTooltipContent.getSeriesFormat());
+            startTimeFormatPane.populate(ganttTooltipContent.getStartTimeFormat());
+            endTimeFormatPane.populate(ganttTooltipContent.getEndTimeFormat());
+            durationFormatPane.populate(ganttTooltipContent.getDurationFormat());
+            progressFormatPane.populate(ganttTooltipContent.getProgressFormat());
+        }
+    }
+
+    protected void updateFormatPane(AttrTooltipContent attrTooltipContent) {
+        if (attrTooltipContent instanceof AttrGanttTooltipContent) {
+            AttrGanttTooltipContent ganttTooltipContent = (AttrGanttTooltipContent) attrTooltipContent;
+            processesFormatPane.update(ganttTooltipContent.getProcessesFormat());
+            getSeriesNameFormatPane().update(ganttTooltipContent.getSeriesFormat());
+            startTimeFormatPane.update(ganttTooltipContent.getStartTimeFormat());
+            endTimeFormatPane.update(ganttTooltipContent.getEndTimeFormat());
+            durationFormatPane.update(ganttTooltipContent.getDurationFormat());
+            progressFormatPane.update(ganttTooltipContent.getProgressFormat());
+        }
+    }
+
+    public boolean isDirty() {
+        return processesFormatPane.isDirty()
+                || getSeriesNameFormatPane().isDirty()
+                || startTimeFormatPane.isDirty()
+                || endTimeFormatPane.isDirty()
+                || durationFormatPane.isDirty()
+                || progressFormatPane.isDirty();
+    }
+
+    public void setDirty(boolean isDirty) {
+        processesFormatPane.setDirty(isDirty);
+        getSeriesNameFormatPane().setDirty(isDirty);
+        startTimeFormatPane.setDirty(isDirty);
+        endTimeFormatPane.setDirty(isDirty);
+        durationFormatPane.setDirty(isDirty);
+        progressFormatPane.setDirty(isDirty);
+    }
+
+    protected AttrTooltipContent createAttrTooltip() {
+        return new AttrGanttTooltipContent();
+    }
+}

designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/label/VanChartGanttPlotLabelDetailPane.java

@@ -0,0 +1,16 @@
+package com.fr.van.chart.gantt.designer.style.label;
+
+import com.fr.chart.chartattr.Plot;
+import com.fr.van.chart.designer.style.VanChartStylePane;
+import com.fr.van.chart.designer.style.label.VanChartPlotLabelDetailPane;
+
+public class VanChartGanttPlotLabelDetailPane extends VanChartPlotLabelDetailPane {
+
+    public VanChartGanttPlotLabelDetailPane(Plot plot, VanChartStylePane parent) {
+        super(plot, parent);
+    }
+
+    protected void initToolTipContentPane(Plot plot) {
+        setDataLabelContentPane(new VanChartGanttLabelContentPane(getParentPane(), VanChartGanttPlotLabelDetailPane.this));
+    }
+}

designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/label/VanChartGanttPlotLabelPane.java

@@ -0,0 +1,20 @@
+package com.fr.van.chart.gantt.designer.style.label;
+
+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 VanChartGanttPlotLabelPane extends VanChartPlotLabelPane {
+
+    public VanChartGanttPlotLabelPane(Plot plot, VanChartStylePane parent) {
+        super(plot, parent);
+    }
+
+    protected void createLabelPane() {
+        VanChartGanttPlotLabelDetailPane labelDetailPane = new VanChartGanttPlotLabelDetailPane(getPlot(), getParentPane());
+        setLabelDetailPane(labelDetailPane);
+        getLabelPane().add(labelDetailPane, BorderLayout.CENTER);
+    }
+}

designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/tooltip/VanChartDateFormatPaneWithCheckBox.java

@@ -0,0 +1,18 @@
+package com.fr.van.chart.gantt.designer.style.tooltip;
+
+import com.fr.design.gui.style.FormatPane;
+import com.fr.van.chart.designer.PlotFactory;
+import com.fr.van.chart.designer.component.format.VanChartFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.style.VanChartStylePane;
+
+import javax.swing.JPanel;
+
+public abstract class VanChartDateFormatPaneWithCheckBox extends VanChartFormatPaneWithCheckBox {
+    public VanChartDateFormatPaneWithCheckBox(VanChartStylePane parent, JPanel showOnPane) {
+        super(parent, showOnPane);
+    }
+
+    protected FormatPane createFormatPane(){
+        return PlotFactory.createAutoFormatPane();
+    }
+}

designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/tooltip/VanChartDateFormatPaneWithoutCheckBox.java

@@ -0,0 +1,18 @@
+package com.fr.van.chart.gantt.designer.style.tooltip;
+
+import com.fr.design.gui.style.FormatPane;
+import com.fr.van.chart.designer.PlotFactory;
+import com.fr.van.chart.designer.component.format.VanChartFormatPaneWithoutCheckBox;
+import com.fr.van.chart.designer.style.VanChartStylePane;
+
+import javax.swing.JPanel;
+
+public abstract class VanChartDateFormatPaneWithoutCheckBox extends VanChartFormatPaneWithoutCheckBox {
+    public VanChartDateFormatPaneWithoutCheckBox(VanChartStylePane parent, JPanel showOnPane) {
+        super(parent, showOnPane);
+    }
+
+    protected FormatPane createFormatPane() {
+        return PlotFactory.createAutoFormatPane();
+    }
+}

designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/tooltip/VanChartFormatComBoxWithCheckBox.java

@@ -0,0 +1,100 @@
+package com.fr.van.chart.gantt.designer.style.tooltip;
+
+import com.fr.design.gui.icheckbox.UICheckBox;
+import com.fr.design.gui.icombobox.UIComboBox;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.Toolkit;
+import com.fr.plugin.chart.base.format.AttrTooltipDurationFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipFormat;
+import com.fr.plugin.chart.base.format.IntervalTimeFormat;
+
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.util.Map;
+
+public class VanChartFormatComBoxWithCheckBox extends JPanel {
+    private static final String LABEL_TEXT = Toolkit.i18nText("Fine-Design_Chart_Duration_Time");
+
+    private UICheckBox isSelectedBox;
+    private UIComboBox formatComBox;
+
+    private boolean isDirty;
+
+    public VanChartFormatComBoxWithCheckBox() {
+        this.setLayout(new BorderLayout());
+        isSelectedBox = new UICheckBox(LABEL_TEXT);
+        formatComBox = new UIComboBox(IntervalTimeFormat.getFormats());
+        isSelectedBox.addMouseListener(new MouseListener() {
+            @Override
+            public void mouseClicked(MouseEvent e) {
+                isDirty = 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) {
+
+            }
+        });
+        formatComBox.setPreferredSize(new Dimension(40, 20));
+
+        if (showSelectBox()) {
+            this.add(isSelectedBox, BorderLayout.CENTER);
+        } else {
+            this.add(new UILabel(LABEL_TEXT), BorderLayout.CENTER);
+        }
+
+        this.add(formatComBox, BorderLayout.EAST);
+    }
+
+    protected boolean showSelectBox() {
+        return true;
+    }
+
+    public boolean isDirty() {
+        return isDirty;
+    }
+
+    public void setDirty(boolean isDirty) {
+        this.isDirty = isDirty;
+    }
+
+    public void populate(AttrTooltipFormat tooltipFormat) {
+        if (tooltipFormat instanceof AttrTooltipDurationFormat) {
+            this.isSelectedBox.setSelected(tooltipFormat.isEnable());
+            formatComBox.setSelectedItem(((AttrTooltipDurationFormat) tooltipFormat).getIntervalTimeFormat());
+        }
+    }
+
+    public void update(AttrTooltipFormat tooltipFormat) {
+        if (tooltipFormat instanceof AttrTooltipDurationFormat) {
+            tooltipFormat.setEnable(isSelectedBox.isSelected());
+            ((AttrTooltipDurationFormat) tooltipFormat).setIntervalTimeFormat((IntervalTimeFormat) formatComBox.getSelectedItem());
+        }
+    }
+
+    public void updateFormatParams(Map<String, String> paramMap, String value) {
+        String key = LABEL_TEXT;
+
+        if (paramMap != null && !paramMap.containsKey(key)) {
+            paramMap.put(key, value);
+        }
+    }
+}

designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/tooltip/VanChartFormatComBoxWithoutCheckBox.java

@@ -0,0 +1,8 @@
+package com.fr.van.chart.gantt.designer.style.tooltip;
+
+public class VanChartFormatComBoxWithoutCheckBox extends VanChartFormatComBoxWithCheckBox {
+
+    protected boolean showSelectBox() {
+        return false;
+    }
+}

designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/tooltip/VanChartGanttTooltipContentPane.java

@@ -1,26 +1,24 @@
 package com.fr.van.chart.gantt.designer.style.tooltip;
 
-import com.fr.design.gui.icheckbox.UICheckBox;
-import com.fr.design.gui.icombobox.UIComboBox;
-import com.fr.design.gui.style.FormatPane;
-
+import com.fr.design.i18n.Toolkit;
 import com.fr.plugin.chart.base.AttrTooltipContent;
 import com.fr.plugin.chart.base.format.AttrTooltipDurationFormat;
-import com.fr.plugin.chart.base.format.AttrTooltipFormat;
-import com.fr.plugin.chart.base.format.IntervalTimeFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipEndTimeFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipProcessesFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipProgressFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipSeriesFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipStartTimeFormat;
 import com.fr.plugin.chart.gantt.attr.AttrGanttTooltipContent;
-import com.fr.van.chart.designer.PlotFactory;
 import com.fr.van.chart.designer.component.VanChartTooltipContentPane;
 import com.fr.van.chart.designer.component.format.SeriesNameFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.SeriesNameFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.VanChartFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.VanChartFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
 import javax.swing.JPanel;
-import java.awt.BorderLayout;
 import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
+import java.util.Map;
 
 /**
  * Created by hufan on 2017/1/13.
@@ -32,6 +30,12 @@ public class VanChartGanttTooltipContentPane extends VanChartTooltipContentPane
     private VanChartFormatComBoxWithCheckBox durationFormatPane;
     private VanChartFormatPaneWithCheckBox progressFormatPane;
 
+    private VanChartFormatPaneWithoutCheckBox richTextProcessesFormatPane;
+    private VanChartDateFormatPaneWithoutCheckBox richTextStartTimeFormatPane;
+    private VanChartDateFormatPaneWithoutCheckBox richTextEndTimeFormatPane;
+    private VanChartFormatComBoxWithoutCheckBox richTextDurationFormatPane;
+    private VanChartFormatPaneWithoutCheckBox richTextProgressFormatPane;
+
     public VanChartGanttTooltipContentPane(VanChartStylePane parent, JPanel showOnPane) {
         super(parent, showOnPane);
     }
@@ -40,27 +44,52 @@ public class VanChartGanttTooltipContentPane extends VanChartTooltipContentPane
         processesFormatPane = new VanChartFormatPaneWithCheckBox(parent, showOnPane){
             @Override
             protected String getCheckBoxText() {
-                return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Project_Name");
+                return Toolkit.i18nText("Fine-Design_Chart_Project_Name");
             }
         };
-        seriesNameFormatPane = new SeriesNameFormatPaneWithCheckBox(parent, showOnPane);
+        setSeriesNameFormatPane(new SeriesNameFormatPaneWithCheckBox(parent, showOnPane));
         startTimeFormatPane = new VanChartDateFormatPaneWithCheckBox(parent, showOnPane){
             @Override
             protected String getCheckBoxText() {
-                return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Start_Time");
+                return Toolkit.i18nText("Fine-Design_Chart_Start_Time");
             }
         };
         endTimeFormatPane = new VanChartDateFormatPaneWithCheckBox(parent, showOnPane){
             @Override
             protected String getCheckBoxText() {
-                return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_End_Time");
+                return Toolkit.i18nText("Fine-Design_Chart_End_Time");
             }
         };
         durationFormatPane = new VanChartFormatComBoxWithCheckBox();
         progressFormatPane = new VanChartFormatPaneWithCheckBox(parent, showOnPane){
             @Override
             protected String getCheckBoxText() {
-                return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Process");
+                return Toolkit.i18nText("Fine-Design_Chart_Process");
+            }
+        };
+    }
+
+    protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
+        richTextProcessesFormatPane = new VanChartFormatPaneWithoutCheckBox(parent, showOnPane){
+            protected String getCheckBoxText() {
+                return Toolkit.i18nText("Fine-Design_Chart_Project_Name");
+            }
+        };
+        setRichTextSeriesNameFormatPane(new SeriesNameFormatPaneWithoutCheckBox(parent, showOnPane));
+        richTextStartTimeFormatPane = new VanChartDateFormatPaneWithoutCheckBox(parent, showOnPane){
+            protected String getCheckBoxText() {
+                return Toolkit.i18nText("Fine-Design_Chart_Start_Time");
+            }
+        };
+        richTextEndTimeFormatPane = new VanChartDateFormatPaneWithoutCheckBox(parent, showOnPane){
+            protected String getCheckBoxText() {
+                return Toolkit.i18nText("Fine-Design_Chart_End_Time");
+            }
+        };
+        richTextDurationFormatPane = new VanChartFormatComBoxWithoutCheckBox();
+        richTextProgressFormatPane = new VanChartFormatPaneWithoutCheckBox(parent, showOnPane){
+            protected String getCheckBoxText() {
+                return Toolkit.i18nText("Fine-Design_Chart_Process");
             }
         };
     }
@@ -68,7 +97,7 @@ public class VanChartGanttTooltipContentPane extends VanChartTooltipContentPane
     protected Component[][] getPaneComponents(){
         return new Component[][]{
                 new Component[]{processesFormatPane,null},
-                new Component[]{seriesNameFormatPane,null},
+                new Component[]{getSeriesNameFormatPane(),null},
                 new Component[]{startTimeFormatPane,null},
                 new Component[]{endTimeFormatPane,null},
                 new Component[]{durationFormatPane, null},
@@ -76,16 +105,28 @@ public class VanChartGanttTooltipContentPane extends VanChartTooltipContentPane
         };
     }
 
+    protected Component[][] getRichTextComponents() {
+        return new Component[][]{
+                new Component[]{richTextProcessesFormatPane,null},
+                new Component[]{getRichTextSeriesNameFormatPane(),null},
+                new Component[]{richTextStartTimeFormatPane,null},
+                new Component[]{richTextEndTimeFormatPane,null},
+                new Component[]{richTextDurationFormatPane, null},
+                new Component[]{richTextProgressFormatPane, null}
+        };
+    }
+
     protected double[] getRowSize(double p){
         return new double[]{p,p,p,p,p,p};
     }
 
     @Override
     protected void populateFormatPane(AttrTooltipContent attrTooltipContent) {
+        // fixme 当前的样式面板设计都是基于一个大而全的父类，在子类中组合需要的属性，导致父类的属性多是protected，且子类不能明确获取自己Model的type
         if (attrTooltipContent instanceof AttrGanttTooltipContent){
             AttrGanttTooltipContent ganttTooltipContent = (AttrGanttTooltipContent) attrTooltipContent;
             processesFormatPane.populate(ganttTooltipContent.getProcessesFormat());
-            seriesNameFormatPane.populate(ganttTooltipContent.getSeriesFormat());
+            getSeriesNameFormatPane().populate(ganttTooltipContent.getSeriesFormat());
             startTimeFormatPane.populate(ganttTooltipContent.getStartTimeFormat());
             endTimeFormatPane.populate(ganttTooltipContent.getEndTimeFormat());
             durationFormatPane.populate(ganttTooltipContent.getDurationFormat());
@@ -93,11 +134,44 @@ public class VanChartGanttTooltipContentPane extends VanChartTooltipContentPane
         }
     }
 
+    protected void populateRichEditor(AttrTooltipContent attrTooltipContent) {
+        if(attrTooltipContent instanceof AttrGanttTooltipContent){
+            AttrGanttTooltipContent ganttTooltipContent = (AttrGanttTooltipContent) attrTooltipContent;
+            Map<String, String> params = getRichTextAttr().getParams();
+
+            AttrTooltipProcessesFormat processesFormat = ganttTooltipContent.getRichTextProcessesFormat();
+            richTextProcessesFormatPane.populate(processesFormat);
+            richTextProcessesFormatPane.updateFormatParams(params, processesFormat.getJs());
+
+            AttrTooltipSeriesFormat seriesFormat = ganttTooltipContent.getRichTextSeriesFormat();
+            getRichTextSeriesNameFormatPane().populate(seriesFormat);
+            getRichTextSeriesNameFormatPane().updateFormatParams(params, seriesFormat.getJs());
+
+            AttrTooltipStartTimeFormat startTimeFormat = ganttTooltipContent.getRichTextStartTimeFormat();
+            richTextStartTimeFormatPane.populate(startTimeFormat);
+            richTextStartTimeFormatPane.updateFormatParams(params, startTimeFormat.getJs());
+
+            AttrTooltipEndTimeFormat endTimeFormat = ganttTooltipContent.getRichTextEndTimeFormat();
+            richTextEndTimeFormatPane.populate(endTimeFormat);
+            richTextEndTimeFormatPane.updateFormatParams(params, endTimeFormat.getJs());
+
+            AttrTooltipDurationFormat durationFormat = ganttTooltipContent.getRichTextDurationFormat();
+            richTextDurationFormatPane.populate(durationFormat);
+            richTextDurationFormatPane.updateFormatParams(params, durationFormat.getJs());
+
+            AttrTooltipProgressFormat progressFormat = ganttTooltipContent.getRichTextProgressFormat();
+            richTextProgressFormatPane.populate(progressFormat);
+            richTextProgressFormatPane.updateFormatParams(params, progressFormat.getJs());
+
+            populateRichText(attrTooltipContent.getRichTextAttr());
+        }
+    }
+
     protected void updateFormatPane(AttrTooltipContent attrTooltipContent) {
         if (attrTooltipContent instanceof AttrGanttTooltipContent){
             AttrGanttTooltipContent ganttTooltipContent = (AttrGanttTooltipContent) attrTooltipContent;
             processesFormatPane.update(ganttTooltipContent.getProcessesFormat());
-            seriesNameFormatPane.update(ganttTooltipContent.getSeriesFormat());
+            getSeriesNameFormatPane().update(ganttTooltipContent.getSeriesFormat());
             startTimeFormatPane.update(ganttTooltipContent.getStartTimeFormat());
             endTimeFormatPane.update(ganttTooltipContent.getEndTimeFormat());
             durationFormatPane.update(ganttTooltipContent.getDurationFormat());
@@ -105,9 +179,22 @@ public class VanChartGanttTooltipContentPane extends VanChartTooltipContentPane
         }
     }
 
+    protected void updateRichEditor(AttrTooltipContent attrTooltipContent) {
+        if(attrTooltipContent instanceof AttrGanttTooltipContent) {
+            AttrGanttTooltipContent ganttTooltipContent = (AttrGanttTooltipContent) attrTooltipContent;
+
+            richTextProcessesFormatPane.update(ganttTooltipContent.getRichTextProcessesFormat());
+            getRichTextSeriesNameFormatPane().update(ganttTooltipContent.getRichTextSeriesFormat());
+            richTextStartTimeFormatPane.update(ganttTooltipContent.getRichTextStartTimeFormat());
+            richTextEndTimeFormatPane.update(ganttTooltipContent.getRichTextEndTimeFormat());
+            richTextDurationFormatPane.update(ganttTooltipContent.getRichTextDurationFormat());
+            richTextProgressFormatPane.update(ganttTooltipContent.getRichTextProgressFormat());
+        }
+    }
+
     public boolean isDirty() {
         return processesFormatPane.isDirty()
-                || seriesNameFormatPane.isDirty()
+                || getSeriesNameFormatPane().isDirty()
                 || startTimeFormatPane.isDirty()
                 || endTimeFormatPane.isDirty()
                 || durationFormatPane.isDirty()
@@ -116,7 +203,7 @@ public class VanChartGanttTooltipContentPane extends VanChartTooltipContentPane
 
     public void setDirty(boolean isDirty) {
         processesFormatPane.setDirty(isDirty);
-        seriesNameFormatPane.setDirty(isDirty);
+        getSeriesNameFormatPane().setDirty(isDirty);
         startTimeFormatPane.setDirty(isDirty);
         endTimeFormatPane.setDirty(isDirty);
         durationFormatPane.setDirty(isDirty);
@@ -126,79 +213,4 @@ public class VanChartGanttTooltipContentPane extends VanChartTooltipContentPane
     protected AttrTooltipContent createAttrTooltip() {
         return new AttrGanttTooltipContent();
     }
-
-    private abstract class VanChartDateFormatPaneWithCheckBox extends VanChartFormatPaneWithCheckBox {
-        public VanChartDateFormatPaneWithCheckBox(VanChartStylePane parent, JPanel showOnPane) {
-            super(parent, showOnPane);
-        }
-
-        @Override
-        protected FormatPane createFormatPane(){
-            return PlotFactory.createAutoFormatPane();
-        }
-    }
-
-    private class VanChartFormatComBoxWithCheckBox extends JPanel{
-        private UICheckBox isSelectedBox;
-        private UIComboBox formatComBox;
-
-        private boolean isDirty;
-
-        private VanChartFormatComBoxWithCheckBox() {
-            this.setLayout(new BorderLayout());
-            isSelectedBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Duration_Time"));
-            formatComBox = new UIComboBox(IntervalTimeFormat.getFormats());
-            isSelectedBox.addMouseListener(new MouseListener() {
-                @Override
-                public void mouseClicked(MouseEvent e) {
-                    isDirty = 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) {
-
-                }
-            });
-            formatComBox.setPreferredSize(new Dimension(40,20));
-            this.add(isSelectedBox, BorderLayout.CENTER);
-            this.add(formatComBox, BorderLayout.EAST);
-        }
-
-        private boolean isDirty() {
-            return isDirty;
-        }
-
-        private void setDirty(boolean isDirty) {
-            this.isDirty = isDirty;
-        }
-
-        private void populate(AttrTooltipFormat tooltipFormat) {
-            if(tooltipFormat instanceof AttrTooltipDurationFormat) {
-                this.isSelectedBox.setSelected(tooltipFormat.isEnable());
-                formatComBox.setSelectedItem(((AttrTooltipDurationFormat) tooltipFormat).getIntervalTimeFormat());
-            }
-        }
-
-        private void update(AttrTooltipFormat tooltipFormat) {
-            if(tooltipFormat instanceof AttrTooltipDurationFormat) {
-                tooltipFormat.setEnable(isSelectedBox.isSelected());
-                ((AttrTooltipDurationFormat) tooltipFormat).setIntervalTimeFormat((IntervalTimeFormat) formatComBox.getSelectedItem());
-            }
-        }
-    }
 }

designer-chart/src/main/java/com/fr/van/chart/map/designer/style/label/VanChartMapLabelContentPane.java

@@ -5,9 +5,13 @@ import com.fr.plugin.chart.base.format.AttrTooltipAreaNameFormat;
 import com.fr.plugin.chart.base.format.AttrTooltipMapValueFormat;
 import com.fr.van.chart.designer.component.VanChartLabelContentPane;
 import com.fr.van.chart.designer.component.format.MapAreaNameFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.MapAreaNameFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.PercentFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.PercentFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.SeriesNameFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.SeriesNameFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.ValueFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.ValueFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
 import javax.swing.JPanel;
@@ -22,10 +26,18 @@ public class VanChartMapLabelContentPane extends VanChartLabelContentPane {
 
     @Override
     protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) {
-        categoryNameFormatPane = new MapAreaNameFormatPaneWithCheckBox(parent, showOnPane);
-        seriesNameFormatPane = new SeriesNameFormatPaneWithCheckBox(parent, showOnPane);
-        valueFormatPane = new ValueFormatPaneWithCheckBox(parent, showOnPane);
-        percentFormatPane = new PercentFormatPaneWithCheckBox(parent, showOnPane);
+        setCategoryNameFormatPane(new MapAreaNameFormatPaneWithCheckBox(parent, showOnPane));
+        setSeriesNameFormatPane(new SeriesNameFormatPaneWithCheckBox(parent, showOnPane));
+        setValueFormatPane(new ValueFormatPaneWithCheckBox(parent, showOnPane));
+        setPercentFormatPane(new PercentFormatPaneWithCheckBox(parent, showOnPane));
+    }
+
+    @Override
+    protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
+        setRichTextCategoryNameFormatPane(new MapAreaNameFormatPaneWithoutCheckBox(parent, showOnPane));
+        setRichTextSeriesNameFormatPane(new SeriesNameFormatPaneWithoutCheckBox(parent, showOnPane));
+        setRichTextValueFormatPane(new ValueFormatPaneWithoutCheckBox(parent, showOnPane));
+        setRichTextPercentFormatPane(new PercentFormatPaneWithoutCheckBox(parent, showOnPane));
     }
 
     @Override

designer-chart/src/main/java/com/fr/van/chart/map/designer/style/tooltip/VanChartMapRefreshTooltipContentPane.java

@@ -3,7 +3,9 @@ package com.fr.van.chart.map.designer.style.tooltip;
 import com.fr.plugin.chart.base.AttrTooltipContent;
 import com.fr.plugin.chart.base.format.AttrTooltipAreaNameFormat;
 import com.fr.van.chart.designer.component.format.ChangedPercentFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.ChangedPercentFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.ChangedValueFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.ChangedValueFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
 import javax.swing.JPanel;
@@ -17,25 +19,45 @@ public class VanChartMapRefreshTooltipContentPane extends VanChartMapTooltipCont
         super(null, showOnPane);
     }
 
+    protected double[] getRowSize(double p){
+        return new double[]{p,p,p,p,p,p};
+    }
+
     @Override
     protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) {
         super.initFormatPane(parent, showOnPane);
-        changedValueFormatPane = new ChangedValueFormatPaneWithCheckBox(parent, showOnPane);
-        changedPercentFormatPane = new ChangedPercentFormatPaneWithCheckBox(parent, showOnPane);
 
+        setChangedValueFormatPane(new ChangedValueFormatPaneWithCheckBox(parent, showOnPane));
+        setChangedPercentFormatPane(new ChangedPercentFormatPaneWithCheckBox(parent, showOnPane));
     }
-    protected double[] getRowSize(double p){
-        return new double[]{p,p,p,p,p,p};
+
+    @Override
+    protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
+        super.initRichTextFormatPane(parent, showOnPane);
+
+        setRichTextChangedValueFormatPane(new ChangedValueFormatPaneWithoutCheckBox(parent, showOnPane));
+        setRichTextChangedPercentFormatPane(new ChangedPercentFormatPaneWithoutCheckBox(parent, showOnPane));
     }
 
     protected Component[][] getPaneComponents(){
         return new Component[][]{
-                new Component[]{categoryNameFormatPane,null},
-                new Component[]{seriesNameFormatPane,null},
-                new Component[]{valueFormatPane,null},
-                new Component[]{changedValueFormatPane,null},
-                new Component[]{percentFormatPane,null},
-                new Component[]{changedPercentFormatPane,null},
+                new Component[]{getCategoryNameFormatPane(), null},
+                new Component[]{getSeriesNameFormatPane(), null},
+                new Component[]{getValueFormatPane(), null},
+                new Component[]{getChangedValueFormatPane(), null},
+                new Component[]{getPercentFormatPane(), null},
+                new Component[]{getChangedPercentFormatPane(), null},
+        };
+    }
+
+    protected Component[][] getRichTextComponents() {
+        return new Component[][]{
+                new Component[]{getRichTextCategoryNameFormatPane(), null},
+                new Component[]{getRichTextSeriesNameFormatPane(), null},
+                new Component[]{getRichTextValueFormatPane(), null},
+                new Component[]{getRichTextChangedValueFormatPane(), null},
+                new Component[]{getRichTextPercentFormatPane(), null},
+                new Component[]{getRichTextChangedPercentFormatPane(), null}
         };
     }
 

designer-chart/src/main/java/com/fr/van/chart/map/designer/style/tooltip/VanChartMapTooltipContentPane.java

@@ -5,9 +5,13 @@ import com.fr.plugin.chart.base.format.AttrTooltipAreaNameFormat;
 import com.fr.plugin.chart.base.format.AttrTooltipMapValueFormat;
 import com.fr.van.chart.designer.component.VanChartTooltipContentPane;
 import com.fr.van.chart.designer.component.format.MapAreaNameFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.MapAreaNameFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.PercentFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.PercentFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.SeriesNameFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.SeriesNameFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.ValueFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.ValueFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
 import javax.swing.JPanel;
@@ -22,10 +26,18 @@ public class VanChartMapTooltipContentPane extends VanChartTooltipContentPane {
 
     @Override
     protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) {
-        categoryNameFormatPane = new MapAreaNameFormatPaneWithCheckBox(parent, showOnPane);
-        seriesNameFormatPane = new SeriesNameFormatPaneWithCheckBox(parent, showOnPane);
-        valueFormatPane = new ValueFormatPaneWithCheckBox(parent, showOnPane);
-        percentFormatPane = new PercentFormatPaneWithCheckBox(parent, showOnPane);
+        setCategoryNameFormatPane(new MapAreaNameFormatPaneWithCheckBox(parent, showOnPane));
+        setSeriesNameFormatPane(new SeriesNameFormatPaneWithCheckBox(parent, showOnPane));
+        setValueFormatPane(new ValueFormatPaneWithCheckBox(parent, showOnPane));
+        setPercentFormatPane(new PercentFormatPaneWithCheckBox(parent, showOnPane));
+    }
+
+    @Override
+    protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
+        setRichTextCategoryNameFormatPane(new MapAreaNameFormatPaneWithoutCheckBox(parent, showOnPane));
+        setRichTextSeriesNameFormatPane(new SeriesNameFormatPaneWithoutCheckBox(parent, showOnPane));
+        setRichTextValueFormatPane(new ValueFormatPaneWithoutCheckBox(parent, showOnPane));
+        setRichTextPercentFormatPane(new PercentFormatPaneWithoutCheckBox(parent, showOnPane));
     }
 
     @Override

designer-chart/src/main/java/com/fr/van/chart/map/line/StartAndEndNameFormatPaneWithoutCheckBox.java

@@ -0,0 +1,17 @@
+package com.fr.van.chart.map.line;
+
+import com.fr.design.i18n.Toolkit;
+import com.fr.van.chart.designer.component.format.CategoryNameFormatPaneWithoutCheckBox;
+import com.fr.van.chart.designer.style.VanChartStylePane;
+
+import javax.swing.JPanel;
+
+public class StartAndEndNameFormatPaneWithoutCheckBox extends CategoryNameFormatPaneWithoutCheckBox {
+    public StartAndEndNameFormatPaneWithoutCheckBox(VanChartStylePane parent, JPanel showOnPane) {
+        super(parent, showOnPane);
+    }
+
+    protected String getCheckBoxText() {
+        return Toolkit.i18nText("Fine-Design_Chart_Start_And_End");
+    }
+}

designer-chart/src/main/java/com/fr/van/chart/map/line/VanChartLineMapTooltipContentPane.java

@@ -5,8 +5,11 @@ import com.fr.plugin.chart.base.format.AttrTooltipStartAndEndNameFormat;
 import com.fr.plugin.chart.base.format.AttrTooltipValueFormat;
 import com.fr.van.chart.designer.component.VanChartTooltipContentPane;
 import com.fr.van.chart.designer.component.format.PercentFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.PercentFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.SeriesNameFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.SeriesNameFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.ValueFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.ValueFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
 import javax.swing.JPanel;
@@ -21,10 +24,18 @@ public class VanChartLineMapTooltipContentPane extends VanChartTooltipContentPan
 
     @Override
     protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane){
-        categoryNameFormatPane = new StartAndEndNameFormatPaneWithCheckBox(parent, showOnPane);
-        seriesNameFormatPane = new SeriesNameFormatPaneWithCheckBox(parent, showOnPane);
-        valueFormatPane = new ValueFormatPaneWithCheckBox(parent, showOnPane);
-        percentFormatPane = new PercentFormatPaneWithCheckBox(parent, showOnPane);
+        setCategoryNameFormatPane(new StartAndEndNameFormatPaneWithCheckBox(parent, showOnPane));
+        setSeriesNameFormatPane(new SeriesNameFormatPaneWithCheckBox(parent, showOnPane));
+        setValueFormatPane(new ValueFormatPaneWithCheckBox(parent, showOnPane));
+        setPercentFormatPane(new PercentFormatPaneWithCheckBox(parent, showOnPane));
+    }
+
+    @Override
+    protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
+        setRichTextCategoryNameFormatPane(new StartAndEndNameFormatPaneWithoutCheckBox(parent, showOnPane));
+        setRichTextSeriesNameFormatPane(new SeriesNameFormatPaneWithoutCheckBox(parent, showOnPane));
+        setRichTextValueFormatPane(new ValueFormatPaneWithoutCheckBox(parent, showOnPane));
+        setRichTextPercentFormatPane(new PercentFormatPaneWithoutCheckBox(parent, showOnPane));
     }
 
     @Override

designer-chart/src/main/java/com/fr/van/chart/multilayer/style/MultiPieLevelNameFormatPaneWithoutCheckBox.java

@@ -0,0 +1,18 @@
+package com.fr.van.chart.multilayer.style;
+
+import com.fr.design.i18n.Toolkit;
+import com.fr.van.chart.designer.component.format.CategoryNameFormatPaneWithoutCheckBox;
+import com.fr.van.chart.designer.style.VanChartStylePane;
+
+import javax.swing.JPanel;
+
+public class MultiPieLevelNameFormatPaneWithoutCheckBox extends CategoryNameFormatPaneWithoutCheckBox {
+
+    public MultiPieLevelNameFormatPaneWithoutCheckBox(VanChartStylePane parent, JPanel showOnPane) {
+        super(parent, showOnPane);
+    }
+
+    protected String getCheckBoxText() {
+        return Toolkit.i18nText("Fine-Design_Chart_Level_Name");
+    }
+}

designer-chart/src/main/java/com/fr/van/chart/multilayer/style/MultiPieSeriesNameFormatPaneWithoutCheckBox.java

@@ -0,0 +1,18 @@
+package com.fr.van.chart.multilayer.style;
+
+import com.fr.design.i18n.Toolkit;
+import com.fr.van.chart.designer.component.format.SeriesNameFormatPaneWithoutCheckBox;
+import com.fr.van.chart.designer.style.VanChartStylePane;
+
+import javax.swing.JPanel;
+
+public class MultiPieSeriesNameFormatPaneWithoutCheckBox extends SeriesNameFormatPaneWithoutCheckBox {
+
+    public MultiPieSeriesNameFormatPaneWithoutCheckBox(VanChartStylePane parent, JPanel showOnPane) {
+        super(parent, showOnPane);
+    }
+
+    protected String getCheckBoxText() {
+        return Toolkit.i18nText("Fine-Design_Chart_MultiPie_Series_Name");
+    }
+}

designer-chart/src/main/java/com/fr/van/chart/multilayer/style/VanChartMultiPieLabelContentPane.java

@@ -4,7 +4,9 @@ import com.fr.plugin.chart.base.AttrTooltipContent;
 import com.fr.plugin.chart.multilayer.style.AttrTooltipMultiLevelNameFormat;
 import com.fr.van.chart.designer.component.VanChartLabelContentPane;
 import com.fr.van.chart.designer.component.format.PercentFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.PercentFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.ValueFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.ValueFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
 import javax.swing.JPanel;
@@ -19,10 +21,18 @@ public class VanChartMultiPieLabelContentPane extends VanChartLabelContentPane {
 
     @Override
     protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) {
-        categoryNameFormatPane = new MultiPieLevelNameFormatPaneWithCheckBox(parent, showOnPane);
-        seriesNameFormatPane = new MultiPieSeriesNameFormatPaneWithCheckBox(parent, showOnPane);
-        valueFormatPane = new ValueFormatPaneWithCheckBox(parent, showOnPane);
-        percentFormatPane = new PercentFormatPaneWithCheckBox(parent, showOnPane);
+        setCategoryNameFormatPane(new MultiPieLevelNameFormatPaneWithCheckBox(parent, showOnPane));
+        setSeriesNameFormatPane(new MultiPieSeriesNameFormatPaneWithCheckBox(parent, showOnPane));
+        setValueFormatPane(new ValueFormatPaneWithCheckBox(parent, showOnPane));
+        setPercentFormatPane(new PercentFormatPaneWithCheckBox(parent, showOnPane));
+    }
+
+    @Override
+    protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
+        setRichTextCategoryNameFormatPane(new MultiPieLevelNameFormatPaneWithoutCheckBox(parent, showOnPane));
+        setRichTextSeriesNameFormatPane(new MultiPieSeriesNameFormatPaneWithoutCheckBox(parent, showOnPane));
+        setRichTextValueFormatPane(new ValueFormatPaneWithoutCheckBox(parent, showOnPane));
+        setRichTextPercentFormatPane(new PercentFormatPaneWithoutCheckBox(parent, showOnPane));
     }
 
     protected AttrTooltipContent createAttrTooltip() {

designer-chart/src/main/java/com/fr/van/chart/multilayer/style/VanChartMultiPieTooltipContentPane.java

@@ -4,7 +4,9 @@ import com.fr.plugin.chart.base.AttrTooltipContent;
 import com.fr.plugin.chart.multilayer.style.AttrTooltipMultiLevelNameFormat;
 import com.fr.van.chart.designer.component.VanChartTooltipContentPane;
 import com.fr.van.chart.designer.component.format.PercentFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.PercentFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.ValueFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.ValueFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
 import javax.swing.JPanel;
@@ -19,10 +21,18 @@ public class VanChartMultiPieTooltipContentPane extends VanChartTooltipContentPa
 
     @Override
     protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) {
-        categoryNameFormatPane = new MultiPieLevelNameFormatPaneWithCheckBox(parent, showOnPane);
-        seriesNameFormatPane = new MultiPieSeriesNameFormatPaneWithCheckBox(parent, showOnPane);
-        valueFormatPane = new ValueFormatPaneWithCheckBox(parent, showOnPane);
-        percentFormatPane = new PercentFormatPaneWithCheckBox(parent, showOnPane);
+        setCategoryNameFormatPane(new MultiPieLevelNameFormatPaneWithCheckBox(parent, showOnPane));
+        setSeriesNameFormatPane(new MultiPieSeriesNameFormatPaneWithCheckBox(parent, showOnPane));
+        setValueFormatPane(new ValueFormatPaneWithCheckBox(parent, showOnPane));
+        setPercentFormatPane(new PercentFormatPaneWithCheckBox(parent, showOnPane));
+    }
+
+    @Override
+    protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
+        setRichTextCategoryNameFormatPane(new MultiPieLevelNameFormatPaneWithoutCheckBox(parent, showOnPane));
+        setRichTextSeriesNameFormatPane(new MultiPieSeriesNameFormatPaneWithoutCheckBox(parent, showOnPane));
+        setRichTextValueFormatPane(new ValueFormatPaneWithoutCheckBox(parent, showOnPane));
+        setRichTextPercentFormatPane(new PercentFormatPaneWithoutCheckBox(parent, showOnPane));
     }
 
     @Override

designer-chart/src/main/java/com/fr/van/chart/multilayer/style/VanChartMutiPieRefreshTooltipContentPane.java

@@ -1,7 +1,9 @@
 package com.fr.van.chart.multilayer.style;
 
 import com.fr.van.chart.designer.component.format.ChangedPercentFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.ChangedPercentFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.ChangedValueFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.ChangedValueFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
 import javax.swing.JPanel;
@@ -21,8 +23,16 @@ public class VanChartMutiPieRefreshTooltipContentPane extends VanChartMultiPieTo
     protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) {
         super.initFormatPane(parent, showOnPane);
 
-        changedValueFormatPane = new ChangedValueFormatPaneWithCheckBox(parent, showOnPane);
-        changedPercentFormatPane = new ChangedPercentFormatPaneWithCheckBox(parent, showOnPane);
+        setChangedValueFormatPane(new ChangedValueFormatPaneWithCheckBox(parent, showOnPane));
+        setChangedPercentFormatPane(new ChangedPercentFormatPaneWithCheckBox(parent, showOnPane));
+    }
+
+    @Override
+    protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
+        super.initRichTextFormatPane(parent, showOnPane);
+
+        setRichTextChangedValueFormatPane(new ChangedValueFormatPaneWithoutCheckBox(parent, showOnPane));
+        setRichTextChangedPercentFormatPane(new ChangedPercentFormatPaneWithoutCheckBox(parent, showOnPane));
     }
 
     protected double[] getRowSize(double p){
@@ -31,12 +41,23 @@ public class VanChartMutiPieRefreshTooltipContentPane extends VanChartMultiPieTo
 
     protected Component[][] getPaneComponents(){
         return new Component[][]{
-                new Component[]{categoryNameFormatPane,null},
-                new Component[]{seriesNameFormatPane,null},
-                new Component[]{valueFormatPane,null},
-                new Component[]{changedValueFormatPane,null},
-                new Component[]{percentFormatPane,null},
-                new Component[]{changedPercentFormatPane,null},
+                new Component[]{getCategoryNameFormatPane(), null},
+                new Component[]{getSeriesNameFormatPane(), null},
+                new Component[]{getValueFormatPane(), null},
+                new Component[]{getChangedValueFormatPane(), null},
+                new Component[]{getPercentFormatPane(), null},
+                new Component[]{getChangedPercentFormatPane(), null},
+        };
+    }
+
+    protected Component[][] getRichTextComponents() {
+        return new Component[][]{
+                new Component[]{getRichTextCategoryNameFormatPane(), null},
+                new Component[]{getRichTextSeriesNameFormatPane(), null},
+                new Component[]{getRichTextValueFormatPane(), null},
+                new Component[]{getRichTextChangedValueFormatPane(), null},
+                new Component[]{getRichTextPercentFormatPane(), null},
+                new Component[]{getRichTextChangedPercentFormatPane(), null}
         };
     }
 

designer-chart/src/main/java/com/fr/van/chart/scatter/VanChartScatterRefreshTooltipContentPane.java

@@ -1,9 +1,13 @@
 package com.fr.van.chart.scatter;
 
 import com.fr.plugin.chart.base.AttrTooltipContent;
+import com.fr.plugin.chart.base.format.AttrTooltipFormat;
 import com.fr.plugin.chart.scatter.attr.ScatterAttrTooltipContent;
 import com.fr.van.chart.designer.component.format.ChangedPercentFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.ChangedPercentFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.ChangedValueFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.ChangedValueFormatPaneWithoutCheckBox;
+import com.fr.van.chart.designer.component.format.VanChartFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
 import javax.swing.JPanel;
@@ -15,7 +19,7 @@ import java.awt.Component;
 public class VanChartScatterRefreshTooltipContentPane extends VanChartScatterTooltipContentPane {
 
     private ChangedValueFormatPaneWithCheckBox changedSizeFormatPane;
-
+    private ChangedValueFormatPaneWithoutCheckBox richTextChangedSizeFormatPane;
 
     public VanChartScatterRefreshTooltipContentPane(VanChartStylePane parent, JPanel showOnPane) {
         super(null, showOnPane);
@@ -25,9 +29,17 @@ public class VanChartScatterRefreshTooltipContentPane extends VanChartScatterToo
     protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) {
         super.initFormatPane(parent, showOnPane);
         changedSizeFormatPane = new ChangedValueFormatPaneWithCheckBox(parent, showOnPane);
-        changedPercentFormatPane = new ChangedPercentFormatPaneWithCheckBox(parent, showOnPane);
+        ChangedPercentFormatPaneWithCheckBox changedPercentFormatPane = new ChangedPercentFormatPaneWithCheckBox(parent, showOnPane);
+        setChangedPercentFormatPane(changedPercentFormatPane);
     }
 
+    protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
+        super.initRichTextFormatPane(parent, showOnPane);
+
+        richTextChangedSizeFormatPane = new ChangedValueFormatPaneWithoutCheckBox(parent, showOnPane);
+        ChangedPercentFormatPaneWithoutCheckBox richTextChangedPercentFormatPane = new ChangedPercentFormatPaneWithoutCheckBox(parent, showOnPane);
+        setRichTextChangedPercentFormatPane(richTextChangedPercentFormatPane);
+    }
 
     protected double[] getRowSize(double p) {
         return new double[]{p, p, p, p, p, p};
@@ -35,12 +47,24 @@ public class VanChartScatterRefreshTooltipContentPane extends VanChartScatterToo
 
     protected Component[][] getPaneComponents() {
         return new Component[][]{
-                new Component[]{seriesNameFormatPane, null},
-                new Component[]{getxFormatPane(), null},
-                new Component[]{getyFormatPane(), null},
+                new Component[]{getSeriesNameFormatPane(), null},
+                new Component[]{getXFormatPane(), null},
+                new Component[]{getYFormatPane(), null},
                 new Component[]{getSizeFormatPane(), null},
                 new Component[]{changedSizeFormatPane, null},
-                new Component[]{changedPercentFormatPane, null},
+                new Component[]{getChangedPercentFormatPane(), null},
+        };
+    }
+
+    @Override
+    protected Component[][] getRichTextComponents() {
+        return new Component[][]{
+                new Component[]{getRichTextSeriesNameFormatPane(), null},
+                new Component[]{getRichTextXFormatPane(), null},
+                new Component[]{getRichTextYFormatPane(), null},
+                new Component[]{getRichTextSizeFormatPane(), null},
+                new Component[]{richTextChangedSizeFormatPane, null},
+                new Component[]{getRichTextChangedPercentFormatPane(), null}
         };
     }
 
@@ -51,18 +75,49 @@ public class VanChartScatterRefreshTooltipContentPane extends VanChartScatterToo
         if (attrTooltipContent instanceof ScatterAttrTooltipContent) {
             ScatterAttrTooltipContent scatterAttrTooltipContent = (ScatterAttrTooltipContent) attrTooltipContent;
             changedSizeFormatPane.populate(scatterAttrTooltipContent.getChangeSizeFormat());
-            changedPercentFormatPane.populate(scatterAttrTooltipContent.getChangedSizePercentFormat());
+            getChangedPercentFormatPane().populate(scatterAttrTooltipContent.getChangedSizePercentFormat());
 
         }
     }
 
+    protected void populateRichEditor(AttrTooltipContent attrTooltipContent) {
+        super.populateRichEditor(attrTooltipContent);
+
+        if (attrTooltipContent instanceof ScatterAttrTooltipContent) {
+            ScatterAttrTooltipContent scatterAttrTooltipContent = (ScatterAttrTooltipContent) attrTooltipContent;
+
+            VanChartFormatPaneWithoutCheckBox[] formatPaneGroup = new VanChartFormatPaneWithoutCheckBox[]{
+                    richTextChangedSizeFormatPane,
+                    getRichTextChangedPercentFormatPane()
+            };
+
+            AttrTooltipFormat[] formatGroup = new AttrTooltipFormat[]{
+                    scatterAttrTooltipContent.getRichTextChangeSizeFormat(),
+                    scatterAttrTooltipContent.getRichTextChangedSizePercentFormat()
+            };
+
+            populateRichTextFormat(formatPaneGroup, formatGroup);
+            populateRichText(attrTooltipContent.getRichTextAttr());
+        }
+    }
+
     @Override
     protected void updateFormatPane(AttrTooltipContent attrTooltipContent) {
         super.updateFormatPane(attrTooltipContent);
         if (attrTooltipContent instanceof ScatterAttrTooltipContent) {
             ScatterAttrTooltipContent scatterAttrTooltipContent = (ScatterAttrTooltipContent) attrTooltipContent;
             changedSizeFormatPane.update(scatterAttrTooltipContent.getChangeSizeFormat());
-            changedPercentFormatPane.update(scatterAttrTooltipContent.getChangedSizePercentFormat());
+            getChangedPercentFormatPane().update(scatterAttrTooltipContent.getChangedSizePercentFormat());
+        }
+    }
+
+    protected void updateRichEditor(AttrTooltipContent attrTooltipContent) {
+        super.updateRichEditor(attrTooltipContent);
+
+        if (attrTooltipContent instanceof ScatterAttrTooltipContent) {
+            ScatterAttrTooltipContent scatterAttrTooltipContent = (ScatterAttrTooltipContent) attrTooltipContent;
+            richTextChangedSizeFormatPane.update(scatterAttrTooltipContent.getRichTextChangeSizeFormat());
+            getRichTextChangedPercentFormatPane().update(scatterAttrTooltipContent.getRichTextChangedSizePercentFormat());
         }
     }
 
@@ -70,13 +125,13 @@ public class VanChartScatterRefreshTooltipContentPane extends VanChartScatterToo
     public void setDirty(boolean isDirty) {
         super.setDirty(isDirty);
         changedSizeFormatPane.setDirty(isDirty);
-        changedPercentFormatPane.setDirty(isDirty);
+        getChangedPercentFormatPane().setDirty(isDirty);
 
     }
 
     @Override
     public boolean isDirty() {
-        return super.isDirty() || changedSizeFormatPane.isDirty() || changedPercentFormatPane.isDirty();
+        return super.isDirty() || changedSizeFormatPane.isDirty() || getChangedPercentFormatPane().isDirty();
     }
 
 }

designer-chart/src/main/java/com/fr/van/chart/scatter/VanChartScatterTooltipContentPane.java

@@ -1,11 +1,16 @@
 package com.fr.van.chart.scatter;
 
 import com.fr.plugin.chart.base.AttrTooltipContent;
+import com.fr.plugin.chart.base.format.AttrTooltipFormat;
 import com.fr.plugin.chart.scatter.attr.ScatterAttrTooltipContent;
 import com.fr.van.chart.designer.component.VanChartTooltipContentPane;
 import com.fr.van.chart.designer.component.format.ValueFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.ValueFormatPaneWithoutCheckBox;
+import com.fr.van.chart.designer.component.format.VanChartFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.XFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.XFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.YFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.YFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
 import javax.swing.JPanel;
@@ -20,11 +25,15 @@ public class  VanChartScatterTooltipContentPane extends VanChartTooltipContentPa
     private YFormatPaneWithCheckBox yFormatPane;
     private ValueFormatPaneWithCheckBox sizeFormatPane;
 
-    public XFormatPaneWithCheckBox getxFormatPane() {
+    private XFormatPaneWithoutCheckBox richTextXFormatPane;
+    private YFormatPaneWithoutCheckBox richTextYFormatPane;
+    private ValueFormatPaneWithoutCheckBox richTextSizeFormatPane;
+
+    public XFormatPaneWithCheckBox getXFormatPane() {
         return xFormatPane;
     }
 
-    public YFormatPaneWithCheckBox getyFormatPane() {
+    public YFormatPaneWithCheckBox getYFormatPane() {
         return yFormatPane;
     }
 
@@ -32,6 +41,18 @@ public class  VanChartScatterTooltipContentPane extends VanChartTooltipContentPa
         return sizeFormatPane;
     }
 
+    public XFormatPaneWithoutCheckBox getRichTextXFormatPane() {
+        return richTextXFormatPane;
+    }
+
+    public YFormatPaneWithoutCheckBox getRichTextYFormatPane() {
+        return richTextYFormatPane;
+    }
+
+    public ValueFormatPaneWithoutCheckBox getRichTextSizeFormatPane() {
+        return richTextSizeFormatPane;
+    }
+
     public VanChartScatterTooltipContentPane(VanChartStylePane parent, JPanel showOnPane){
         super(parent, showOnPane);
     }
@@ -45,16 +66,35 @@ public class  VanChartScatterTooltipContentPane extends VanChartTooltipContentPa
         sizeFormatPane = new ValueFormatPaneWithCheckBox(parent, showOnPane);
     }
 
+    @Override
+    protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
+        super.initRichTextFormatPane(parent, showOnPane);
+
+        richTextXFormatPane = new XFormatPaneWithoutCheckBox(parent, showOnPane);
+        richTextYFormatPane = new YFormatPaneWithoutCheckBox(parent, showOnPane);
+        richTextSizeFormatPane = new ValueFormatPaneWithoutCheckBox(parent, showOnPane);
+    }
+
     @Override
     protected Component[][] getPaneComponents(){
         return new Component[][]{
-                new Component[]{seriesNameFormatPane,null},
+                new Component[]{getSeriesNameFormatPane(),null},
                 new Component[]{xFormatPane,null},
                 new Component[]{yFormatPane,null},
                 new Component[]{sizeFormatPane,null},
         };
     }
 
+    @Override
+    protected Component[][] getRichTextComponents() {
+        return new Component[][]{
+                new Component[]{getRichTextSeriesNameFormatPane(), null},
+                new Component[]{richTextXFormatPane, null},
+                new Component[]{richTextYFormatPane, null},
+                new Component[]{richTextSizeFormatPane, null}
+        };
+    }
+
     @Override
     protected void populateFormatPane(AttrTooltipContent attrTooltipContent) {
         super.populateFormatPane(attrTooltipContent);
@@ -66,6 +106,27 @@ public class  VanChartScatterTooltipContentPane extends VanChartTooltipContentPa
         }
     }
 
+    protected void populateRichEditor(AttrTooltipContent attrTooltipContent) {
+        super.populateRichEditor(attrTooltipContent);
+
+        if (attrTooltipContent instanceof ScatterAttrTooltipContent) {
+            ScatterAttrTooltipContent scatterAttrTooltipContent = (ScatterAttrTooltipContent) attrTooltipContent;
+
+            VanChartFormatPaneWithoutCheckBox[] formatPaneGroup = new VanChartFormatPaneWithoutCheckBox[]{
+                    richTextXFormatPane, richTextYFormatPane, richTextSizeFormatPane
+            };
+
+            AttrTooltipFormat[] formatGroup = new AttrTooltipFormat[]{
+                    scatterAttrTooltipContent.getRichTextXFormat(),
+                    scatterAttrTooltipContent.getRichTextYFormat(),
+                    scatterAttrTooltipContent.getRichTextSizeFormat()
+            };
+
+            populateRichTextFormat(formatPaneGroup, formatGroup);
+            populateRichText(attrTooltipContent.getRichTextAttr());
+        }
+    }
+
     @Override
     protected void updateFormatPane(AttrTooltipContent attrTooltipContent) {
         super.updateFormatPane(attrTooltipContent);
@@ -77,17 +138,28 @@ public class  VanChartScatterTooltipContentPane extends VanChartTooltipContentPa
         }
     }
 
+    protected void updateRichEditor(AttrTooltipContent attrTooltipContent) {
+        super.updateRichEditor(attrTooltipContent);
+
+        if (attrTooltipContent instanceof ScatterAttrTooltipContent) {
+            ScatterAttrTooltipContent scatterAttrTooltipContent = (ScatterAttrTooltipContent) attrTooltipContent;
+            richTextXFormatPane.update(scatterAttrTooltipContent.getRichTextXFormat());
+            richTextYFormatPane.update(scatterAttrTooltipContent.getRichTextYFormat());
+            richTextSizeFormatPane.update(scatterAttrTooltipContent.getRichTextSizeFormat());
+        }
+    }
+
     @Override
     public void setDirty(boolean isDirty) {
         xFormatPane.setDirty(isDirty);
         yFormatPane.setDirty(isDirty);
         sizeFormatPane.setDirty(isDirty);
-        seriesNameFormatPane.setDirty(isDirty);
+        getSeriesNameFormatPane().setDirty(isDirty);
     }
 
     @Override
     public boolean isDirty() {
-        return xFormatPane.isDirty() || yFormatPane.isDirty() || sizeFormatPane.isDirty() || seriesNameFormatPane.isDirty();
+        return xFormatPane.isDirty() || yFormatPane.isDirty() || sizeFormatPane.isDirty() || getSeriesNameFormatPane().isDirty();
     }
 
     @Override

designer-chart/src/main/java/com/fr/van/chart/scatter/component/label/VanChartScatterLabelConditionPane.java

@@ -13,6 +13,6 @@ public class VanChartScatterLabelConditionPane extends VanChartLabelConditionPan
 
     @Override
     protected VanChartPlotLabelPane createLabelPane() {
-        return new VanChartScatterPlotLabelPane(getPlot(), null, true);
+        return new VanChartScatterPlotLabelNoCheckPane(getPlot(), null);
     }
 }

designer-chart/src/main/java/com/fr/van/chart/scatter/component/label/VanChartScatterPlotLabelDetailPane.java

@@ -6,23 +6,19 @@ import com.fr.van.chart.designer.style.label.VanChartPlotLabelDetailPane;
 import com.fr.van.chart.scatter.VanChartScatterLabelContentPane;
 
 
+
 /**
  * 散点图的分类，多x、y标签
  */
 public class VanChartScatterPlotLabelDetailPane extends VanChartPlotLabelDetailPane {
 
     private static final long serialVersionUID = 5176535960949074940L;
-
     public VanChartScatterPlotLabelDetailPane(Plot plot, VanChartStylePane parent) {
         super(plot, parent);
     }
 
-    public VanChartScatterPlotLabelDetailPane(Plot plot, VanChartStylePane parent, boolean inCondition) {
-        super(plot, parent, inCondition);
-    }
-
     @Override
     protected void initToolTipContentPane(Plot plot) {
-        dataLabelContentPane = new VanChartScatterLabelContentPane(parent, VanChartScatterPlotLabelDetailPane.this);
+        setDataLabelContentPane(new VanChartScatterLabelContentPane(getParentPane(),VanChartScatterPlotLabelDetailPane.this));
     }
 }

designer-chart/src/main/java/com/fr/van/chart/scatter/component/label/VanChartScatterPlotLabelNoCheckPane.java

@@ -0,0 +1,30 @@
+package com.fr.van.chart.scatter.component.label;
+
+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 VanChartScatterPlotLabelNoCheckPane extends VanChartScatterPlotLabelPane {
+
+    private static final long serialVersionUID = 8124894034484334810L;
+
+    public VanChartScatterPlotLabelNoCheckPane(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/scatter/component/label/VanChartScatterPlotLabelPane.java

@@ -16,13 +16,10 @@ public class VanChartScatterPlotLabelPane extends VanChartPlotLabelPane {
         super(plot, parent);
     }
 
-    public VanChartScatterPlotLabelPane(Plot plot, VanChartStylePane parent, boolean inCondition) {
-        super(plot, parent, inCondition);
-    }
-
     @Override
     protected void createLabelPane() {
-        labelDetailPane = new VanChartScatterPlotLabelDetailPane(this.plot, this.parent, this.inCondition);
-        labelPane.add(labelDetailPane, BorderLayout.CENTER);
+        VanChartScatterPlotLabelDetailPane labelDetailPane = new VanChartScatterPlotLabelDetailPane(getPlot(), getParentPane());
+        setLabelDetailPane(labelDetailPane);
+        getLabelPane().add(labelDetailPane, BorderLayout.CENTER);
     }
-}
+}

designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureLabelContentPane.java

@@ -1,9 +1,10 @@
 package com.fr.van.chart.structure.desinger.style;
 
 
+import com.fr.design.i18n.Toolkit;
 import com.fr.plugin.chart.base.AttrTooltipContent;
 import com.fr.plugin.chart.multilayer.style.AttrTooltipMultiLevelNameFormat;
-import com.fr.van.chart.designer.component.VanChartLabelContentPane;
+import com.fr.van.chart.designer.component.VanChartLabelContentPaneWithoutRichText;
 import com.fr.van.chart.designer.component.format.CategoryNameFormatPaneWithCheckBox;
 import com.fr.van.chart.designer.component.format.PercentFormatPaneWithCheckBox;
 import com.fr.van.chart.designer.component.format.SeriesNameFormatPaneWithCheckBox;
@@ -16,7 +17,7 @@ import java.awt.Component;
 /**
  * Created by shine on 2017/2/15.
  */
-public class VanChartStructureLabelContentPane extends VanChartLabelContentPane {
+public class VanChartStructureLabelContentPane extends VanChartLabelContentPaneWithoutRichText {
     public VanChartStructureLabelContentPane(VanChartStylePane parent, JPanel showOnPane) {
         super(parent, showOnPane);
     }
@@ -24,28 +25,33 @@ public class VanChartStructureLabelContentPane extends VanChartLabelContentPane
     @Override
     protected Component[][] getPaneComponents(){
         return new Component[][]{
-                new Component[]{categoryNameFormatPane,null},
-                new Component[]{seriesNameFormatPane,null},
-                new Component[]{valueFormatPane,null}
+                new Component[]{getCategoryNameFormatPane(),null},
+                new Component[]{getSeriesNameFormatPane(),null},
+                new Component[]{getValueFormatPane(),null}
         };
     }
 
     @Override
     protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane){
-        categoryNameFormatPane = new CategoryNameFormatPaneWithCheckBox(parent, showOnPane){
+        CategoryNameFormatPaneWithCheckBox categoryNameFormatPane = new CategoryNameFormatPaneWithCheckBox(parent, showOnPane){
             @Override
             protected String getCheckBoxText() {
-                return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Node_Name");
+                return Toolkit.i18nText("Fine-Design_Chart_Node_Name");
             }
         };
-        seriesNameFormatPane = new SeriesNameFormatPaneWithCheckBox(parent, showOnPane){
+        SeriesNameFormatPaneWithCheckBox seriesNameFormatPane = new SeriesNameFormatPaneWithCheckBox(parent, showOnPane){
             @Override
             protected String getCheckBoxText() {
-                return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_MultiPie_Series_Name");
+                return Toolkit.i18nText("Fine-Design_Chart_MultiPie_Series_Name");
             }
         };
-        valueFormatPane = new ValueFormatPaneWithCheckBox(parent, showOnPane);
-        percentFormatPane = new PercentFormatPaneWithCheckBox(parent, showOnPane);
+        ValueFormatPaneWithCheckBox valueFormatPane = new ValueFormatPaneWithCheckBox(parent, showOnPane);
+        PercentFormatPaneWithCheckBox percentFormatPane = new PercentFormatPaneWithCheckBox(parent, showOnPane);
+
+        setCategoryNameFormatPane(categoryNameFormatPane);
+        setSeriesNameFormatPane(seriesNameFormatPane);
+        setValueFormatPane(valueFormatPane);
+        setPercentFormatPane(percentFormatPane);
     }
 
     @Override

designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructurePlotLabelDetailPane.java

@@ -0,0 +1,16 @@
+package com.fr.van.chart.structure.desinger.style;
+
+import com.fr.chart.chartattr.Plot;
+import com.fr.van.chart.designer.style.VanChartStylePane;
+import com.fr.van.chart.designer.style.label.VanChartPlotLabelDetailPane;
+
+public class VanChartStructurePlotLabelDetailPane extends VanChartPlotLabelDetailPane {
+
+    public VanChartStructurePlotLabelDetailPane(Plot plot, VanChartStylePane parent) {
+        super(plot, parent);
+    }
+
+    protected void initToolTipContentPane(Plot plot) {
+        setDataLabelContentPane(new VanChartStructureLabelContentPane(getParentPane(), VanChartStructurePlotLabelDetailPane.this));
+    }
+}

designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructurePlotLabelPane.java

@@ -0,0 +1,20 @@
+package com.fr.van.chart.structure.desinger.style;
+
+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 VanChartStructurePlotLabelPane extends VanChartPlotLabelPane {
+
+    public VanChartStructurePlotLabelPane(Plot plot, VanChartStylePane parent) {
+        super(plot, parent);
+    }
+
+    protected void createLabelPane() {
+        VanChartStructurePlotLabelDetailPane labelDetailPane = new VanChartStructurePlotLabelDetailPane(getPlot(), getParentPane());
+        setLabelDetailPane(labelDetailPane);
+        getLabelPane().add(labelDetailPane, BorderLayout.CENTER);
+    }
+}

designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureRefreshTooltipContentPane.java

@@ -1,7 +1,9 @@
 package com.fr.van.chart.structure.desinger.style;
 
 import com.fr.van.chart.designer.component.format.ChangedPercentFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.ChangedPercentFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.ChangedValueFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.ChangedValueFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
 import javax.swing.JPanel;
@@ -10,7 +12,7 @@ import java.awt.Component;
 /**
  * Created by mengao on 2017/6/9.
  */
-public class VanChartStructureRefreshTooltipContentPane extends VanChartStructureTooltipContentPane{
+public class VanChartStructureRefreshTooltipContentPane extends VanChartStructureTooltipContentPane {
     public VanChartStructureRefreshTooltipContentPane(VanChartStylePane parent, JPanel showOnPane) {
         super(null, showOnPane);
     }
@@ -19,22 +21,44 @@ public class VanChartStructureRefreshTooltipContentPane extends VanChartStructur
     protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) {
         super.initFormatPane(parent, showOnPane);
 
-        changedValueFormatPane = new ChangedValueFormatPaneWithCheckBox(parent, showOnPane);
-        changedPercentFormatPane = new ChangedPercentFormatPaneWithCheckBox(parent, showOnPane);
+        ChangedValueFormatPaneWithCheckBox changedValueFormatPane = new ChangedValueFormatPaneWithCheckBox(parent, showOnPane);
+        ChangedPercentFormatPaneWithCheckBox changedPercentFormatPane = new ChangedPercentFormatPaneWithCheckBox(parent, showOnPane);
+
+        setChangedValueFormatPane(changedValueFormatPane);
+        setChangedPercentFormatPane(changedPercentFormatPane);
     }
 
-    protected double[] getRowSize(double p){
-        return new double[]{p,p,p,p,p};
+    protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
+        super.initRichTextFormatPane(parent, showOnPane);
+
+        ChangedValueFormatPaneWithoutCheckBox richTextChangedValueFormatPane = new ChangedValueFormatPaneWithoutCheckBox(parent, showOnPane);
+        ChangedPercentFormatPaneWithoutCheckBox richTextChangedPercentFormatPane = new ChangedPercentFormatPaneWithoutCheckBox(parent, showOnPane);
+
+        setRichTextChangedValueFormatPane(richTextChangedValueFormatPane);
+        setRichTextChangedPercentFormatPane(richTextChangedPercentFormatPane);
     }
 
-    @Override
-    protected Component[][] getPaneComponents(){
+    protected double[] getRowSize(double p) {
+        return new double[]{p, p, p, p, p};
+    }
+
+    protected Component[][] getPaneComponents() {
+        return new Component[][]{
+                new Component[]{getCategoryNameFormatPane(), null},
+                new Component[]{getSeriesNameFormatPane(), null},
+                new Component[]{getValueFormatPane(), null},
+                new Component[]{getChangedValueFormatPane(), null},
+                new Component[]{getChangedPercentFormatPane(), null},
+        };
+    }
+
+    protected Component[][] getRichTextComponents() {
         return new Component[][]{
-                new Component[]{categoryNameFormatPane,null},
-                new Component[]{seriesNameFormatPane,null},
-                new Component[]{valueFormatPane,null},
-                new Component[]{changedValueFormatPane,null},
-                new Component[]{changedPercentFormatPane,null},
+                new Component[]{getRichTextCategoryNameFormatPane(), null},
+                new Component[]{getRichTextSeriesNameFormatPane(), null},
+                new Component[]{getRichTextValueFormatPane(), null},
+                new Component[]{getRichTextChangedValueFormatPane(), null},
+                new Component[]{getRichTextChangedPercentFormatPane(), null}
         };
     }
 }

designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureTooltipContentPane.java

@@ -1,13 +1,18 @@
 package com.fr.van.chart.structure.desinger.style;
 
 
+import com.fr.design.i18n.Toolkit;
 import com.fr.plugin.chart.base.AttrTooltipContent;
 import com.fr.plugin.chart.multilayer.style.AttrTooltipMultiLevelNameFormat;
 import com.fr.van.chart.designer.component.VanChartTooltipContentPane;
 import com.fr.van.chart.designer.component.format.CategoryNameFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.CategoryNameFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.PercentFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.PercentFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.SeriesNameFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.SeriesNameFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.ValueFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.ValueFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
 import javax.swing.JPanel;
@@ -22,30 +27,64 @@ public class VanChartStructureTooltipContentPane extends VanChartTooltipContentP
     }
 
     @Override
-    protected Component[][] getPaneComponents(){
+    protected Component[][] getPaneComponents() {
         return new Component[][]{
-                new Component[]{categoryNameFormatPane,null},
-                new Component[]{seriesNameFormatPane,null},
-                new Component[]{valueFormatPane,null}
+                new Component[]{getCategoryNameFormatPane(), null},
+                new Component[]{getSeriesNameFormatPane(), null},
+                new Component[]{getValueFormatPane(), null}
         };
     }
 
     @Override
-    protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane){
-        categoryNameFormatPane = new CategoryNameFormatPaneWithCheckBox(parent, showOnPane){
+    protected Component[][] getRichTextComponents() {
+        return new Component[][]{
+                new Component[]{getRichTextCategoryNameFormatPane(), null},
+                new Component[]{getRichTextSeriesNameFormatPane(), null},
+                new Component[]{getRichTextValueFormatPane(), null}
+        };
+    }
+
+    @Override
+    protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) {
+        CategoryNameFormatPaneWithCheckBox categoryNameFormatPane = new CategoryNameFormatPaneWithCheckBox(parent, showOnPane) {
             @Override
             protected String getCheckBoxText() {
-                return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Node_Name");
+                return Toolkit.i18nText("Fine-Design_Chart_Node_Name");
             }
         };
-        seriesNameFormatPane = new SeriesNameFormatPaneWithCheckBox(parent, showOnPane){
+        SeriesNameFormatPaneWithCheckBox seriesNameFormatPane = new SeriesNameFormatPaneWithCheckBox(parent, showOnPane) {
             @Override
             protected String getCheckBoxText() {
-                return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_MultiPie_Series_Name");
+                return Toolkit.i18nText("Fine-Design_Chart_MultiPie_Series_Name");
             }
         };
-        valueFormatPane = new ValueFormatPaneWithCheckBox(parent, showOnPane);
-        percentFormatPane = new PercentFormatPaneWithCheckBox(parent, showOnPane);
+        ValueFormatPaneWithCheckBox valueFormatPane = new ValueFormatPaneWithCheckBox(parent, showOnPane);
+        PercentFormatPaneWithCheckBox percentFormatPane = new PercentFormatPaneWithCheckBox(parent, showOnPane);
+
+        setCategoryNameFormatPane(categoryNameFormatPane);
+        setSeriesNameFormatPane(seriesNameFormatPane);
+        setValueFormatPane(valueFormatPane);
+        setPercentFormatPane(percentFormatPane);
+    }
+
+    protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
+        CategoryNameFormatPaneWithoutCheckBox richTextCategoryNameFormatPane = new CategoryNameFormatPaneWithoutCheckBox(parent, showOnPane) {
+            protected String getCheckBoxText() {
+                return Toolkit.i18nText("Fine-Design_Chart_Node_Name");
+            }
+        };
+        SeriesNameFormatPaneWithoutCheckBox richTextSeriesNameFormatPane = new SeriesNameFormatPaneWithoutCheckBox(parent, showOnPane) {
+            protected String getCheckBoxText() {
+                return Toolkit.i18nText("Fine-Design_Chart_MultiPie_Series_Name");
+            }
+        };
+        ValueFormatPaneWithoutCheckBox richTextValueFormatPane = new ValueFormatPaneWithoutCheckBox(parent, showOnPane);
+        PercentFormatPaneWithoutCheckBox richTextPercentFormatPane = new PercentFormatPaneWithoutCheckBox(parent, showOnPane);
+
+        setRichTextCategoryNameFormatPane(richTextCategoryNameFormatPane);
+        setRichTextSeriesNameFormatPane(richTextSeriesNameFormatPane);
+        setRichTextValueFormatPane(richTextValueFormatPane);
+        setRichTextPercentFormatPane(richTextPercentFormatPane);
     }
 
     @Override

designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudRefreshTooltipContentPane.java

@@ -0,0 +1,79 @@
+package com.fr.van.chart.wordcloud.designer.style;
+
+
+import com.fr.design.i18n.Toolkit;
+import com.fr.van.chart.designer.component.format.ChangedPercentFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.ChangedPercentFormatPaneWithoutCheckBox;
+import com.fr.van.chart.designer.component.format.ChangedValueFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.ChangedValueFormatPaneWithoutCheckBox;
+import com.fr.van.chart.designer.style.VanChartStylePane;
+
+import javax.swing.JPanel;
+import java.awt.Component;
+
+/**
+ * Created by mengao on 2017/6/9.
+ */
+public class VanChartWordCloudRefreshTooltipContentPane extends VanChartWordCloudTooltipContentPane {
+    public VanChartWordCloudRefreshTooltipContentPane(VanChartStylePane parent, JPanel showOnPane) {
+        super(null, showOnPane);
+    }
+
+    @Override
+    protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) {
+        super.initFormatPane(parent, showOnPane);
+
+        ChangedValueFormatPaneWithCheckBox changedValueFormatPane = new ChangedValueFormatPaneWithCheckBox(parent, showOnPane) {
+            @Override
+            protected String getCheckBoxText() {
+                return Toolkit.i18nText("Fine-Design_Chart_Change_Word_Value");
+            }
+        };
+
+        ChangedPercentFormatPaneWithCheckBox changedPercentFormatPane = new ChangedPercentFormatPaneWithCheckBox(parent, showOnPane);
+
+        setChangedValueFormatPane(changedValueFormatPane);
+        setChangedPercentFormatPane(changedPercentFormatPane);
+    }
+
+    protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
+        super.initRichTextFormatPane(parent, showOnPane);
+
+        ChangedValueFormatPaneWithoutCheckBox richTextChangedValueFormatPane = new ChangedValueFormatPaneWithoutCheckBox(parent, showOnPane) {
+            protected String getCheckBoxText() {
+                return Toolkit.i18nText("Fine-Design_Chart_Change_Word_Value");
+            }
+        };
+
+        ChangedPercentFormatPaneWithoutCheckBox richTextChangedPercentFormatPane = new ChangedPercentFormatPaneWithoutCheckBox(parent, showOnPane);
+
+        setRichTextChangedValueFormatPane(richTextChangedValueFormatPane);
+        setRichTextChangedPercentFormatPane(richTextChangedPercentFormatPane);
+    }
+
+    protected double[] getRowSize(double p) {
+        return new double[]{p, p, p, p, p, p};
+    }
+
+    protected Component[][] getPaneComponents() {
+        return new Component[][]{
+                new Component[]{getCategoryNameFormatPane(), null},
+                new Component[]{getSeriesNameFormatPane(), null},
+                new Component[]{getValueFormatPane(), null},
+                new Component[]{getChangedValueFormatPane(), null},
+                new Component[]{getPercentFormatPane(), null},
+                new Component[]{getChangedPercentFormatPane(), null},
+        };
+    }
+
+    protected Component[][] getRichTextComponents() {
+        return new Component[][]{
+                new Component[]{getRichTextCategoryNameFormatPane(), null},
+                new Component[]{getRichTextSeriesNameFormatPane(), null},
+                new Component[]{getRichTextValueFormatPane(), null},
+                new Component[]{getRichTextChangedValueFormatPane(), null},
+                new Component[]{getRichTextPercentFormatPane(), null},
+                new Component[]{getRichTextChangedPercentFormatPane(), null}
+        };
+    }
+}

designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudRefreshTootipContentPane.java

@@ -1,47 +0,0 @@
-package com.fr.van.chart.wordcloud.designer.style;
-
-
-import com.fr.van.chart.designer.component.format.ChangedPercentFormatPaneWithCheckBox;
-import com.fr.van.chart.designer.component.format.ChangedValueFormatPaneWithCheckBox;
-import com.fr.van.chart.designer.style.VanChartStylePane;
-
-import javax.swing.JPanel;
-import java.awt.Component;
-
-/**
- * Created by mengao on 2017/6/9.
- */
-public class VanChartWordCloudRefreshTootipContentPane extends VanChartWordCloudTooltipContentPane {
-    public VanChartWordCloudRefreshTootipContentPane(VanChartStylePane parent, JPanel showOnPane) {
-        super(null, showOnPane);
-    }
-
-    @Override
-    protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) {
-        super.initFormatPane(parent, showOnPane);
-
-        changedValueFormatPane = new ChangedValueFormatPaneWithCheckBox(parent, showOnPane){
-            @Override
-            protected String getCheckBoxText() {
-                return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Change_Word_Value");
-            }
-        };
-
-        changedPercentFormatPane = new ChangedPercentFormatPaneWithCheckBox(parent, showOnPane);
-    }
-
-    protected double[] getRowSize(double p){
-        return new double[]{p,p,p,p,p,p};
-    }
-
-    protected Component[][] getPaneComponents(){
-        return new Component[][]{
-                new Component[]{categoryNameFormatPane,null},
-                new Component[]{seriesNameFormatPane,null},
-                new Component[]{valueFormatPane,null},
-                new Component[]{changedValueFormatPane,null},
-                new Component[]{percentFormatPane,null},
-                new Component[]{changedPercentFormatPane,null},
-        };
-    }
-}

designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudTooltipContentPane.java

@@ -1,13 +1,18 @@
 package com.fr.van.chart.wordcloud.designer.style;
 
 
+import com.fr.design.i18n.Toolkit;
 import com.fr.plugin.chart.base.AttrTooltipContent;
 import com.fr.plugin.chart.base.format.AttrTooltipNameFormat;
 import com.fr.van.chart.designer.component.VanChartTooltipContentPane;
 import com.fr.van.chart.designer.component.format.CategoryNameFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.CategoryNameFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.PercentFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.PercentFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.SeriesNameFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.SeriesNameFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.component.format.ValueFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.ValueFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
 import javax.swing.JPanel;
@@ -22,25 +27,54 @@ public class VanChartWordCloudTooltipContentPane extends VanChartTooltipContentP
 
     @Override
     protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane) {
-        categoryNameFormatPane = new CategoryNameFormatPaneWithCheckBox(parent, showOnPane){
+        CategoryNameFormatPaneWithCheckBox categoryNameFormatPane = new CategoryNameFormatPaneWithCheckBox(parent, showOnPane) {
             @Override
             protected String getCheckBoxText() {
-                return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_MultiPie_Series_Name");
+                return Toolkit.i18nText("Fine-Design_Chart_MultiPie_Series_Name");
             }
         };
-        seriesNameFormatPane = new SeriesNameFormatPaneWithCheckBox(parent, showOnPane){
+        SeriesNameFormatPaneWithCheckBox seriesNameFormatPane = new SeriesNameFormatPaneWithCheckBox(parent, showOnPane) {
             @Override
             protected String getCheckBoxText() {
-                return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Word_Name");
+                return Toolkit.i18nText("Fine-Design_Chart_Word_Name");
             }
         };
-        valueFormatPane = new ValueFormatPaneWithCheckBox(parent, showOnPane){
+        ValueFormatPaneWithCheckBox valueFormatPane = new ValueFormatPaneWithCheckBox(parent, showOnPane) {
             @Override
             protected String getCheckBoxText() {
-                return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Word_Value");
+                return Toolkit.i18nText("Fine-Design_Chart_Word_Value");
             }
         };
-        percentFormatPane = new PercentFormatPaneWithCheckBox(parent, showOnPane);
+        PercentFormatPaneWithCheckBox percentFormatPane = new PercentFormatPaneWithCheckBox(parent, showOnPane);
+
+        setCategoryNameFormatPane(categoryNameFormatPane);
+        setSeriesNameFormatPane(seriesNameFormatPane);
+        setValueFormatPane(valueFormatPane);
+        setPercentFormatPane(percentFormatPane);
+    }
+
+    protected void initRichTextFormatPane(VanChartStylePane parent, JPanel showOnPane) {
+        CategoryNameFormatPaneWithoutCheckBox richTextCategoryNameFormatPane = new CategoryNameFormatPaneWithoutCheckBox(parent, showOnPane) {
+            protected String getCheckBoxText() {
+                return Toolkit.i18nText("Fine-Design_Chart_MultiPie_Series_Name");
+            }
+        };
+        SeriesNameFormatPaneWithoutCheckBox richTextSeriesNameFormatPane = new SeriesNameFormatPaneWithoutCheckBox(parent, showOnPane) {
+            protected String getCheckBoxText() {
+                return Toolkit.i18nText("Fine-Design_Chart_Word_Name");
+            }
+        };
+        ValueFormatPaneWithoutCheckBox richTextValueFormatPane = new ValueFormatPaneWithoutCheckBox(parent, showOnPane) {
+            protected String getCheckBoxText() {
+                return Toolkit.i18nText("Fine-Design_Chart_Word_Value");
+            }
+        };
+        PercentFormatPaneWithoutCheckBox richTextPercentFormatPane = new PercentFormatPaneWithoutCheckBox(parent, showOnPane);
+
+        setRichTextCategoryNameFormatPane(richTextCategoryNameFormatPane);
+        setRichTextSeriesNameFormatPane(richTextSeriesNameFormatPane);
+        setRichTextValueFormatPane(richTextValueFormatPane);
+        setRichTextPercentFormatPane(richTextPercentFormatPane);
     }
 
     @Override

designer-chart/src/main/resources/com/fr/design/editor/rich_editor.css

@@ -0,0 +1,22 @@
+.editor-insert-param-inactivated-font .b-font {
+    *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.editor-insert-param-inactivated-font .b-font:before {
+    content: "\e6ea";
+    color: inherit;
+}
+.editor-insert-param-inactivated-font.disabled .b-font:before {
+    content: "\e6ea";
+    color: inherit;
+}
+.editor-insert-param-active-font .b-font {
+    *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.editor-insert-param-active-font .b-font:before {
+    content: "\e6ea";
+    color: #23beef;
+}
+.editor-insert-param-active-font.disabled .b-font:before {
+    content: "\e6ea";
+    color: #23beef;
+}

designer-chart/src/main/resources/com/fr/design/editor/rich_editor.html

@@ -0,0 +1,104 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8"/>
+    <title></title>
+    <link rel="stylesheet" type="text/css" href="http://fanruan.design/fineui/2.0/fineui.min.css"/>
+    <link rel="stylesheet" type="text/css" href="./rich_editor.css"/>
+    <script src="http://fanruan.design/fineui/2.0/fineui.js"></script>
+    <script src="https://fanruan.design/fineui/materials.bundle.min.js"></script>
+</head>
+<body>
+<script>
+    BICst.RICH_TEXT_INFO = {
+        DATA_ID: "data-id",
+        DATA_NAME: "data-name",
+        DATA_FULL_NAME: "data-full-name",
+        DATA_ORIGIN_ID: "data-origin-id",
+        DATA_ORIGIN_NAME: "data-origin-name",
+        DATA_ORIGIN_FULL_NAME: "data-origin-full-name",
+        DATA_IS_INSERT_PARAM: "data-is-insert-param",
+        DATA_IS_MISSING_FIELD: "data-is-missing-field",
+        DATA_UN_VALID: "data-unvalid",
+        NAME: "name",
+        ALT: "alt",
+        SRC: "src"
+    };
+</script>
+<script src="script/insertcombo/item/item.js"></script>
+<script src="script/insertcombo/combo.insert_param.js"></script>
+<script src="script/insertcombo/combo.insert_param.model.js"></script>
+<script src="script/toolbar/disabled_bar_wrapper.js"></script>
+<script src="script/toolbar/toolbar.js"></script>
+<script src="script/toolbar/toolbar.model.js"></script>
+<script src="script/editor.constant.js"></script>
+<script src="script/editor.js"></script>
+<script src="script/editor.model.js"></script>
+<script src="script/editor.service.js"></script>
+<script>
+    window.onload = function () {
+        var content = Pool.data.getContent();
+        var isAuto = Pool.data.isAuto();
+        var params = Pool.data.getParams();
+
+        var dimensionIds = [];
+
+        var paramGroup = params.split("-");
+
+        for (var i = 0, len = paramGroup.length; i < len; i++) {
+            var [key, value] = paramGroup[i].split(":");
+            var param = {};
+
+            param[key] = value;
+
+            dimensionIds.push(param);
+        }
+
+        var rich_editor = BI.createWidget({
+            type: "bi.design.chart.common.editor",
+            element: "body",
+            content: content,
+            fontStyle: {
+                textAlign: "center",
+                fontFamily: "",
+                fontSize: 18,
+                italic: true,
+                fontBold: false
+            },
+            isAuto: isAuto,
+            dimensionIds: dimensionIds,
+            toolbar: {
+                buttons: [
+                    {type: "bi.rich_editor_font_chooser"},
+                    {type: "bi.rich_editor_size_chooser"},
+                    {type: "bi.rich_editor_bold_button"},
+                    {type: "bi.rich_editor_italic_button"},
+                    {type: "bi.rich_editor_underline_button"},
+                    {type: "bi.rich_editor_color_chooser"},
+                    {type: "bi.rich_editor_align_left_button"},
+                    {type: "bi.rich_editor_align_center_button"},
+                    {type: "bi.rich_editor_align_right_button"},
+                    {type: "bi.design.chart.common.editor.insert_param"}
+                ]
+            },
+            ref: function (_ref) {
+                self.editor = _ref;
+            }
+        });
+
+        Pool.dispatch = function(){
+            rich_editor.setValue({content: Pool.data.getContent(), isAuto: Pool.data.isAuto()});
+        }
+
+        Pool.update = function () {
+            var {content, isAuto} = rich_editor.getValue();
+
+            Pool.data.setContent(content);
+            Pool.data.setAuto(isAuto);
+
+            return Pool.data;
+        };
+    };
+</script>
+</body>
+</html>

designer-chart/src/main/resources/com/fr/design/editor/script/editor.constant.js

@@ -0,0 +1,6 @@
+!(function () {
+
+    BI.constant("bi.constant.design.chart.common.editor.placeholder_style", {
+        fontColor: "#c4c9d1"
+    });
+}());

designer-chart/src/main/resources/com/fr/design/editor/script/editor.js

@@ -0,0 +1,255 @@
+!(function () {
+    var Widget = BI.inherit(BI.Widget, {
+        props: {
+            baseCls: "bi-design-chart-common-editor",
+            isAuto: true,
+            content: "",
+            placeholder: "",
+            fontStyle: {},
+            dimensionIds: [],
+            toolbar: {
+                buttons: []
+            },
+            textAlign: "center"
+        },
+
+        _store: function () {
+            var o = this.options;
+
+            return BI.Models.getModel("bi.model.design.chart.common.editor", {
+                dimensionIds: o.dimensionIds,
+                isAuto: o.isAuto
+            });
+        },
+
+        render: function () {
+            var self = this, o = this.options;
+            this.editor = BI.createWidget({
+                type: "bi.nic_editor",
+                $value: "chart-common-editor",
+                height: 365,
+                cls: "editor bi-border bi-focus-shadow " + (o.textAlign === "center" ? "editor-center-text" : ""),
+                listeners: [{
+                    eventName: BI.NicEditor.EVENT_FOCUS,
+                    action: function () {
+                        self.clearPlaceholder();
+                        self.store.setEditorBlurState(false);
+                    }
+                }, {
+                    eventName: BI.NicEditor.EVENT_BLUR,
+                    action: function () {
+                        self.setPlaceholder();
+                        self.store.setEditorBlurState(true);
+                    }
+                }]
+            });
+
+            return {
+                type: "bi.vtape",
+                ref: function (_ref) {
+                    self.bar = _ref;
+                },
+                items: [{
+                    type: "bi.htape",
+                    items: [{
+                        type: "bi.label",
+                        text: "字体样式: ",
+                        textAlign: "left",
+                        width: 70
+                    }, {
+                        type: "bi.button_group",
+                        items: this.model.fontStyleItems,
+                        ref: function (_ref) {
+                            self.fontStyleGroup = _ref;
+                        },
+                        listeners: [{
+                            eventName: BI.ButtonGroup.EVENT_CHANGE,
+                            action: function () {
+                                var isAuto = this.getValue()[0];
+                                self.store.changeIsAuto(isAuto);
+                                self.changeFontStyleMode(isAuto);
+                            }
+                        }],
+                        layouts: [{
+                            type: "bi.left",
+                            rgap: 5
+                        }],
+                        value: this.model.mode,
+                        width: 125
+                    }, this._getToolBar()],
+                    height: 24
+                }, {
+                    el: this.editor,
+                    tgap: 10
+                }]
+            };
+        },
+
+        _getToolBar: function () {
+            var self = this;
+            return {
+                type: "bi.design.chart.common.editor.toolbar",
+                cls: "toolbar-region",
+                wId: this.options.wId,
+                editor: this.editor,
+                buttons: this.options.toolbar.buttons,
+                ref: function (_ref) {
+                    self.toolbar = _ref;
+                }
+            };
+        },
+
+        mounted: function () {
+            this.editor.bindToolbar(this.bar);
+            this.editor.setValue(this._formatContent(this.options.content));
+            this.setFocus();
+        },
+
+        _cleanHtml: function (value) {
+            var editorService = BI.Services.getService("bi.service.design.chart.common.editor");
+            var dimensionIds = this.options.dimensionIds;
+            var dataIdMap = {};
+
+            for (var i = 0, len = dimensionIds.length; i < len; i++) {
+                var dimensionId = dimensionIds[i];
+                var key = BI.keys(dimensionId)[0];
+
+                dataIdMap[key] = dimensionId[key];
+            }
+
+            var result = BI.replaceAll(value, "<p></p>", "");
+            // 去掉image的src属性，因为数据太大了
+            result = value.replaceAll("<img.*?>", function (imageStr) {
+                var attrs = editorService.getImageAttr(imageStr);
+                var str = "<img ";
+                BI.each(attrs, function (key, value) {
+                    if (key === "src") {
+                        return;
+                    }
+                    str += " " + key + "=\"" + value + "\"";
+
+                    if (key === "alt" && dataIdMap[value]) {
+                        str += " " + "data-id" + "=\"" + dataIdMap[value] + "\"";
+                    }
+                });
+
+                return str + " />";
+            });
+
+            return result;
+        },
+
+        getValue: function () {
+            var editorService = BI.Services.getService("bi.service.design.chart.common.editor");
+            var value = this._cleanHtml(this.editor.getValue(BI.NicEditor.FormatType.ESCAPE));
+            // BI.each(this.model.dimensionIds, function (idx, dId) {
+            //     var fullName = BI.Utils.getNotGeoDimensionFullName(dId);
+            //     value = editorService.appendImageAttr(value, fullName, BICst.RICH_TEXT_INFO.DATA_ID, dId);
+            // });
+
+            if (editorService.isEmptyRichText(value)) {
+                value = "";
+            }
+
+            if (BI.isNotEmptyString(this.options.placeholder) && editorService.isRichTextEqual(value, this.options.placeholder)) {
+                value = null;
+            }
+
+            return {
+                isAuto: this.model.isAuto,
+                content: value
+            };
+        },
+
+        setValue: function (obj) {
+            var keys = BI.keys(obj);
+            if (BI.contains(keys, "content")) {
+                this.editor.setValue(this._formatContent(obj.content));
+            }
+            if (BI.contains(keys, "isAuto")) {
+                this.store.changeIsAuto(obj.isAuto);
+                this.fontStyleGroup.setValue(obj.isAuto);
+            }
+        },
+
+        _formatContent: function (content) {
+            var editorService = BI.Services.getService("bi.service.design.chart.common.editor");
+
+            content = editorService.setImageSrc(content);
+
+            if (editorService.isBlankRichText(content)
+                || editorService.isRichTextEqual(content, this.options.placeholder)) {
+                content = this.options.placeholder || "";
+            }
+
+            return content;
+        },
+
+        // 切换到“自动”时的处理方法
+        _switchToAutoStyle: function () {
+            var editorService = BI.Services.getService("bi.service.design.chart.common.editor"),
+                content = this.editor.getValue(BI.NicEditor.FormatType.ESCAPE),
+                isEqualToPlaceholder = editorService.isRichTextEqual(content, this.options.placeholder);
+
+            var HTML_ONLY_STYLE_TAG = "<font[\\s\\S]*?>|</font>|<span[\\s\\S]*?>|</span>|<b\\s+(.*?)>|<b>|</b>|<u[\\s\\S]*?>|</u>|<i\\s+(.*?)>|<i>|</i>|<strong[\\s\\S]*?>|</strong>|<em[\\s\\S]*?>|</em>|<div[\\s\\S]style(.*?)>|</div>|<p[\\s\\S]style(.*?)>|<p.[\\s\\S]*align(.*?)>|</p>";
+
+            if (!isEqualToPlaceholder) {
+                content = content.replaceAll(HTML_ONLY_STYLE_TAG, "");
+            }
+
+            return content;
+        },
+
+        clearPlaceholder: function () {
+            var editorService = BI.Services.getService("bi.service.design.chart.common.editor");
+            var content = this.editor.getValue(BI.NicEditor.FormatType.ESCAPE);
+            var isSameContent = editorService.isRichTextEqual(content, this.options.placeholder);
+
+            if (isSameContent) {
+                content = editorService.convertText2RichText("", this.options.fontStyle);
+                this.editor.setValue(content);
+                this.setFocus();
+            }
+        },
+
+        setPlaceholder: function () {
+            var editorService = BI.Services.getService("bi.service.design.chart.common.editor");
+            var content = this.editor.getValue(BI.NicEditor.FormatType.ESCAPE);
+            var isSameContent = editorService.isBlankRichText(content);
+
+            if (isSameContent) {
+                this.editor.setValue(this.options.placeholder);
+            }
+        },
+
+        // 字体样式切换
+        changeFontStyleMode: function (isAuto) {
+            var editorService = BI.Services.getService("bi.service.design.chart.common.editor");
+            var switchFn = this.options.switchFn,
+                content = this.editor.getValue(BI.NicEditor.FormatType.ESCAPE),
+                origin = content;
+            if (isAuto) {
+                content = this._switchToAutoStyle();
+                this.setFocus();
+            } else if (editorService.isRichTextEqual(content, this.options.placeholder)) {
+                content = "";
+            }
+            if (BI.isFunction(switchFn)) {
+                content = switchFn(isAuto, content);
+            }
+            if (content !== origin) {
+                this.editor.setValue(content);
+            }
+        },
+
+        setFocus: function () {
+            var instance = this.editor.instance;
+            instance && instance.initSelection();
+        }
+    });
+
+    Widget.EVENT_CHANGE = "EVENT_CHANGE";
+
+    BI.shortcut("bi.design.chart.common.editor", Widget);
+
+}());

designer-chart/src/main/resources/com/fr/design/editor/script/editor.model.js

@@ -0,0 +1,53 @@
+!(function () {
+
+    var Model = BI.inherit(Fix.Model, {
+        childContext: ["isAuto", "dimensionIds"],
+
+        state: function () {
+            var o = this.options;
+
+            return {
+                isAuto: o.isAuto,
+                dimensionIds: o.dimensionIds,
+                isEditorBlur: true
+            };
+        },
+
+        computed: {
+            fontStyleItems: function () {
+                return [{
+                    type: "bi.single_select_radio_item",
+                    text: "自动",
+                    hgap: 5,
+                    logic: {
+                        dynamic: true
+                    },
+                    value: true,
+                    selected: this.options.isAuto
+                }, {
+                    type: "bi.single_select_radio_item",
+                    text: "自定义",
+                    hgap: 5,
+                    logic: {
+                        dynamic: true
+                    },
+                    value: false,
+                    selected: !this.options.isAuto
+                }];
+            }
+        },
+
+        actions: {
+            changeIsAuto: function (isAuto) {
+                this.model.isAuto = isAuto;
+            },
+
+            setEditorBlurState: function (isBlur) {
+                this.model.isEditorBlur = isBlur;
+            }
+        }
+    });
+
+    BI.model("bi.model.design.chart.common.editor", Model);
+
+}());

designer-chart/src/main/resources/com/fr/design/editor/script/editor.service.js

@@ -0,0 +1,562 @@
+!(function () {
+
+    /**
+     * HTML解析类，使用方法：
+     * new HTMLParser().parse(htmlText, {
+     *      startTag: function (tagName, attrs) {},
+     *      endTag: function (tagName) {},
+     *      text: function (text) {}
+     * })
+     */
+    function HTMLParser () {
+
+    }
+
+    HTMLParser.prototype = {
+        constructor: HTMLParser,
+
+        startTagPattern: /<([-\w\d_]+)\s*([^>]*)\s*(\/?)>/,
+        endTagPattern: /^<\/([-\w\d_]+)[^>]*>/,
+        attrPattern: /([-\w\d_]+)\s*=\s*["']([^"']*)["']/g,
+        // 特殊的字符
+        specialCharsPatterns: [{
+            pattern: /&nbsp;/g,
+            subStr: " "
+        }, {
+            pattern: /&lt;/g,
+            subStr: "<"
+        }, {
+            pattern: /&gt;/g,
+            subStr: ">"
+        }, {
+            pattern: /&amp;/g,
+            subStr: "&"
+        }],
+
+        handle: {
+            // 以下为处理开始标签和文本的时候触发的函数，可以自定义
+            startTag: function () {
+            },
+            endTag: function () {
+            },
+            text: function () {
+            }
+        },
+
+        /**
+         *
+         * @param html
+         * @param handle
+         * @param isReplaceSpecialChars 是否需要替换HTML中的特殊字符
+         */
+        parse: function (html, handle, isReplaceSpecialChars) {
+            var index, isText = false,
+                match, last = html,
+                me = this;
+
+            isReplaceSpecialChars = isReplaceSpecialChars !== null ? isReplaceSpecialChars : true;
+
+            if (BI.isPlainObject(handle)) {
+                BI.isFunction(handle.startTag) && (this.handle.startTag = handle.startTag);
+                BI.isFunction(handle.endTag) && (this.handle.endTag = handle.endTag);
+                BI.isFunction(handle.text) && (this.handle.text = handle.text);
+            }
+
+            while (html) {
+                isText = true;
+
+                // 结束标签
+                if (html.indexOf("</") === 0) {
+                    match = html.match(this.endTagPattern);
+
+                    if (match) {
+                        html = html.substring(match[0].length);
+                        match[0].replace(this.endTagPattern, function () {
+                            me._parseEndTag.apply(me, arguments);
+                        });
+                        isText = false;
+                    }
+                } else if (html.indexOf("<") === 0) {
+                    // 遇到起始的标签，提取标签名称和属性之类的
+                    match = html.match(this.startTagPattern);
+
+                    if (match) {
+                        html = html.substring(match[0].length);
+                        match[0].replace(this.startTagPattern, function () {
+                            me._parseStartTag.apply(me, arguments);
+                        });
+                        isText = false;
+                    }
+                }
+
+                // 仅仅是一行文本的情况
+                if (isText) {
+                    index = html.indexOf("<");
+
+                    var text = index < 0 ? html : html.substring(0, index);
+                    html = index < 0 ? "" : html.substring(index);
+
+                    if (isReplaceSpecialChars) {
+                        BI.each(this.specialCharsPatterns, function (idx, obj) {
+                            text = text.replace(obj.pattern, obj.subStr);
+                        });
+                    }
+
+                    this.handle.text(text);
+                }
+
+                if (html === last) {
+                    throw "Parse Error: " + html;
+                }
+
+                last = html;
+            }
+
+            this._parseEndTag();
+        },
+
+        /**
+         * 解析开始标签的字符串
+         * @param all 整个需要解析的字符串
+         * @param tagName
+         * @param rest 除去tagNAme之后allString剩下的部分
+         */
+        _parseStartTag: function (all, tagName, rest) {
+            tagName = tagName.toLowerCase();
+
+            var attrs = [];
+
+            rest.replace(this.attrPattern, function (all, attrName, value) {
+                attrs.push({
+                    name: attrName,
+                    value: value,
+                    escaped: value.replace(/(^|[^\\])"/g, "$1\\\"")
+                });
+            });
+
+            tagName && this.handle.startTag(tagName, attrs);
+        },
+
+        /**
+         * 解析关闭的标签
+         */
+        _parseEndTag: function (all, tagName) {
+            tagName && this.handle.endTag(tagName);
+        }
+    };
+
+    // 获取一个HTML字符串中image的属性
+    function getImageAttr (html) {
+        var htmlParse = new HTMLParser();
+        var imageAttr;
+
+        htmlParse.parse(html, {
+            startTag: function (tagName, attrs) {
+                if (tagName === "img") {
+                    imageAttr = {};
+                    BI.each(attrs, function (idx, attr) {
+                        imageAttr[attr.name] = attr.value;
+                    });
+                }
+            }
+        });
+
+        return imageAttr;
+    }
+
+    var Service = BI.inherit(BI.OB, {
+
+        encode: function (params) {
+            if (/[<>'$%{}"]/.test(params)) {
+                return window.encodeURIComponent(params).replace(/'/g, escape);
+            }
+            return params;
+        },
+
+        decode: function (params) {
+            try {
+                var result = window.decodeURIComponent(params);
+                if (/[<>'$%{}"]/.test(result)) {
+                    return result;
+                }
+                return params;
+            } catch (e) {
+                return params;
+            }
+        },
+
+        HTMLParser: HTMLParser,
+
+        getImageAttr: getImageAttr,
+
+        /**
+         * 构造一个富文本中的参数图片
+         */
+        getEditorParamImage: function (param, fillStyle) {
+            var attr = BI.DOM.getImage(param, fillStyle);
+            return "<img class='rich-editor-param' height='16px'"
+                + " alt='" + this.encode(attr.param)
+                + "' name='" + this.encode(attr.param)
+                + "' style='" + attr.style + "' />";
+        },
+
+        /**
+         * 给image设置属性
+         */
+        appendImageAttr: function (html, altValue, attrName, attrValue, isCovered) {
+            altValue = this.encode(altValue);
+            attrName = this.encode(attrName);
+            attrValue = this.encode(attrValue);
+            isCovered = isCovered || false; // 属性是否可以覆盖
+
+            return html.replaceAll("<img(.*?)>", function (imageStr) {
+                var attrs = getImageAttr(imageStr);
+
+                if (attrs && attrs["alt"] === altValue && (BI.isNull(attrs[attrName]) || isCovered)) {
+                    attrs[attrName] = attrValue;
+                    imageStr = "<img ";
+
+                    BI.each(attrs, function (attrName, attrValue) {
+                        imageStr += "" + attrName + "=\"" + attrValue + "\" ";
+                    });
+
+                    imageStr += "/>";
+                }
+                return imageStr;
+            });
+        },
+
+        /**
+         * 将普通的文本转化成富文本字符串
+         */
+        convertText2RichText: function (text, fontStyle, fontProcessFn) {
+            fontStyle = fontStyle || {};
+
+            if (BI.isEmptyString(text)) {
+                return text;
+            }
+
+            var lines = text.split("\n"),
+                pattern = "\\$\\{(.*?)\\}",
+                richText = "",
+                self = this,
+                html = self._getHtmlTagStr(fontStyle, fontProcessFn);
+
+            BI.each(lines, function (idx, lineText) {
+                // 替换参数为image
+                var newText = lineText.replaceAll(pattern, function (all, $1) {
+                    return self.getEditorParamImage($1);
+                });
+                // 空字符串
+                if (!lineText) {
+                    newText += "<br />";
+                }
+                richText += html.startHtml + newText + html.endHtml;
+            });
+
+            return richText;
+        },
+
+        /**
+         * 根据fontStyle构造标签
+         */
+        _getHtmlTagStr: function (fontStyle, fontProcessFn) {
+            var tags = [{
+                    tag: "p",
+                    style: {}
+                }],
+                obj,
+                startHtml = "",
+                endHtml = "";
+
+            // fontSize 为number值
+            if (fontStyle.fontSize) {
+                obj = {
+                    tag: "font",
+                    style: {"font-size": fontStyle.fontSize + "px"}
+                };
+                tags.push(obj);
+            }
+
+            // 字体一般用默认值，不需要处理，但是KPI指标卡例外
+            if (BI.isFunction(fontProcessFn)) {
+                tags.push(fontProcessFn());
+            }
+
+            // fontBold 为boolean值
+            if (fontStyle.fontBold) {
+                obj = {
+                    tag: "b",
+                    style: {}
+                };
+                tags.push(obj);
+            }
+
+            // italic 为boolean值
+            if (fontStyle.italic) {
+                obj = {
+                    tag: "i",
+                    style: {}
+                };
+                tags.push(obj);
+            }
+
+            // underline 为boolean值
+            if (fontStyle.underline) {
+                obj = {
+                    tag: "u",
+                    style: {}
+                };
+                tags.push(obj);
+            }
+
+
+            BI.each(tags, function (idx, item) {
+                startHtml += "<" + item.tag;
+
+                // set style
+                if (BI.isNotEmptyObject(item.style)) {
+                    startHtml += " style=\"";
+                    BI.each(item.style, function (key, value) {
+                        startHtml += key + ":" + value + ";";
+                    });
+                    startHtml += "\"";
+                }
+
+                // set attributes
+                BI.each(item.attr, function (key, value) {
+                    startHtml += " " + key + "=\"" + value + "\"";
+                });
+                startHtml += ">";
+            });
+
+            BI.each(tags.reverse(), function (idx, item) {
+                endHtml += "</" + item.tag + ">";
+            });
+
+            return {
+                startHtml: startHtml,
+                endHtml: endHtml
+            };
+        },
+
+        /**
+         * 将富文本HTML转化成普通的文本，不需要记录fontStyle
+         */
+        convertRichText2Text: function (html) {
+            var content = "",
+                line = "",
+                htmlFragments = [];
+
+            new HTMLParser().parse(html, {
+                startTag: function (tagName, attrs) {
+                    // 只关心br、img
+                    switch (tagName) {
+                        case "br":
+                            line += "\n";
+                            htmlFragments.push(tagName);
+                            break;
+                        case "img":
+                            BI.each(attrs, function (idx, obj) {
+                                if (obj.name === "alt") {
+                                    line += "${" + obj.value + "}";
+                                }
+                            });
+                            break;
+                        default:
+                            break;
+                    }
+                },
+                endTag: function (tagName) {
+                    if (tagName === "div") {
+                        // <div><br /></div>这样的情况下应该只代表一个回车符
+                        htmlFragments[htmlFragments.length - 1] !== "br" && (line += "\n");
+                        htmlFragments = [];
+                    }
+
+                    content += line;
+                    line = "";
+                },
+                text: function (text) {
+                    htmlFragments.push(text);
+                    line += text;
+                }
+            });
+
+            // 去掉最后的换行符
+            content = content.replace(/\n$/, "");
+
+            return content;
+        },
+
+        convertImage2Text: function (html) {
+            if (BI.isNull(html)) {
+                return html;
+            }
+            return html.replaceAll("<img.*?>", function (imageStr) {
+                var matched = imageStr.match(/alt="(.*?)"/);
+                var startHtml = "<span class=\"rich-editor-param\" style=\"background-color: #EAF2FD;\">";
+                var endHtml = "</span>";
+                return startHtml + (matched ? matched[1] : imageStr) + endHtml;
+            });
+        },
+
+        isRichTextEqual: function (html1, html2) {
+            if (BI.isNotNull(html1)) {
+                html1 = this.convertImage2Text(html1);
+            }
+            if (BI.isNotNull(html2)) {
+                html2 = this.convertImage2Text(html2);
+            }
+
+            return html1 === html2;
+        },
+
+        isRichTextNotEqual: function (html1, html2) {
+            return !this.isRichTextEqual(html1, html2);
+        },
+
+        isBlankRichText: function (html) {
+            html = html || "";
+            html = this.convertRichText2Text(html);
+            return BI.trim(html).length === 0;
+        },
+
+        // 显示整个富文本中缺失的字段
+        showMissingFields: function (html, validDimensionIds) {
+            var self = this;
+
+            return html.replaceAll("<img.*?>", function (imageStr) {
+                var attrs = getImageAttr(imageStr);
+                return attrs && BI.contains(validDimensionIds, attrs[BICst.RICH_TEXT_INFO.DATA_ID])
+                    ? imageStr
+                    : self.getMissingFieldImage(
+                        attrs[BICst.RICH_TEXT_INFO.DATA_ID],
+                        attrs[BICst.RICH_TEXT_INFO.DATA_NAME],
+                        attrs[BICst.RICH_TEXT_INFO.ALT]
+                    );
+            });
+        },
+
+        // 获取缺失元素的图片
+        getMissingFieldImage: function (dId, name, fullName) {
+            var missingText = "<!" + BI.i18nText("BI-Design_Missing_Field") + "!>";
+            var missingImage = BI.DOM.getImage(missingText, "#ff0000");
+            var html = this.getEditorParamImage(fullName, "#ff0000");
+
+            // 将原来的dId、name、fullName保存起来
+            html = this.appendImageAttr(html, fullName, BICst.RICH_TEXT_INFO.DATA_ORIGIN_ID, dId);
+            html = this.appendImageAttr(html, fullName, BICst.RICH_TEXT_INFO.DATA_ORIGIN_NAME, name);
+            html = this.appendImageAttr(html, fullName, BICst.RICH_TEXT_INFO.DATA_ORIGIN_FULL_NAME, fullName);
+            html = this.appendImageAttr(html, fullName, BICst.RICH_TEXT_INFO.SRC, missingImage.src, true);
+            // 标记出这个参数是一个“缺失元素”
+            html = this.appendImageAttr(html, fullName, BICst.RICH_TEXT_INFO.DATA_IS_MISSING_FIELD, "true", true);
+            html = this.appendImageAttr(html, fullName, "style", missingImage.style, true);
+            return html;
+        },
+
+        // 将“缺失元素”替换成原来的字段
+        restoreMissingField: function (html) {
+            var self = this;
+
+            return html.replaceAll("<img.*?>", function (imageStr) {
+                var attrs = getImageAttr(imageStr);
+
+                if (attrs && attrs[BICst.RICH_TEXT_INFO.DATA_ORIGIN_ID]) {
+                    var fullName = attrs[BICst.RICH_TEXT_INFO.DATA_ORIGIN_FULL_NAME];
+                    var image = self.getEditorParamImage(fullName);
+
+                    image = self.appendImageAttr(image, fullName, BICst.RICH_TEXT_INFO.DATA_ID, attrs[BICst.RICH_TEXT_INFO.DATA_ORIGIN_ID]);
+                    image = self.appendImageAttr(image, fullName, BICst.RICH_TEXT_INFO.DATA_NAME, attrs[BICst.RICH_TEXT_INFO.DATA_ORIGIN_NAME]);
+                    return image;
+                }
+
+                if (attrs
+                    && attrs[BICst.RICH_TEXT_INFO.DATA_IS_INSERT_PARAM]
+                    && !attrs[BICst.RICH_TEXT_INFO.DATA_ID]
+                ) {
+                    imageStr = self.appendImageAttr(
+                        imageStr,
+                        attrs[BICst.RICH_TEXT_INFO.ALT],
+                        BICst.RICH_TEXT_INFO.DATA_UN_VALID,
+                        "true",
+                        true
+                    );
+                }
+
+                return imageStr;
+            });
+        },
+
+        // 将富文本字符串中由用户主动插入的字段参数标记出来
+        markTheInsertParamImages: function (html) {
+            return html.replaceAll("<img.*?>", function (imageStr) {
+                var attrs = getImageAttr(imageStr);
+
+                // "缺失元素"和普通的字段参数直接过滤(从富文本编辑器中插入的参数只有data-id属性)
+                if (BI.has(attrs, BICst.RICH_TEXT_INFO.DATA_NAME)
+                    || BI.has(attrs, BICst.RICH_TEXT_INFO.DATA_ORIGIN_ID)) {
+                    return imageStr;
+                }
+
+                attrs[BICst.RICH_TEXT_INFO.DATA_IS_INSERT_PARAM] = "true";
+                imageStr = "<img ";
+
+                BI.each(attrs, function (key, value) {
+                    imageStr += key + "=\"" + value + "\" ";
+                });
+
+                imageStr += "/>";
+                return imageStr;
+            });
+        },
+
+        // editor在getValue时因为src太大去掉了，在展示之前需要set 一下src
+        setImageSrc: function (content) {
+            var self = this;
+
+            return content && content.replaceAll("<img.*?>", function (imageStr) {
+                var attrs = self.getImageAttr(imageStr);
+                // 已有src
+                if (BI.has(attrs, BICst.RICH_TEXT_INFO.SRC) && attrs[BICst.RICH_TEXT_INFO.SRC]) {
+                    return imageStr;
+                }
+                var alt = self.decode(attrs[BICst.RICH_TEXT_INFO.ALT]);
+                var image = BI.DOM.getImage(alt);
+                imageStr = self.appendImageAttr(imageStr, alt, BICst.RICH_TEXT_INFO.SRC, image.src, true);
+                imageStr = self.appendImageAttr(imageStr, alt, "style", image.style, true);
+                return imageStr;
+            });
+        },
+
+        isEmptyRichText: function (html) {
+            return "" === html.replaceAll("<p.*?>|</p>|<br/?>", "");
+        },
+
+        // BI-23091 设置显示名之后更新参数名称
+        getNewParamNameRichText: function (content) {
+            if (!content) {
+                return content;
+            }
+            var self = this;
+            return content.replaceAll("<img.*?>", function (imageStr) {
+                var attrs = self.getImageAttr(imageStr);
+                // 缺失元素
+                if (attrs[BICst.RICH_TEXT_INFO.DATA_IS_MISSING_FIELD]) {
+                    return imageStr;
+                }
+                var alt = attrs[BICst.RICH_TEXT_INFO.ALT],
+                    dId = attrs[BICst.RICH_TEXT_INFO.DATA_ID],
+                    name = BI.Utils.getNotGeoDimensionFullName(dId);
+
+                if (name !== alt) {
+                    imageStr = self.appendImageAttr(imageStr, alt, BICst.RICH_TEXT_INFO.ALT, name, true);
+                }
+                return imageStr;
+            });
+        }
+    });
+
+    BI.service("bi.service.design.chart.common.editor", Service);
+
+}());