Merge remote-tracking branch 'origin/release/10.0' into release/10.0

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

@@ -97,7 +97,7 @@ public abstract class DesignTableDataManager {
      */
     private static void fireDsChanged() {
         fireDsChanged(globalDsListeners);
-        for (Iterator<Entry<String, List<ChangeListener>>> entryIterator = dsListenersMap.entrySet().iterator(); entryIterator.hasNext();) {
+        for (Iterator<Entry<String, List<ChangeListener>>> entryIterator = dsListenersMap.entrySet().iterator(); entryIterator.hasNext(); ) {
             List<ChangeListener> dsListeners = entryIterator.next().getValue();
             fireDsChanged(dsListeners);
         }
@@ -190,6 +190,7 @@ public abstract class DesignTableDataManager {
         }
         dsListeners.add(l);
     }
+
     /**
      * 获取数据源source中dsName的所有字段
      *
@@ -280,7 +281,7 @@ public abstract class DesignTableDataManager {
             Entry<String, TableDataWrapper> entry = entryIt.next();
             list.add(entry.getKey());
         }
-        return list.toArray(new String[list.size()]);
+        return list.toArray(new String[0]);
     }
 
     /**

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

@@ -7,6 +7,7 @@ import com.fr.data.impl.storeproc.StoreProcedure;
 import com.fr.design.data.BasicTableDataUtils;
 import com.fr.design.data.DesignTableDataManager;
 import com.fr.design.dialog.FineJOptionPane;
+import com.fr.design.gui.NameInspector;
 import com.fr.design.gui.controlpane.JListControlPane;
 import com.fr.design.gui.controlpane.NameableCreator;
 import com.fr.design.gui.ilist.ListModelElement;
@@ -23,18 +24,20 @@ import com.fr.stable.core.PropertyChangeAdapter;
 import javax.swing.*;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * TableDataList Pane.
  */
 public class TableDataPaneListPane extends JListControlPane implements TableDataPaneController {
     private boolean isNamePermitted = true;
-    private Map<String, String> dsNameChangedMap = new HashMap<String, String>();
+    private Map<String, String> dsNameChangedMap = new HashMap<>();
 
     public TableDataPaneListPane() {
         super();
@@ -43,11 +46,15 @@ public class TableDataPaneListPane extends JListControlPane implements TableData
             @Override
             public void propertyChange() {
                 isNamePermitted = true;
-                TableDataSource source = DesignTableDataManager.getEditingTableDataSource();
-                String[] allDSNames = DesignTableDataManager.getAllDSNames(source);
-                String[] allListNames = nameableList.getAllNames();
-                allListNames[nameableList.getSelectedIndex()] = StringUtils.EMPTY;
                 String tempName = getEditingName();
+                if (ComparatorUtils.equals(tempName, selectedName)) {
+                    //说明双击之后又取消了,啥也不用做
+                    return;
+                }
+                Set<String> allDSNames = DesignTableDataManager.getGlobalDataSet().keySet();
+                String[] allListNames = nameableList.getAllNames();
+                allListNames[editingIndex] = StringUtils.EMPTY;
+
                 Object editingType = getEditingType();
 
                 if (!BasicTableDataUtils.checkName(tempName)) {
@@ -61,15 +68,14 @@ public class TableDataPaneListPane extends JListControlPane implements TableData
                     isNamePermitted = false;
                     nameableList.stopEditing();
                     FineJOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(TableDataPaneListPane.this),
-                                                      Toolkit.i18nText("Fine-Design_Basic_Table_Data_Empty_Name_Tips"),
+                            Toolkit.i18nText("Fine-Design_Basic_Table_Data_Empty_Name_Tips"),
-                                                      Toolkit.i18nText("Fine-Design_Report_Alert"),
+                            Toolkit.i18nText("Fine-Design_Report_Alert"),
-                                                      JOptionPane.WARNING_MESSAGE);
+                            JOptionPane.WARNING_MESSAGE);
                     setIllegalIndex(editingIndex);
                     return;
                 }
-
+                boolean isRepeated = isNameRepeated(new Collection[]{allDSNames, Arrays.asList(allListNames)}, tempName);
-                if (!ComparatorUtils.equals(tempName, selectedName)
+                if (isRepeated) {
-                        && isNameRepeated(new List[]{Arrays.asList(allDSNames), Arrays.asList(allListNames)}, tempName)) {
                     isNamePermitted = false;
                     nameableList.stopEditing();
                     FineJOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(TableDataPaneListPane.this), Toolkit.i18nText("Fine-Design_Basic_Table_Data_Duplicate_Name_Tips", tempName));
@@ -81,11 +87,7 @@ public class TableDataPaneListPane extends JListControlPane implements TableData
                     setIllegalIndex(editingIndex);
                 }
                 if (nameableList.getSelectedValue() instanceof ListModelElement) {
-                    Nameable selected = ((ListModelElement) nameableList.getSelectedValue()).wrapper;
+                    rename(selectedName, isRepeated ? NameInspector.ILLEGAL_NAME_HOLDER : tempName);
-                    if (!ComparatorUtils.equals(tempName, selected.getName()) && !isNameRepeated(new List[]{Arrays.asList(allDSNames), Arrays.asList(allListNames)}, tempName)) {
-                        rename(selected.getName(), tempName);
-
-                    }
                 }
             }
         });
