适配仪表盘，清理代码

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

@@ -20,11 +20,8 @@ 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.component.richText.VanChartFieldAttrPane;
 import com.fr.van.chart.designer.component.richText.VanChartFieldListPane;
 import com.fr.van.chart.designer.component.richText.VanChartRichEditorModel;
@@ -47,14 +44,6 @@ 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;
 
@@ -104,47 +93,6 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
         };
     }
 
-    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());
 
@@ -225,20 +173,6 @@ public class VanChartBoxTooltipContentPane extends VanChartTooltipContentPane {
         };
     }
 
-    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};
     }

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

@@ -1,9 +1,7 @@
 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;
@@ -34,14 +32,6 @@ public class VanChartRefreshTooltipContentPane extends VanChartTooltipContentPan
         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[]{getCategoryNameFormatPane(), null},
@@ -52,16 +42,4 @@ public class VanChartRefreshTooltipContentPane extends VanChartTooltipContentPan
                 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/VanChartTooltipContentPane.java

@@ -24,17 +24,11 @@ import com.fr.plugin.chart.base.format.AttrTooltipValueFormat;
 import com.fr.stable.StringUtils;
 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.richText.VanChartRichEditorModel;
 import com.fr.van.chart.designer.component.richText.VanChartRichEditorPane;
@@ -84,13 +78,6 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
     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 centerPanel;
     private JPanel commonPanel;
     private JPanel editorPanel;
@@ -118,7 +105,6 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         this.richTextTooltipContent = createAttrTooltip();
 
         initFormatPane(parent, showOnPane);
-        initRichTextFormatPane(parent, showOnPane);
 
         this.setLayout(new BorderLayout());
         this.add(createLabelContentPane(), BorderLayout.CENTER);
@@ -184,54 +170,6 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         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;
-    }
-
-    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;
-    }
-
-    public ChangedPercentFormatPaneWithoutCheckBox getRichTextChangedPercentFormatPane() {
-        return richTextChangedPercentFormatPane;
-    }
-
-    public void setRichTextChangedPercentFormatPane(ChangedPercentFormatPaneWithoutCheckBox richTextChangedPercentFormatPane) {
-        this.richTextChangedPercentFormatPane = richTextChangedPercentFormatPane;
-    }
-
     public UIButtonGroup<Integer> getContent() {
         return content;
     }
@@ -558,13 +496,6 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         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);
     }
@@ -582,15 +513,6 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         };
     }
 
-    protected Component[][] getRichTextComponents() {
-        return new Component[][]{
-                new Component[]{richTextCategoryNameFormatPane, null},
-                new Component[]{richTextSeriesNameFormatPane, null},
-                new Component[]{richTextValueFormatPane, null},
-                new Component[]{richTextPercentFormatPane, null},
-        };
-    }
-
     private void initContentListener() {
         content.addActionListener(new ActionListener() {
             @Override
@@ -863,27 +785,6 @@ 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());
-        }
-    }
-
     protected void updateTooltipFormat(AttrTooltipContent target, AttrTooltipContent source) {
         if (target == null || source == null) {
             return;

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

@@ -29,14 +29,6 @@ public class RefreshTooltipContentPaneWithOutSeries extends TooltipContentPaneWi
         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){
         return new double[]{p,p,p,p,p};
     }
@@ -50,14 +42,4 @@ public class RefreshTooltipContentPaneWithOutSeries extends TooltipContentPaneWi
                 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

@@ -1,10 +1,17 @@
 package com.fr.van.chart.designer.component.tooltip;
 
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.ui.ModernUIPane;
 import com.fr.plugin.chart.base.AttrTooltipContent;
-import com.fr.plugin.chart.base.AttrTooltipRichText;
+import com.fr.plugin.chart.base.format.AttrTooltipCategoryFormat;
 import com.fr.plugin.chart.base.format.AttrTooltipFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipPercentFormat;
+import com.fr.plugin.chart.base.format.AttrTooltipValueFormat;
 import com.fr.van.chart.designer.component.VanChartTooltipContentPane;
-import com.fr.van.chart.designer.component.format.VanChartFormatPaneWithoutCheckBox;
+import com.fr.van.chart.designer.component.richText.VanChartFieldAttrPane;
+import com.fr.van.chart.designer.component.richText.VanChartFieldListPane;
+import com.fr.van.chart.designer.component.richText.VanChartRichEditorModel;
+import com.fr.van.chart.designer.component.richText.VanChartRichTextPane;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
 import javax.swing.JPanel;
@@ -33,31 +40,33 @@ public class TooltipContentPaneWithOutSeries extends VanChartTooltipContentPane
         };
     }
 
