From d7120f36cb57d86c24318d674aa8585e05ea097f Mon Sep 17 00:00:00 2001
From: "Qinghui.Liu" <Qinghui.Liu@fanruan.com>
Date: Tue, 29 Sep 2020 10:52:48 +0800
Subject: [PATCH] =?UTF-8?q?CHART-16003=20=E8=B0=83=E6=95=B4=E5=AF=8C?=
 =?UTF-8?q?=E6=96=87=E6=9C=AC=E7=BC=96=E8=BE=91=E5=99=A8=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89JS=E7=95=8C=E9=9D=A2=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../van/chart/designer/component/VanChartHtmlLabelPane.java   | 3 ++-
 .../chart/designer/component/VanChartTooltipContentPane.java  | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartHtmlLabelPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartHtmlLabelPane.java
index e6bee7c550..40f85dcb49 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartHtmlLabelPane.java
+++ b/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);
     }
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 98616c4e52..159db1a488 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
@@ -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);
                 }
             }
         };