From e57e78308759f69aceda77f1d4064f62ca9e37c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E5=B2=B3?= <445798420@qq.com>
Date: Mon, 2 Dec 2019 16:48:09 +0800
Subject: [PATCH] CHART-11265

---
 .../chartx/component/AbstractCustomFieldComboBoxPane.java       | 1 +
 .../src/main/java/com/fr/design/chartx/single/DataSetPane.java  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/designer-chart/src/main/java/com/fr/design/chartx/component/AbstractCustomFieldComboBoxPane.java b/designer-chart/src/main/java/com/fr/design/chartx/component/AbstractCustomFieldComboBoxPane.java
index e2d7d9fdb..4012366a3 100644
--- a/designer-chart/src/main/java/com/fr/design/chartx/component/AbstractCustomFieldComboBoxPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chartx/component/AbstractCustomFieldComboBoxPane.java
@@ -106,6 +106,7 @@ public abstract class AbstractCustomFieldComboBoxPane<T> extends UIComboBoxPane<
     }
 
     public void checkBoxUse(boolean hasUse) {
+        jcb.setEnabled(hasUse);
         useFieldValuePane.checkBoxUse(hasUse);
     }
 
diff --git a/designer-chart/src/main/java/com/fr/design/chartx/single/DataSetPane.java b/designer-chart/src/main/java/com/fr/design/chartx/single/DataSetPane.java
index 99bf1339e..87a3b5083 100644
--- a/designer-chart/src/main/java/com/fr/design/chartx/single/DataSetPane.java
+++ b/designer-chart/src/main/java/com/fr/design/chartx/single/DataSetPane.java
@@ -50,6 +50,7 @@ public class DataSetPane extends FurtherBasicBeanPane<DataSetDefinition> {
         this.setLayout(new BorderLayout());
         this.add(tableDataPane, BorderLayout.NORTH);
         this.add(dataSetFieldsPane, BorderLayout.CENTER);
+        checkBoxUse();
     }
 
     /**
@@ -102,7 +103,6 @@ public class DataSetPane extends FurtherBasicBeanPane<DataSetDefinition> {
         }
 
         refreshBoxList();
-        checkBoxUse();
 
         tableDataPane.populateBean(ob.getNameTableData());