From 5ac5cfbba9dab5932733999aa2722cbe09018aee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E5=B2=B3?= <445798420@qq.com>
Date: Thu, 7 Jan 2021 15:31:03 +0800
Subject: [PATCH] =?UTF-8?q?CHART-17805=20=E9=A5=BC=E5=9B=BE=E9=9D=A2?=
 =?UTF-8?q?=E6=9D=BF=E7=BE=8E=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../VanChartPieValueLabelDetailPane.java      | 21 +++++++++++++++++++
 .../label/VanChartPlotLabelDetailPane.java    |  6 ++++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartPieValueLabelDetailPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartPieValueLabelDetailPane.java
index 707f6f5fd..43f6da1e9 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartPieValueLabelDetailPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartPieValueLabelDetailPane.java
@@ -13,6 +13,7 @@ import com.fr.van.chart.designer.style.VanChartStylePane;
 import com.fr.van.chart.pie.style.VanChartPieValueLabelContentPane;
 
 import javax.swing.JPanel;
+import java.awt.BorderLayout;
 import java.awt.Component;
 
 /**
@@ -34,6 +35,14 @@ public class VanChartPieValueLabelDetailPane extends VanChartPlotLabelDetailPane
         return panel;
     }
 
+    protected JPanel createBorderAndBackgroundPane() {
+        JPanel jPanel = new JPanel();
+        jPanel.setLayout(new BorderLayout(0, 10));
+        jPanel.add(createLabelBorderPane(), BorderLayout.NORTH);
+        jPanel.add(createLabelBackgroundPane(), BorderLayout.CENTER);
+        return jPanel;
+    }
+
     protected JPanel createLabelBorderPane() {
         VanChartBorderWithShapePane borderPane = new VanChartBorderWithShapePane() {
             @Override
@@ -58,6 +67,18 @@ public class VanChartPieValueLabelDetailPane extends VanChartPlotLabelDetailPane
 
     protected JPanel createLabelBackgroundPane() {
         VanChartBackgroundWithOutImagePane backgroundPane = new VanChartBackgroundWithOutImagePane() {
+
+            @Override
+            protected JPanel initContentPanel() {
+                double p = TableLayout.PREFERRED;
+                double f = TableLayout.FILL;
+                double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
+                double[] columnSize = {f, e};
+                double[] rowSize = {p, p, p};
+                return TableLayout4VanChartHelper.createGapTableLayoutPane(getPaneComponents(), rowSize, columnSize);
+            }
+
+            @Override
             protected Component[][] getPaneComponents() {
                 return new Component[][]{
                         new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Basic_Utils_Background")), typeComboBox},
diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartPlotLabelDetailPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartPlotLabelDetailPane.java
index 624e6c879..0467fe3f5 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartPlotLabelDetailPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartPlotLabelDetailPane.java
@@ -23,6 +23,7 @@ import com.fr.van.chart.designer.component.background.VanChartBackgroundWithOutI
 import com.fr.van.chart.designer.component.border.VanChartBorderWithShapePane;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
+import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import javax.swing.SwingConstants;
 import javax.swing.event.ChangeEvent;
@@ -242,6 +243,7 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
         if (plot.isSupportLeadLine()) {
             tractionLine = new UIToggleButton(Toolkit.i18nText("Fine-Design_Chart_Show_Guideline"));
             tractionLinePane = TableLayout4VanChartHelper.createGapTableLayoutPane("", tractionLine);
+            tractionLinePane.setBorder(BorderFactory.createEmptyBorder(0, 0, 5, 0));
             panel.add(tractionLinePane, BorderLayout.SOUTH);
             initPositionListener();
         } else if (PlotFactory.plotAutoAdjustLabelPosition(plot)) {
@@ -350,7 +352,7 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
     }
 
     private void checkPosition() {
-        tractionLine.setSelected(position.getSelectedItem() == Constants.OUTSIDE);
+        tractionLine.setSelected(position.getSelectedItem() != null && position.getSelectedItem() == Constants.OUTSIDE);
         checkPositionEnabled();
     }
 
@@ -364,7 +366,7 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
     }
 
     private void checkPositionEnabled() {
-        tractionLinePane.setVisible(position.getSelectedItem() == Constants.OUTSIDE);
+        tractionLinePane.setVisible(position.getSelectedItem() != null && position.getSelectedItem() == Constants.OUTSIDE);
     }
 
     protected void checkPane() {