From dd32c9f7113090ba576499cf673f49885441e181 Mon Sep 17 00:00:00 2001
From: "Qinghui.Liu" <Qinghui.Liu@fanruan.com>
Date: Mon, 21 Sep 2020 10:26:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=94=98=E7=89=B9=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=92=8C=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../component/VanChartTooltipContentPane.java | 42 +++++++++++----
 .../VanChartGanttTooltipContentPane.java      | 54 +++++++++++++++++++
 2 files changed, 85 insertions(+), 11 deletions(-)

diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java
index 76148e6490..bf7b517943 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java
@@ -190,6 +190,10 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         this.richTextChangedPercentFormatPane = richTextChangedPercentFormatPane;
     }
 
+    public AttrTooltipRichText getRichTextAttr() {
+        return richText;
+    }
+
     private JPanel createLabelContentPane() {
         initDetailPane();
         initCenterPane();
@@ -605,8 +609,10 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
             }
         }
 
-        AttrTooltipRichText tooltipRichText = attrTooltipContent.getRichTextAttr();
+        populateRichText(attrTooltipContent.getRichTextAttr());
+    }
 
+    protected void populateRichText(AttrTooltipRichText tooltipRichText) {
         if (tooltipRichText != null) {
             updateLocalRichText(tooltipRichText.getContent(), tooltipRichText.isAuto());
             setDirty(false);
@@ -636,11 +642,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());
         }
@@ -650,11 +663,18 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
     }
 
     protected void updateRichEditor(AttrTooltipContent attrTooltipContent) {
-        richTextCategoryNameFormatPane.update(attrTooltipContent.getRichTextCategoryFormat());
-        richTextSeriesNameFormatPane.update(attrTooltipContent.getRichTextSeriesFormat());
-        richTextValueFormatPane.update(attrTooltipContent.getRichTextValueFormat());
-        richTextValueFormatPane.update(attrTooltipContent.getRichTextPercentFormat());
-
+        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());
         }
diff --git a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/tooltip/VanChartGanttTooltipContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/tooltip/VanChartGanttTooltipContentPane.java
index 71b57cde89..3d3d87d10d 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/tooltip/VanChartGanttTooltipContentPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/tooltip/VanChartGanttTooltipContentPane.java
@@ -2,6 +2,12 @@ package com.fr.van.chart.gantt.designer.style.tooltip;
 
 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.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.component.VanChartTooltipContentPane;
 import com.fr.van.chart.designer.component.format.SeriesNameFormatPaneWithCheckBox;
@@ -12,6 +18,7 @@ import com.fr.van.chart.designer.style.VanChartStylePane;
 
 import javax.swing.JPanel;
 import java.awt.Component;
+import java.util.Map;
 
 /**
  * Created by hufan on 2017/1/13.
@@ -115,6 +122,7 @@ public class VanChartGanttTooltipContentPane extends VanChartTooltipContentPane
 
     @Override
     protected void populateFormatPane(AttrTooltipContent attrTooltipContent) {
+        // fixme 当前的样式面板设计都是基于一个大而全的父类，在子类中组合需要的属性，导致父类的属性多是protected，且子类不能明确获取自己Model的type
         if (attrTooltipContent instanceof AttrGanttTooltipContent){
             AttrGanttTooltipContent ganttTooltipContent = (AttrGanttTooltipContent) attrTooltipContent;
             processesFormatPane.populate(ganttTooltipContent.getProcessesFormat());
@@ -126,6 +134,39 @@ 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;
@@ -138,6 +179,19 @@ 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()
                 || getSeriesNameFormatPane().isDirty()