Pull request #3088: CHART-17393 边框和背景隐藏后占用面板位置

Merge in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0

* commit 'f531d4cf4d83406c8329fa6db7dce2fc44a3ce28':
  CHART-17393 边框和背景隐藏后占用面板位置

designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartPlotLabelDetailPane.java

@@ -122,8 +122,7 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
                 return new Component[][]{
                         new Component[]{dataLabelContentPane, null},
                         new Component[]{createLabelPositionPane(Toolkit.i18nText("Fine-Design_Chart_Layout_Position"), plot), null},
-                        new Component[]{createLabelBorderPane(), null},
+                        new Component[]{createBorderAndBackgroundPane(), null},
-                        new Component[]{createLabelBackgroundPane(), null}
                 };
             }
 
@@ -138,6 +137,14 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
         };
     }
 
+    private JPanel createBorderAndBackgroundPane() {
+        JPanel jPanel = new JPanel();
+        jPanel.setLayout(new BorderLayout(0, 5));
+        jPanel.add(createLabelBorderPane(), BorderLayout.NORTH);
+        jPanel.add(createLabelBackgroundPane(), BorderLayout.CENTER);
+        return jPanel;
+    }
+
     private JPanel createLabelBorderPane() {
         borderPane = new VanChartBorderWithShapePane();
         borderPaneWithTitle = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Border"), borderPane);