@@ -93,7 +95,19 @@ public class TableDataPaneListPane extends JListControlPane implements TableData
 
     @Override
     public void rename(String oldName, String newName) {
-        dsNameChangedMap.put(oldName, newName);
+        //如果a改成了b,b又被改成了c,就认为是a改成了c
+        for (Map.Entry<String, String> entry : dsNameChangedMap.entrySet()) {
+            if (StringUtils.equals(oldName, entry.getValue())) {
+                oldName = entry.getKey();
+                break;
+            }
+        }
+        if (StringUtils.equals(oldName, newName)) {
+            //a -> b;b -> a,说明没改
+            dsNameChangedMap.remove(oldName);
+        } else {
+            dsNameChangedMap.put(oldName, newName);
+        }
     }
 
     /**
@@ -148,7 +162,7 @@ public class TableDataPaneListPane extends JListControlPane implements TableData
         String[] allDsNames = DesignTableDataManager.getAllDSNames(source);
 
         // richer:生成的名字从1开始. kunsnat: 添加属性从0开始.
-        int count =  1;
+        int count = 1;
         while (isDsNameRepeated(prefix + count, allDsNames)) {
             count++;
         }
@@ -192,7 +206,7 @@ public class TableDataPaneListPane extends JListControlPane implements TableData
             }
         }
 
-        populate(nameObjectList.toArray(new NameObject[nameObjectList.size()]));
+        populate(nameObjectList.toArray(new NameObject[0]));
     }
 
     /**
@@ -209,10 +223,10 @@ public class TableDataPaneListPane extends JListControlPane implements TableData
         }
         while (procedurenameIt.hasNext()) {
             String name = procedurenameIt.next();
-            nameObjectList.add(new NameObject(name,  ProcedureConfig.getInstance().getProcedure(name)));
+            nameObjectList.add(new NameObject(name, ProcedureConfig.getInstance().getProcedure(name)));
         }
 
-        populate(nameObjectList.toArray(new NameObject[nameObjectList.size()]));
+        populate(nameObjectList.toArray(new NameObject[0]));
     }
 
     @Override
@@ -220,7 +234,7 @@ public class TableDataPaneListPane extends JListControlPane implements TableData
         tableDataConfig.removeAllTableData();
         ProcedureConfig.getInstance().removeAllProcedure();
         Nameable[] tableDataArray = this.update();
-        Map<String,TableData> tableDataMap = new LinkedHashMap<String,TableData>();
+        Map<String, TableData> tableDataMap = new LinkedHashMap<String, TableData>();
         for (int i = 0; i < tableDataArray.length; i++) {
             NameObject nameObject = (NameObject) tableDataArray[i];
             tableDataMap.put(nameObject.getName(), (TableData) nameObject.getObject());

designer-base/src/main/java/com/fr/design/gui/controlpane/JListControlPane.java

@@ -27,6 +27,7 @@ import java.awt.Component;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
+import java.util.Collection;
 
 public abstract class JListControlPane extends JControlPane implements ListControlPaneProvider {
     private static final String LIST_NAME = "JControl_List";
@@ -190,9 +191,9 @@ public abstract class JListControlPane extends JControlPane implements ListContr
         return getHelper().getSelectedName();
     }
 
-    protected boolean isNameRepeated(java.util.List[] list, String name) {
+    protected boolean isNameRepeated(Collection[] collections, String name) {
-        for (int i = 0; i < list.length; i++) {
+        for (int i = 0; i < collections.length; i++) {
-            if (list[i].contains(name)) {
+            if (collections[i].contains(name)) {
                 isNameRepeated = true;
                 return true;
             }

designer-base/src/main/java/com/fr/design/gui/controlpane/ListControlPaneHelper.java

@@ -65,7 +65,7 @@ class ListControlPaneHelper {
             res.add(((ListModelElement) listModel.getElementAt(i)).wrapper);
         }
 
-        return res.toArray(new Nameable[res.size()]);
+        return res.toArray(new Nameable[0]);
     }
 
     /**

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

@@ -25,10 +25,20 @@ import com.fr.general.FRFont;
 
 import com.fr.stable.Constants;
 
-import javax.swing.*;
+import javax.swing.BorderFactory;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.CardLayout;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.GridLayout;
+import java.awt.RenderingHints;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.util.Vector;
@@ -67,11 +77,20 @@ public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObse
     private UIToggleButton subPane;
     private JPanel linePane;
     private int italic_bold;
+    /**
+     * LeftPane和RightPane之间的间隙，也是fontSizeStyleComboBox与fontSizeComboBox之间的间隙，之前的默认值为VGAP_LARGE
+     */
+    private int hGapBetweenLeftPaneAndRightPane = LayoutConstants.VGAP_LARGE;
 
     public FRFontPane() {
         this.initComponents();
     }
 
