From 9fba224bf5486ce54901b1dffac10fe03d29a467 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E5=B2=B3?= <445798420@qq.com>
Date: Mon, 7 Jun 2021 14:42:16 +0800
Subject: [PATCH] =?UTF-8?q?CHART-19475=20=E6=9D=A1=E4=BB=B6=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E7=9A=84=E6=A0=87=E7=AD=BE=E5=9B=BA=E5=AE=9A=E5=AE=BD?=
 =?UTF-8?q?=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../VanChartHtmlLabelPaneWithBackGroundLabel.java   |  2 +-
 .../condition/item/VanChartLabelConditionPane.java  | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartHtmlLabelPaneWithBackGroundLabel.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartHtmlLabelPaneWithBackGroundLabel.java
index f9c9f7d49..4e29e3c82 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartHtmlLabelPaneWithBackGroundLabel.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartHtmlLabelPaneWithBackGroundLabel.java
@@ -22,6 +22,6 @@ public class VanChartHtmlLabelPaneWithBackGroundLabel extends VanChartHtmlLabelP
                 new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Background")), panel},
         };
 
-        return TableLayoutHelper.createTableLayoutPane(components, new double[]{p}, new double[]{d, f});
+        return TableLayoutHelper.createTableLayoutPane(components, new double[]{p, p}, new double[]{d, f});
     }
 }
diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartLabelConditionPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartLabelConditionPane.java
index 115bdb948..87d89e8f0 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartLabelConditionPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartLabelConditionPane.java
@@ -3,11 +3,14 @@ package com.fr.van.chart.designer.other.condition.item;
 import com.fr.chart.base.DataSeriesCondition;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.condition.ConditionAttributesPane;
+import com.fr.design.layout.TableLayout;
+import com.fr.design.layout.TableLayoutHelper;
 import com.fr.plugin.chart.base.AttrLabel;
 import com.fr.van.chart.designer.PlotFactory;
 import com.fr.van.chart.designer.style.label.VanChartPlotLabelPane;
 
 import javax.swing.JPanel;
+import java.awt.Component;
 
 public class VanChartLabelConditionPane extends AbstractNormalMultiLineConditionPane {
 
@@ -22,7 +25,15 @@ public class VanChartLabelConditionPane extends AbstractNormalMultiLineCondition
     @Override
     protected JPanel initContentPane() {
         dataLabelContentsPane = createLabelPane();
-        return dataLabelContentsPane;
+        double p = TableLayout.PREFERRED;
+        double f = TableLayout.FILL;
+        double e = 220;
+
+        Component[][] components = new Component[][]{
+                new Component[]{null, dataLabelContentsPane}
+        };
+
+        return TableLayoutHelper.createTableLayoutPane(components, new double[]{p}, new double[]{f, e});
     }
 
     protected VanChartPlotLabelPane createLabelPane() {