-    protected Component[][] getRichTextComponents() {
+    protected VanChartRichTextPane createRichTextPane(ModernUIPane<VanChartRichEditorModel> richEditorPane) {
-        return new Component[][]{
+
-                new Component[]{getRichTextCategoryNameFormatPane(), null},
+        return new VanChartRichTextPane(richEditorPane) {
-                new Component[]{getRichTextValueFormatPane(), null},
+
-                new Component[]{getRichTextPercentFormatPane(), null}
+            protected VanChartFieldListPane createFieldListPane(VanChartFieldAttrPane fieldAttrPane, ModernUIPane<VanChartRichEditorModel> richEditor) {
+                return new VanChartFieldListPaneWithOutSeries(fieldAttrPane, richEditor);
+            }
+
+            protected AttrTooltipContent getInitialTooltipContent() {
+                return createAttrTooltip();
+            }
         };
     }
 
-    protected void populateRichEditor(AttrTooltipContent attrTooltipContent) {
+    protected String[] getRichTextFieldNames() {
-        VanChartFormatPaneWithoutCheckBox[] formatPaneGroup = new VanChartFormatPaneWithoutCheckBox[]{
+        return new String[]{
-                getRichTextCategoryNameFormatPane(),
+                Toolkit.i18nText("Fine-Design_Chart_Category_Use_Name"),
-                getRichTextValueFormatPane(),
+                Toolkit.i18nText("Fine-Design_Chart_Use_Value"),
-                getRichTextPercentFormatPane()
+                Toolkit.i18nText("Fine-Design_Chart_Use_Percent")
         };
+    }
 
-        AttrTooltipFormat[] formatGroup = new AttrTooltipFormat[]{
+    protected AttrTooltipFormat[] getRichTextFieldFormats() {
-                attrTooltipContent.getRichTextCategoryFormat(),
+        return new AttrTooltipFormat[]{
-                attrTooltipContent.getRichTextValueFormat(),
+                new AttrTooltipCategoryFormat(),
-                attrTooltipContent.getRichTextPercentFormat()
+                new AttrTooltipValueFormat(),
+                new AttrTooltipPercentFormat()
         };
-
-        setRichTextAttr(new AttrTooltipRichText());
-        populateRichTextFormat(formatPaneGroup, formatGroup);
-        populateRichText(attrTooltipContent.getRichTextAttr());
-
-        checkRichEditorState(attrTooltipContent);
     }
 }

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

@@ -0,0 +1,34 @@
+package com.fr.van.chart.designer.component.tooltip;
+
+import com.fr.design.ui.ModernUIPane;
+import com.fr.van.chart.designer.component.richText.VanChartFieldAttrPane;
+import com.fr.van.chart.designer.component.richText.VanChartFieldButton;
+import com.fr.van.chart.designer.component.richText.VanChartFieldListPane;
+import com.fr.van.chart.designer.component.richText.VanChartRichEditorModel;
+
+import javax.swing.JPanel;
+import java.util.ArrayList;
+import java.util.List;
+
+public class VanChartFieldListPaneWithOutSeries extends VanChartFieldListPane {
+
+    public VanChartFieldListPaneWithOutSeries(VanChartFieldAttrPane fieldAttrPane, ModernUIPane<VanChartRichEditorModel> richEditorPane) {
+        super(fieldAttrPane, richEditorPane);
+    }
+
+    protected void addDefaultFieldButton(JPanel fieldPane) {
+        fieldPane.add(getCategoryNameButton());
+        fieldPane.add(getValueButton());
+        fieldPane.add(getPercentButton());
+    }
+
+    protected List<VanChartFieldButton> getDefaultFieldButtonList() {
+        List<VanChartFieldButton> fieldButtonList = new ArrayList<>();
+
+        fieldButtonList.add(getCategoryNameButton());
+        fieldButtonList.add(getValueButton());
+        fieldButtonList.add(getPercentButton());
+
+        return fieldButtonList;
+    }
+}

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

@@ -41,14 +41,6 @@ public class VanChartFunnelLabelContentPane extends VanChartLabelContentPane {
         };
     }
 
-    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) {
         setCategoryNameFormatPane(new CategoryNameFormatPaneWithCheckBox(parent, showOnPane));

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

@@ -29,14 +29,6 @@ public class VanChartFunnelRefreshTooltipContentPane extends VanChartFunnelToolt
         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){
         return new double[]{p,p,p,p,p};
     }
@@ -50,14 +42,4 @@ public class VanChartFunnelRefreshTooltipContentPane extends VanChartFunnelToolt
                 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

@@ -40,14 +40,6 @@ public class VanChartFunnelTooltipContentPane extends VanChartTooltipContentPane
         };
     }
 