+    public FRFontPane(int hGapBetweenLeftPaneAndRightPane) {
+        this.hGapBetweenLeftPaneAndRightPane = hGapBetweenLeftPaneAndRightPane;
+        this.initComponents();
+    }
+
     public static void main(String[] args) {
         JFrame jf = new JFrame("test");
         jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
@@ -345,7 +364,7 @@ public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObse
     private JPanel createPane() {
         JPanel createPane = new JPanel(new BorderLayout());
         createPane.add(fontNameComboBox, BorderLayout.NORTH);
-        JPanel jPanel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{createLeftPane(), createRightPane()}}, TableLayoutHelper.FILL_LASTCOLUMN, LayoutConstants.VGAP_LARGE, LayoutConstants.VGAP_LARGE);
+        JPanel jPanel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{createLeftPane(), createRightPane()}}, TableLayoutHelper.FILL_LASTCOLUMN, hGapBetweenLeftPaneAndRightPane, LayoutConstants.VGAP_LARGE);
         jPanel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
         createPane.add(jPanel, BorderLayout.CENTER);
         return createPane;

designer-base/src/main/java/com/fr/design/object/NameObject.java

@@ -2,6 +2,7 @@ package com.fr.design.object;
 
 import com.fr.base.BaseUtils;
 import com.fr.general.ComparatorUtils;
+import com.fr.stable.StableUtils;
 
 /**
  * 
@@ -60,10 +61,10 @@ public class NameObject<T> {
 		return "Name:" + this.getName() + "\tObject:" + this.getObject();
 	}
 
-	@SuppressWarnings({ "rawtypes", "unchecked" })
+	@SuppressWarnings({ "rawtypes"})
 	public Object clone() throws CloneNotSupportedException {
 		NameObject newNameObject = (NameObject)super.clone();
-		newNameObject.object = BaseUtils.cloneObject(this.object);
+		newNameObject.object = StableUtils.cloneObject(this.object);
 		return newNameObject;
 	}
 

designer-base/src/test/java/com/fr/design/data/datapane/TableDataPaneListPaneTest.java

@@ -0,0 +1,26 @@
+package com.fr.design.data.datapane;
+
+import org.junit.Test;
+
+import java.util.Map;
+
+import static org.junit.Assert.*;
+
+/**
+ * @author Yyming
+ * @version 10.0
+ * Created by Yyming on 2020/9/29
+ */
+public class TableDataPaneListPaneTest {
+
+    @Test
+    public void rename() {
+        TableDataPaneListPane listPane = new TableDataPaneListPane();
+        listPane.rename("111", "222");
+        listPane.rename("222", "333");
+        Map<String, String> dsNameChangedMap = listPane.getDsNameChangedMap();
+        assertEquals(1, dsNameChangedMap.size());
+        listPane.rename("333","111");
+        assertEquals(0, dsNameChangedMap.size());
+    }
+}

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

@@ -148,11 +148,12 @@ public class VanChartHtmlLabelPane extends JPanel{
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
         double[] columnSize = { p, f };
-        double[] rowSize = { p, p};
+        double[] rowSize = {p, p, p};
 
         Component[][] components  = new Component[][]{
                 new Component[]{isCustomWidth, customWidth},
                 new Component[]{isCustomHeight, customHeight},
+                new Component[] {null, null}
         };
         return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
     }

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

@@ -18,7 +18,8 @@ public class VanChartRichEditorDialog extends BasicDialog {
         this.setTitle(Toolkit.i18nText("Fine-Design_Report_RichTextEditor"));
         this.setBasicDialogSize(DEFAULT);
         GUICoreUtils.centerWindow(this);
-        this.setResizable(false);
+        this.setResizable(true);
+        this.setModal(true);
     }
 
     protected void applyEnterAction() {

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

@@ -9,6 +9,7 @@ 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.DesignerContext;
 import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane;
 import com.fr.design.ui.ModernUIPane;
 import com.fr.plugin.chart.base.AttrTooltipContent;
@@ -32,7 +33,6 @@ import com.fr.van.chart.designer.component.format.VanChartFormatPaneWithoutCheck
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
 import javax.swing.JComponent;
-import javax.swing.JFrame;
 import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
 import java.awt.BorderLayout;
@@ -92,7 +92,7 @@ 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();
@@ -101,7 +101,7 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         initRichTextFormatPane(parent, showOnPane);
 
         this.setLayout(new BorderLayout());
-        this.add(createLabelContentPane(),BorderLayout.CENTER);
+        this.add(createLabelContentPane(), BorderLayout.CENTER);
     }
 
     public CategoryNameFormatPaneWithCheckBox getCategoryNameFormatPane() {
@@ -246,7 +246,7 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
                 } else if (content.getSelectedIndex() == RICH_EDITOR_INDEX) {
                     return editorPanel.getPreferredSize();
                 } else {
-                    return htmlPanel.getPreferredSize();
+                    return new Dimension(commonPanel.getPreferredSize().width, htmlLabelPane.getPreferredSize().height);
                 }
             }
         };
@@ -262,7 +262,7 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
                 if (content.getSelectedIndex() == COMMON_INDEX) {
                     return commonPanel.getPreferredSize();
                 } else {
-                    return htmlPanel.getPreferredSize();
+                    return new Dimension(commonPanel.getPreferredSize().width, htmlLabelPane.getPreferredSize().height);
                 }
             }
         };
@@ -330,7 +330,7 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         return TableLayoutHelper.createTableLayoutPane(components, new double[]{p, p}, new double[]{f, e});
     }
 
