From aa6c95aef5283f74b64adee223918a9fd4272679 Mon Sep 17 00:00:00 2001
From: shine <shine@shinedeMacBook-Pro.local>
Date: Tue, 19 Nov 2019 15:28:12 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9C=89=E4=BA=9B=E5=B1=82=E7=BA=A7?=
 =?UTF-8?q?=E5=8F=AF=E8=83=BD=E6=B2=A1=E9=85=8D=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chartx/data/drillMap/EachLayerDataDefinitionPane.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer-chart/src/main/java/com/fr/design/chartx/data/drillMap/EachLayerDataDefinitionPane.java b/designer-chart/src/main/java/com/fr/design/chartx/data/drillMap/EachLayerDataDefinitionPane.java
index 39e7d94515..90cb153dbc 100644
--- a/designer-chart/src/main/java/com/fr/design/chartx/data/drillMap/EachLayerDataDefinitionPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chartx/data/drillMap/EachLayerDataDefinitionPane.java
@@ -87,7 +87,7 @@ public class EachLayerDataDefinitionPane extends MultiTabPane<DrillMapChartDataD
             return;
         }
 
-        for (int i = 0, len = paneList.size(); i < len; i++) {
+        for (int i = 0, len = Math.min(paneList.size(), eachLayerDataDefinitionList.size()); i < len; i++) {
             BasicPane basicPane = paneList.get(i);
             if (basicPane instanceof SingleDataPane) {
                 ((SingleDataPane) basicPane).populateBean(eachLayerDataDefinitionList.get(i));

From 3cbb9f505e58e0fb34c8e005e6ee165513a16671 Mon Sep 17 00:00:00 2001
From: shine <shine@shinedeMacBook-Pro.local>
Date: Tue, 19 Nov 2019 18:22:28 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B4=A8=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chartx/data/drillMap/EachLayerDataDefinitionPane.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer-chart/src/main/java/com/fr/design/chartx/data/drillMap/EachLayerDataDefinitionPane.java b/designer-chart/src/main/java/com/fr/design/chartx/data/drillMap/EachLayerDataDefinitionPane.java
index 90cb153dbc..02c6c4d089 100644
--- a/designer-chart/src/main/java/com/fr/design/chartx/data/drillMap/EachLayerDataDefinitionPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chartx/data/drillMap/EachLayerDataDefinitionPane.java
@@ -83,7 +83,7 @@ public class EachLayerDataDefinitionPane extends MultiTabPane<DrillMapChartDataD
     public void populateBean(DrillMapChartDataDefinition drillMapChartDataDefinition) {
         List<AbstractDataDefinition> eachLayerDataDefinitionList = drillMapChartDataDefinition.getEachLayerDataDefinitionList();
 
-        if (eachLayerDataDefinitionList == null || eachLayerDataDefinitionList.size() == 0) {
+        if (eachLayerDataDefinitionList == null) {
             return;
         }