-    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) {
         setCategoryNameFormatPane(new CategoryNameFormatPaneWithCheckBox(parent, showOnPane));

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

@@ -3,9 +3,7 @@ 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;
@@ -35,14 +33,6 @@ public class VanChartMapRefreshTooltipContentPane extends VanChartMapTooltipCont
         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[]{getCategoryNameFormatPane(), null},
@@ -54,17 +44,6 @@ public class VanChartMapRefreshTooltipContentPane extends VanChartMapTooltipCont
         };
     }
 
-    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}
-        };
-    }
-
     @Override
     protected AttrTooltipContent createAttrTooltip() {
         AttrTooltipContent content = new AttrTooltipContent();

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

@@ -31,14 +31,6 @@ public class VanChartMutiPieRefreshTooltipContentPane extends VanChartMultiPieTo
         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){
         return new double[]{p,p,p,p,p,p};
     }
@@ -53,16 +45,4 @@ public class VanChartMutiPieRefreshTooltipContentPane extends VanChartMultiPieTo
                 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/pie/style/VanChartPieValueLabelContentPane.java

@@ -87,15 +87,6 @@ public class VanChartPieValueLabelContentPane extends VanChartLabelContentPane {
         };
     }
 
-    @Override
-    protected Component[][] getRichTextComponents() {
-        return new Component[][]{
-                new Component[]{getRichTextSeriesNameFormatPane(), null},
-                new Component[]{getRichTextValueFormatPane(), null},
-                new Component[]{getRichTextPercentFormatPane(), null}
-        };
-    }
-
     @Override
     public void setDirty(boolean isDirty) {
         getSeriesNameFormatPane().setDirty(isDirty);

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

@@ -1,13 +1,9 @@
 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;
@@ -19,7 +15,6 @@ import java.awt.Component;
 public class VanChartScatterRefreshTooltipContentPane extends VanChartScatterTooltipContentPane {
 
     private ChangedValueFormatPaneWithCheckBox changedSizeFormatPane;
-    private ChangedValueFormatPaneWithoutCheckBox richTextChangedSizeFormatPane;
 
     public VanChartScatterRefreshTooltipContentPane(VanChartStylePane parent, JPanel showOnPane) {
         super(null, showOnPane);
@@ -33,14 +28,6 @@ public class VanChartScatterRefreshTooltipContentPane extends VanChartScatterToo
         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 boolean supportRichEditor() {
         return false;
     }
@@ -60,12 +47,6 @@ public class VanChartScatterRefreshTooltipContentPane extends VanChartScatterToo
         };
     }
 
-    @Override
-    protected Component[][] getRichTextComponents() {
-        return null;
-    }
-
-
     @Override
     protected void populateFormatPane(AttrTooltipContent attrTooltipContent) {
         super.populateFormatPane(attrTooltipContent);
@@ -87,16 +68,6 @@ public class VanChartScatterRefreshTooltipContentPane extends VanChartScatterToo
         }
     }
 
-    protected void updateRichEditor(AttrTooltipContent attrTooltipContent) {
-        super.updateRichEditor(attrTooltipContent);
-
-        if (attrTooltipContent instanceof ScatterAttrTooltipContent) {
-            ScatterAttrTooltipContent scatterAttrTooltipContent = (ScatterAttrTooltipContent) attrTooltipContent;
-            richTextChangedSizeFormatPane.update(scatterAttrTooltipContent.getRichTextChangeSizeFormat());
-            getRichTextChangedPercentFormatPane().update(scatterAttrTooltipContent.getRichTextChangedSizePercentFormat());
-        }
-    }
-
     @Override
     public void setDirty(boolean isDirty) {
         super.setDirty(isDirty);

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

@@ -1,9 +1,7 @@
 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;
@@ -28,16 +26,6 @@ public class VanChartStructureRefreshTooltipContentPane extends VanChartStructur
         setChangedPercentFormatPane(changedPercentFormatPane);
     }
 
-    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);
-    }
-
     protected boolean supportRichEditor() {
         return false;
     }
@@ -55,14 +43,4 @@ public class VanChartStructureRefreshTooltipContentPane extends VanChartStructur
                 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[]{getRichTextChangedPercentFormatPane(), null}
-        };
-    }
 }

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

@@ -39,15 +39,6 @@ public class VanChartStructureTooltipContentPane extends VanChartTooltipContentP
         };
     }
 
-    @Override
-    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) {

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

@@ -3,9 +3,7 @@ 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;
@@ -36,21 +34,6 @@ public class VanChartWordCloudRefreshTooltipContentPane extends VanChartWordClou
         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 boolean supportRichEditor() {
         return false;
     }
@@ -69,15 +52,4 @@ public class VanChartWordCloudRefreshTooltipContentPane extends VanChartWordClou
                 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}
-        };
-    }
 }