-    private JPanel createCommonStylePane() {
+    protected JPanel createCommonStylePane() {
         styleButton = new UIButtonGroup<>(new String[]{
                 Toolkit.i18nText("Fine-Design_Chart_Automatic"),
                 Toolkit.i18nText("Fine-Design_Chart_Custom")
@@ -407,7 +407,7 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
 
     private void fireRichEditor() {
         final ModernUIPane<VanChartRichEditorPane.RichEditorModel> pane = VanChartRichEditorPane.createRichEditorPane(richText);
-        BasicDialog dialog = new VanChartRichEditorDialog(new JFrame(), pane);
+        BasicDialog dialog = new VanChartRichEditorDialog(DesignerContext.getDesignerFrame(), pane);
 
         pane.populate(VanChartRichEditorPane.getRichEditorModel(richText));
 
@@ -474,8 +474,8 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         return TableLayout4VanChartHelper.createExpandablePaneWithTitle(title, panel);
     }
 
-    protected double[] getRowSize(double p){
+    protected double[] getRowSize(double p) {
-        return new double[]{p,p,p,p};
+        return new double[]{p, p, p, p};
     }
 
     protected Component[][] getPaneComponents() {
@@ -500,7 +500,7 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         content.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-               checkCardPane();
+                checkCardPane();
             }
         });
     }
@@ -584,8 +584,8 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
 
 
     @Override
-    public void populateBean(AttrTooltipContent attrTooltipContent){
+    public void populateBean(AttrTooltipContent attrTooltipContent) {
-        if(attrTooltipContent == null){
+        if (attrTooltipContent == null) {
             return;
         }
 
@@ -604,12 +604,12 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         }
 
         htmlLabelPane.populate(attrTooltipContent.getHtmlLabel());
-        if(!attrTooltipContent.isCommon()){
+        if (!attrTooltipContent.isCommon()) {
             setDirty(false);
         }
 
-        checkCardPane();
         checkStylePane();
+        checkCardPane();
     }
 
     private void populateTypeButton(AttrTooltipContent attrTooltipContent) {
@@ -801,9 +801,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/VanChartBorderWithShapePane.java

@@ -1,58 +1,210 @@
 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.dialog.BasicPane;
+import com.fr.design.gui.ibutton.UIButtonGroup;
+import com.fr.design.gui.icombobox.LineComboBox;
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.gui.ispinner.UISpinner;
 import com.fr.design.gui.xcombox.MarkerComboBox;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.TableLayout;
+import com.fr.design.style.color.ColorSelectBox;
 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 com.fr.stable.Constants;
+import com.fr.stable.CoreConstants;
+import com.fr.van.chart.designer.TableLayout4VanChartHelper;
 
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
 import java.awt.Component;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
-public class VanChartBorderWithShapePane extends VanChartBorderWithRadiusPane {
+public class VanChartBorderWithShapePane extends BasicPane {
+    private static final int RECTANGULAR_INDEX = 0;
+    private static final int DIALOG_INDEX = 1;
 
-    private MarkerComboBox shapePane;
+    private static final int AUTO_COLOR = 0;
+    private static final int CUSTOM_COLOR = 1;
 
-    protected void initComponents() {
+    private LineComboBox lineTypeBox;
-        shapePane = new MarkerComboBox(MarkerFactory.getLabelShapeMarkers());
+    private UIButtonGroup<Integer> lineColorButton;
-        super.initComponents();
+    private ColorSelectBox lineColorBox;
+    private MarkerComboBox borderShape;
+    private UISpinner borderRadius;
+
+    private JPanel detailPane;
+    private JPanel colorBoxPane;
+
+    public VanChartBorderWithShapePane() {
+        initComponents();
+        createBorderPane();
+    }
+
+    private void initComponents() {
+        lineTypeBox = new LineComboBox(CoreConstants.STRIKE_LINE_STYLE_ARRAY_4_CHART);
+        lineColorButton = new UIButtonGroup<>(new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_Automatic"),
+                Toolkit.i18nText("Fine-Design_Chart_Custom")
+        });
+        lineColorBox = new ColorSelectBox(100);
+        borderShape = new MarkerComboBox(MarkerFactory.getLabelShapeMarkers());
+        borderRadius = new UISpinner(0, 1000, 1, 0);
+    }
+
+    private void createBorderPane() {
+        this.setLayout(new BorderLayout());
+
+        detailPane = createDetailPane();
+
+        this.add(createLineTypePane(), BorderLayout.CENTER);
+        this.add(detailPane, BorderLayout.SOUTH);
+
+        initLineTypeListener();
+        initLineColorListener();
+        initShapeListener();
+    }
+
+    private void initLineTypeListener() {
+        lineTypeBox.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                checkDetailPane();
+            }
+        });
+    }
+
+    private void checkDetailPane() {
+        detailPane.setVisible(lineTypeBox.getSelectedLineStyle() != Constants.LINE_NONE);
     }
 
-    protected Component[][] getUseComponent() {
+    private void initLineColorListener() {
-        return new Component[][]{
+        lineColorButton.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                checkColorPane();
+            }
+        });
+    }
+
+    private void checkColorPane() {
+        colorBoxPane.setVisible(lineColorButton.getSelectedIndex() == CUSTOM_COLOR);
+    }
+
+    private void initShapeListener() {
+        borderShape.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                checkRadiusPane();
+            }
+        });
+    }
+
+    private void checkRadiusPane() {
+        borderRadius.setEnabled(borderShape.getSelectedIndex() == RECTANGULAR_INDEX || borderShape.getSelectedIndex() == DIALOG_INDEX);
+    }
+
+    private JPanel createLineTypePane() {
+        double p = TableLayout.PREFERRED;
+        double f = TableLayout.FILL;
+        double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
+
+        double[] columnSize = {f, e};
+        double[] rowSize = {p, p};
+
+        Component[][] components = new Component[][]{
                 new Component[]{null, null},
                 new Component[]{FRWidgetFactory.createLineWrapLabel(Toolkit.i18nText("Fine-Design_Chart_Line_Style")),
-                        UIComponentUtils.wrapWithBorderLayoutPane(currentLineCombo)},
+                        UIComponentUtils.wrapWithBorderLayoutPane(lineTypeBox)}};
-                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Color")), currentLineColorPane},
+
+        return TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize);
+    }
+
+    private JPanel createDetailPane() {
+        double p = TableLayout.PREFERRED;
+        double f = TableLayout.FILL;
+        double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
+
+        double[] columnSize = {f, e};
+        double[] rowSize = {p, p, p};
+
+        Component[][] components = new Component[][]{
+                new Component[]{null, null},
                 new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Shape")),
-                        UIComponentUtils.wrapWithBorderLayoutPane(shapePane)},
+                        UIComponentUtils.wrapWithBorderLayoutPane(borderShape)},
-                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Report_Radius")), getRadius()}
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Report_Radius")), borderRadius}
         };
