From cd9e4832ce4a606c51ef4b7224c21fc575b7e37f Mon Sep 17 00:00:00 2001
From: "Qinghui.Liu" <Qinghui.Liu@fanruan.com>
Date: Tue, 29 Dec 2020 13:55:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=96=B0=E5=A2=9E=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=AF=8C=E6=96=87=E6=9C=AC=E4=B8=AD=E7=9A=84=E4=BA=A4?=
 =?UTF-8?q?=E4=BA=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../component/VanChartTooltipContentPane.java     | 13 +++++++++----
 .../component/richText/VanChartFieldListPane.java | 15 +++++++++++----
 2 files changed, 20 insertions(+), 8 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 b9472dd86..ba6a55cb8 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
@@ -15,6 +15,7 @@ import com.fr.design.ui.ModernUIPane;
 import com.fr.general.ComparatorUtils;
 import com.fr.plugin.chart.base.AttrTooltipContent;
 import com.fr.plugin.chart.base.AttrTooltipRichText;
+import com.fr.plugin.chart.base.TableFieldCollection;
 import com.fr.plugin.chart.base.format.AttrTooltipFormat;
 import com.fr.stable.StringUtils;
 import com.fr.van.chart.designer.TableLayout4VanChartHelper;
@@ -449,15 +450,19 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         richTextDialog.addDialogActionListener(new DialogActionAdapter() {
 
             public void doOk() {
-
-                // 收集字段格式和汇总方式
-                updateTooltipFormat(richTextTooltipContent, richTextPane.updateBean());
+                AttrTooltipContent temporary = richTextPane.updateBean();
                 VanChartRichEditorModel model = richEditorPane.update();
 
                 String content = model.getContent();
-                // 收集编辑后的富文本内容
                 updateLocalRichText(content, model.isAuto());
 
+                TableFieldCollection fieldCollection = temporary.getFieldCollection();
+                if (fieldCollection != null) {
+                    fieldCollection.checkFieldDefinition(content);
+                }
+
+                updateTooltipFormat(richTextTooltipContent, temporary);
+
                 SwingUtilities.getWindowAncestor(richEditorPane).setVisible(false);
             }
 
diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/richText/VanChartFieldListPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/richText/VanChartFieldListPane.java
index e88937a6a..5c458f3fb 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/richText/VanChartFieldListPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/richText/VanChartFieldListPane.java
@@ -182,6 +182,10 @@ public class VanChartFieldListPane extends JPanel {
             }
 
             public void addSelectedField(String fieldName, String fieldId) {
+                VanChartRichEditorModel model = richEditorPane.update();
+                model.setAddition(fieldName);
+                VanChartRichEditorPane.richEditorAddField(model);
+
                 if (tableFieldNameList.contains(fieldName)) {
                     int index = tableFieldNameList.indexOf(fieldName);
 
@@ -191,10 +195,6 @@ public class VanChartFieldListPane extends JPanel {
 
                     tableFieldCollection.addFieldDefinition(fieldName, new TableFieldDefinition(fieldName, fieldFormat, dataFunction));
                 }
-
-                VanChartRichEditorModel model = richEditorPane.update();
-                model.setAddition(fieldName);
-                VanChartRichEditorPane.richEditorAddField(model);
             }
 
             public void populateFieldFormatPane() {
@@ -220,6 +220,13 @@ public class VanChartFieldListPane extends JPanel {
 
                 fieldButton.setFormat(fieldAttrPane.updateFormat());
                 fieldButton.setDataFunction(fieldAttrPane.updateDataFunction());
+
+                if (tableFieldNameList.contains(fieldName)) {
+                    Format fieldFormat = fieldButton.getFormat();
+                    DataFunction dataFunction = fieldButton.getDataFunction();
+
+                    tableFieldCollection.addFieldDefinition(fieldName, new TableFieldDefinition(fieldName, fieldFormat, dataFunction));
+                }
             }
         };
     }