+
+        JPanel center = createLineColorPane();
+        JPanel south = TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize);
+
+        JPanel panel = new JPanel(new BorderLayout());
+
+        panel.add(center, BorderLayout.CENTER);
+        panel.add(south, BorderLayout.SOUTH);
+
+        return panel;
     }
 
-    protected double[] getRowSize() {
+    private JPanel createLineColorPane() {
         double p = TableLayout.PREFERRED;
-        return new double[]{p, p, p, p, p};
+        double f = TableLayout.FILL;
+        double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
+
+        double[] columnSize = {f, e};
+        double[] rowSize = {p, p};
+
+        Component[][] center = new Component[][]{
+                new Component[]{null, null},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Color")), lineColorButton}
+        };
+
+        Component[][] south = new Component[][]{
+                new Component[]{null, null},
+                new Component[]{null, lineColorBox}
+        };
+
+        colorBoxPane = TableLayout4VanChartHelper.createGapTableLayoutPane(south, rowSize, columnSize);
+
+        JPanel panel = new JPanel(new BorderLayout());
+
+        panel.add(TableLayout4VanChartHelper.createGapTableLayoutPane(center, rowSize, columnSize), BorderLayout.CENTER);
+        panel.add(colorBoxPane, BorderLayout.SOUTH);
+
+        return panel;
     }
 
-    public void populate(AttrBorder border) {
+    protected String title4PopupWindow() {
-        super.populate(border);
+        return null;
+    }
 
-        if (border instanceof AttrBorderWithShape) {
+    public void populate(AttrBorderWithShape border) {
-            shapePane.setSelectedMarker((Marker.createMarker(((AttrBorderWithShape) border).getShape())));
+        if (border == null) {
+            return;
         }
-    }
 
-    public void update(AttrBorder border) {
+        lineTypeBox.setSelectedLineStyle(border.getBorderStyle());
-        super.update(border);
+        lineColorButton.setSelectedIndex(border.isAutoColor() ? AUTO_COLOR : CUSTOM_COLOR);
+        lineColorBox.setSelectObject(border.getBorderColor());
+        borderShape.setSelectedMarker((Marker.createMarker(border.getShape())));
+        borderRadius.setValue(border.getRoundRadius());
 
-        if (border instanceof AttrBorderWithShape) {
+        checkDetailPane();
-            ((AttrBorderWithShape) border).setShape(MarkerType.parse(shapePane.getSelectedMarkder().getMarkerType()));
+        checkColorPane();
+        checkRadiusPane();
+    }
+
+    public void update(AttrBorderWithShape border) {
+        if (border == null) {
+            return;
         }
+
+        border.setBorderStyle(lineTypeBox.getSelectedLineStyle());
+        border.setAutoColor(lineColorButton.getSelectedIndex() == AUTO_COLOR);
+        border.setBorderColor(lineColorBox.getSelectObject());
+        border.setShape(MarkerType.parse(borderShape.getSelectedMarkder().getMarkerType()));
+        border.setRoundRadius((int) borderRadius.getValue());
     }
 }

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

@@ -2,7 +2,7 @@ package com.fr.van.chart.designer.component.label;
 
 
 import com.fr.design.i18n.Toolkit;
-import com.fr.van.chart.designer.component.VanChartTooltipContentPane;
+import com.fr.van.chart.designer.component.VanChartLabelContentPane;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
 import javax.swing.JPanel;
@@ -10,7 +10,7 @@ import javax.swing.JPanel;
 /**
  * Created by mengao on 2017/8/13.
  */
-public class GaugeLabelContentPane extends VanChartTooltipContentPane {
+public class GaugeLabelContentPane extends VanChartLabelContentPane {
 
     public GaugeLabelContentPane(VanChartStylePane parent, JPanel showOnPane) {
         super(parent, showOnPane);

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

@@ -1,6 +1,10 @@
 package com.fr.van.chart.designer.component.tooltip;
 
+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.component.VanChartTooltipContentPane;
+import com.fr.van.chart.designer.component.format.VanChartFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
 import javax.swing.JPanel;
@@ -36,4 +40,22 @@ public class TooltipContentPaneWithOutSeries extends VanChartTooltipContentPane
                 new Component[]{getRichTextPercentFormatPane(), null}
         };
     }
+
+    protected void populateRichEditor(AttrTooltipContent attrTooltipContent) {
+        VanChartFormatPaneWithoutCheckBox[] formatPaneGroup = new VanChartFormatPaneWithoutCheckBox[]{
+                getRichTextCategoryNameFormatPane(),
+                getRichTextValueFormatPane(),
+                getRichTextPercentFormatPane()
+        };
+
+        AttrTooltipFormat[] formatGroup = new AttrTooltipFormat[]{
+                attrTooltipContent.getRichTextCategoryFormat(),
+                attrTooltipContent.getRichTextValueFormat(),
+                attrTooltipContent.getRichTextPercentFormat()
+        };
+
+        setRichTextAttr(new AttrTooltipRichText());
+        populateRichTextFormat(formatPaneGroup, formatGroup);
+        populateRichText(attrTooltipContent.getRichTextAttr());
+    }
 }

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

@@ -64,11 +64,14 @@ public class VanChartLabelPane extends AbstractVanChartScrollPane<Chart> {
             return;
         }
         ConditionAttr attrList = chart.getPlot().getConditionCollection().getDefaultAttr();
+
+        // labelPane中颜色选择器会触发listener.doChange()，导致style界面update两次，
+        // 为了避免递归updateBean时，remove与add不匹配，调整一下labelPane.update()的位置
+        AttrLabel attrLabel = labelPane.update();
         DataSeriesCondition attr = ((VanChartPlot)chart.getPlot()).getAttrLabelFromConditionCollection();
         if(attr != null) {
             attrList.remove(attr);
         }
-        AttrLabel attrLabel = labelPane.update();
         if (attrLabel != null) {
             attrList.addDataSeriesCondition(attrLabel);
         }

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

@@ -36,6 +36,8 @@ import java.awt.Component;
 public class VanChartPlotLabelDetailPane extends BasicPane {
     private static final long serialVersionUID = -22438250307946275L;
 
+    private static final int HORIZONTAL_INDEX = 0;
+
     private BasicBeanPane<AttrTooltipContent> dataLabelContentPane;
 
     private UIButtonGroup<Integer> position;
@@ -51,6 +53,9 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
     private JPanel positionPane;
     private Integer[] oldPositionValues;
 
+    private JPanel borderPaneWithTitle;
+    private JPanel backgroundPaneWithTitle;
+
     private VanChartStylePane parent;
     private Plot plot;
 
@@ -125,8 +130,9 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
 
     private JPanel createLabelBorderPane() {
         borderPane  = new VanChartBorderWithShapePane();
+        borderPaneWithTitle = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Border"), borderPane);
 
-        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Border"), borderPane);
+        return borderPaneWithTitle;
     }
 
     private JPanel createLabelBackgroundPane() {
@@ -142,7 +148,9 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
             }
         };
 
-        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Background"), backgroundPane);
+        backgroundPaneWithTitle = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Background"), backgroundPane);
+
+        return backgroundPaneWithTitle;
     }
 
     protected double[] getLabelStyleRowSize(double p) {
@@ -227,6 +235,12 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
                 Toolkit.i18nText("Fine-Design_Chart_Direction_Vertical"),
         });
 
+        orientation.addChangeListener(new ChangeListener() {
+            public void stateChanged(ChangeEvent e) {
+                checkOrientation();
+            }
+        });
+
         return TableLayout4VanChartHelper.createGapTableLayoutPane(Toolkit.i18nText("Fine-Design_Chart_Text_Orientation"), orientation);
     }
 
@@ -309,6 +323,16 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
         tractionLine.setSelected(position.getSelectedItem() == Constants.OUTSIDE);
         checkPositionEnabled();
     }
+
+    private void checkOrientation() {
+        if (orientation != null && borderPaneWithTitle != null && backgroundPaneWithTitle != null) {
+            boolean horizontal = orientation.getSelectedIndex() == HORIZONTAL_INDEX;
+
+            borderPaneWithTitle.setVisible(horizontal);
+            backgroundPaneWithTitle.setVisible(horizontal);
+        }
+    }
+
     private void checkPositionEnabled() {
         tractionLinePane.setVisible(position.getSelectedItem() == Constants.OUTSIDE);
     }
@@ -344,6 +368,7 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
         }
 
         checkAllUse();
+        checkOrientation();
     }
 
 

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

@@ -1,6 +1,8 @@
 package com.fr.van.chart.funnel.designer.style;
 
 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.plugin.chart.base.format.AttrTooltipNameFormat;
 import com.fr.van.chart.designer.component.VanChartTooltipContentPane;
 import com.fr.van.chart.designer.component.format.CategoryNameFormatPaneWithCheckBox;
@@ -9,6 +11,7 @@ import com.fr.van.chart.designer.component.format.SeriesNameFormatPaneWithCheckB
 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.VanChartFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
 import javax.swing.JPanel;
@@ -58,10 +61,29 @@ public class VanChartFunnelTooltipContentPane extends VanChartTooltipContentPane
         setRichTextPercentFormatPane(new FunnelPercentFormatPaneWithoutCheckBox(parent, showOnPane));
     }
 
+    protected void populateRichEditor(AttrTooltipContent attrTooltipContent) {
+        VanChartFormatPaneWithoutCheckBox[] formatPaneGroup = new VanChartFormatPaneWithoutCheckBox[]{
+                getRichTextSeriesNameFormatPane(),
+                getRichTextValueFormatPane(),
+                getRichTextPercentFormatPane()
+        };
+
+        AttrTooltipFormat[] formatGroup = new AttrTooltipFormat[]{
+                attrTooltipContent.getRichTextSeriesFormat(),
+                attrTooltipContent.getRichTextValueFormat(),
+                attrTooltipContent.getRichTextPercentFormat()
+        };
+
+        setRichTextAttr(new AttrTooltipRichText());
+        populateRichTextFormat(formatPaneGroup, formatGroup);
+        populateRichText(attrTooltipContent.getRichTextAttr());
+    }
+
     protected AttrTooltipContent createAttrTooltip() {
         AttrTooltipContent attrTooltipContent = new AttrTooltipContent();
         attrTooltipContent.getCategoryFormat().setEnable(false);
         attrTooltipContent.setSeriesFormat(new AttrTooltipNameFormat());
+        attrTooltipContent.setRichTextSeriesFormat(new AttrTooltipNameFormat());
         attrTooltipContent.getSeriesFormat().setEnable(true);
         attrTooltipContent.getValueFormat().setEnable(true);
         return attrTooltipContent;

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

@@ -3,7 +3,7 @@ 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.VanChartTooltipContentPane;
+import com.fr.van.chart.designer.component.VanChartLabelContentPane;
 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;
@@ -16,7 +16,7 @@ import java.awt.Component;
 /**
  * Created by hufan on 2017/1/13.
  */
-public class VanChartGanttLabelContentPane extends VanChartTooltipContentPane {
+public class VanChartGanttLabelContentPane extends VanChartLabelContentPane {
 
     private VanChartFormatPaneWithCheckBox processesFormatPane;
     private VanChartDateFormatPaneWithCheckBox startTimeFormatPane;

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

@@ -45,6 +45,8 @@ public class VanChartMapLabelContentPane extends VanChartLabelContentPane {
         AttrTooltipContent content = new AttrTooltipContent();
         content.setCategoryFormat(new AttrTooltipAreaNameFormat());
         content.setValueFormat(new AttrTooltipMapValueFormat());
+        content.setRichTextCategoryFormat(new AttrTooltipAreaNameFormat());
+        content.setRichTextValueFormat(new AttrTooltipMapValueFormat());
         return content;
     }
 }

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

@@ -45,6 +45,8 @@ public class VanChartMapTooltipContentPane extends VanChartTooltipContentPane {
         AttrTooltipContent content = new AttrTooltipContent();
         content.setCategoryFormat(new AttrTooltipAreaNameFormat());
         content.setValueFormat(new AttrTooltipMapValueFormat());
+        content.setRichTextCategoryFormat(new AttrTooltipAreaNameFormat());
+        content.setRichTextValueFormat(new AttrTooltipMapValueFormat());
         return content;
     }
 }

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

@@ -43,6 +43,8 @@ public class VanChartLineMapTooltipContentPane extends VanChartTooltipContentPan
         AttrTooltipContent content = new AttrTooltipContent();
         content.setCategoryFormat(new AttrTooltipStartAndEndNameFormat());
         content.setValueFormat(new AttrTooltipValueFormat());
+        content.setRichTextCategoryFormat(new AttrTooltipStartAndEndNameFormat());
+        content.setRichTextValueFormat(new AttrTooltipValueFormat());
         return content;
     }
 

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

@@ -38,6 +38,7 @@ public class VanChartMultiPieLabelContentPane extends VanChartLabelContentPane {
     protected AttrTooltipContent createAttrTooltip() {
         AttrTooltipContent content = new AttrTooltipContent();
         content.setCategoryFormat(new AttrTooltipMultiLevelNameFormat());
+        content.setRichTextCategoryFormat(new AttrTooltipMultiLevelNameFormat());
         return content;
     }
 }

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

@@ -39,6 +39,7 @@ public class VanChartMultiPieTooltipContentPane extends VanChartTooltipContentPa
     protected AttrTooltipContent createAttrTooltip() {
         AttrTooltipContent content = new AttrTooltipContent();
         content.setCategoryFormat(new AttrTooltipMultiLevelNameFormat());
+        content.setRichTextCategoryFormat(new AttrTooltipMultiLevelNameFormat());
         return content;
     }
 

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

@@ -4,7 +4,7 @@ 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.VanChartLabelContentPane;
 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;
@@ -17,7 +17,7 @@ import java.awt.Component;
 /**
  * Created by shine on 2017/2/15.
  */
-public class VanChartStructureLabelContentPane extends VanChartTooltipContentPane {
+public class VanChartStructureLabelContentPane extends VanChartLabelContentPane {
     public VanChartStructureLabelContentPane(VanChartStylePane parent, JPanel showOnPane) {
         super(parent, showOnPane);
     }

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

@@ -3,6 +3,8 @@ 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.base.AttrTooltipRichText;
+import com.fr.plugin.chart.base.format.AttrTooltipFormat;
 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;
@@ -13,6 +15,7 @@ import com.fr.van.chart.designer.component.format.SeriesNameFormatPaneWithCheckB
 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.VanChartFormatPaneWithoutCheckBox;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
 import javax.swing.JPanel;
@@ -87,10 +90,29 @@ public class VanChartStructureTooltipContentPane extends VanChartTooltipContentP
         setRichTextPercentFormatPane(richTextPercentFormatPane);
     }
 
+    protected void populateRichEditor(AttrTooltipContent attrTooltipContent) {
+        VanChartFormatPaneWithoutCheckBox[] formatPaneGroup = new VanChartFormatPaneWithoutCheckBox[]{
+                getRichTextCategoryNameFormatPane(),
+                getRichTextSeriesNameFormatPane(),
+                getRichTextValueFormatPane()
+        };
+
+        AttrTooltipFormat[] formatGroup = new AttrTooltipFormat[]{
+                attrTooltipContent.getRichTextCategoryFormat(),
+                attrTooltipContent.getRichTextSeriesFormat(),
+                attrTooltipContent.getRichTextValueFormat()
+        };
+
+        setRichTextAttr(new AttrTooltipRichText());
+        populateRichTextFormat(formatPaneGroup, formatGroup);
+        populateRichText(attrTooltipContent.getRichTextAttr());
+    }
+
     @Override
     protected AttrTooltipContent createAttrTooltip() {
         AttrTooltipContent attrTooltipContent = new AttrTooltipContent();
         attrTooltipContent.setCategoryFormat(new AttrTooltipMultiLevelNameFormat());
+        attrTooltipContent.setRichTextCategoryFormat(new AttrTooltipMultiLevelNameFormat());
         return attrTooltipContent;
     }
 }

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

@@ -81,6 +81,7 @@ public class VanChartWordCloudTooltipContentPane extends VanChartTooltipContentP
     protected AttrTooltipContent createAttrTooltip() {
         AttrTooltipContent attrTooltipContent = new AttrTooltipContent();
         attrTooltipContent.setSeriesFormat(new AttrTooltipNameFormat());
+        attrTooltipContent.setRichTextSeriesFormat(new AttrTooltipNameFormat());
         return attrTooltipContent;
     }
 }

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

@@ -107,7 +107,7 @@
 
         _cleanHtml: function (value) {
             var editorService = BI.Services.getService("bi.service.design.chart.common.editor");
-            var dimensionIds = this.options.dimensionIds;
+            var dimensionIds = this.model.dimensionIds;
             var dataIdMap = {};
 
             for (var i = 0, len = dimensionIds.length; i < len; i++) {
@@ -232,7 +232,7 @@
                 content = this.editor.getValue(BI.NicEditor.FormatType.ESCAPE),
                 origin = content;
             if (isAuto) {
-                content = this._switchToAutoStyle();
+                // content = this._switchToAutoStyle();
                 this.setFocus();
             } else if (editorService.isRichTextEqual(content, this.options.placeholder)) {
                 content = "";

designer-form/src/main/java/com/fr/design/designer/beans/models/SelectionModel.java

@@ -15,6 +15,7 @@ import com.fr.design.designer.creator.XWAbsoluteBodyLayout;
 import com.fr.design.designer.creator.XWAbsoluteLayout;
 import com.fr.design.designer.creator.XWFitLayout;
 import com.fr.design.designer.creator.XWParameterLayout;
+import com.fr.design.designer.creator.cardlayout.XCardSwitchButton;
 import com.fr.design.designer.creator.cardlayout.XWCardLayout;
 import com.fr.design.designer.creator.cardlayout.XWCardMainBorderLayout;
 import com.fr.design.designer.creator.cardlayout.XWTabFitLayout;
@@ -111,7 +112,7 @@ public class SelectionModel {
         if (comp != designer.getRootComponent() && comp != designer.getParaComponent()) {
             XCreator parentContainer = (XCreator) comp.getParent();
             if (parentContainer != null) {
-                comp = parentContainer.isDedicateContainer() ? parentContainer : comp;
+                comp = parentContainer.isDedicateContainer() || comp instanceof XCardSwitchButton ? parentContainer : comp;
             }
         }
         if (selection.removeSelectedCreator(comp) || selection.addSelectedCreator(comp)) {

designer-form/src/main/java/com/fr/design/widget/ui/designer/LabelDefinePane.java

@@ -1,6 +1,7 @@
 package com.fr.design.widget.ui.designer;
 
 import com.fr.base.BaseUtils;
+import com.fr.design.constants.LayoutConstants;
 import com.fr.design.designer.IntervalConstants;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.foldablepane.UIExpandablePane;
@@ -58,7 +59,8 @@ public class LabelDefinePane extends AbstractDataModify<Label> {
         hAlignmentPane = new UIButtonGroup<Integer>(hAlignmentIconArray, hAlignment);
         hAlignmentPane.setAllToolTips(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_StyleAlignment_Left")
                 , com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_StyleAlignment_Center"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_StyleAlignment_Right")});
-        frFontPane = new FRFontPane();
+        // 字体大小是浮点数，因为涉及很多字体计算，不太好修改，为了完整显示字体，将FRFontPane中的fontSizeComboBox拉长一点
+        frFontPane = new FRFontPane(LayoutConstants.VGAP_MEDIUM);
         double f = TableLayout.FILL;
         double p = TableLayout.PREFERRED;
         double[] rowSize = {p, p, p, p, p, p, p};