diff --git a/designer-chart/src/main/java/com/fr/design/chartx/component/MultiComboBoxPane.java b/designer-chart/src/main/java/com/fr/design/chartx/component/MultiComboBoxPane.java index f1716a0ae..2ed4b10ff 100644 --- a/designer-chart/src/main/java/com/fr/design/chartx/component/MultiComboBoxPane.java +++ b/designer-chart/src/main/java/com/fr/design/chartx/component/MultiComboBoxPane.java @@ -14,10 +14,16 @@ import java.util.List; public class MultiComboBoxPane extends AbstractMultiComponentPane { private List currentBoxItems = new ArrayList(); + private boolean hasUse = false; + public void setCurrentBoxItems(List currentBoxItems) { this.currentBoxItems = currentBoxItems; } + public void setHasUse(boolean hasUse) { + this.hasUse = hasUse; + } + @Override protected UIComboBox createFirstFieldComponent() { return new UIComboBoxWithNone(); @@ -25,7 +31,9 @@ public class MultiComboBoxPane extends AbstractMultiComponentPane { @Override protected UIComboBox createOtherFieldComponent() { - return new UIComboBox(currentBoxItems.toArray(new Object[currentBoxItems.size()])); + UIComboBox uiComboBox = new UIComboBox(currentBoxItems.toArray(new Object[currentBoxItems.size()])); + uiComboBox.setEnabled(hasUse); + return uiComboBox; } @Override diff --git a/designer-chart/src/main/java/com/fr/design/chartx/component/MultiComboBoxPaneWithUISpinner.java b/designer-chart/src/main/java/com/fr/design/chartx/component/MultiComboBoxPaneWithUISpinner.java index 8b20768e2..1b77d163e 100644 --- a/designer-chart/src/main/java/com/fr/design/chartx/component/MultiComboBoxPaneWithUISpinner.java +++ b/designer-chart/src/main/java/com/fr/design/chartx/component/MultiComboBoxPaneWithUISpinner.java @@ -13,6 +13,8 @@ import java.util.List; public class MultiComboBoxPaneWithUISpinner extends AbstractMultiComponentPaneWithUISpinner { private List currentBoxList = new ArrayList(); + private boolean hasUse = false; + @Override protected void initComps() { currentBoxList = new ArrayList(); @@ -23,9 +25,15 @@ public class MultiComboBoxPaneWithUISpinner extends AbstractMultiComponentPaneWi this.currentBoxList = currentBoxList; } + public void setHasUse(boolean hasUse) { + this.hasUse = hasUse; + } + @Override protected UIComboBox createJComponent() { - return new UIComboBox(currentBoxList.toArray(new Object[currentBoxList.size()])); + UIComboBox uiComboBox = new UIComboBox(currentBoxList.toArray(new Object[currentBoxList.size()])); + uiComboBox.setEnabled(hasUse); + return uiComboBox; } @Override diff --git a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/MultiCategoryDataSetFieldsPane.java b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/MultiCategoryDataSetFieldsPane.java index 911db920c..b028a0b55 100644 --- a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/MultiCategoryDataSetFieldsPane.java +++ b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/MultiCategoryDataSetFieldsPane.java @@ -9,8 +9,8 @@ import com.fr.design.gui.icombobox.UIComboBox; import javax.swing.BorderFactory; import javax.swing.JPanel; import javax.swing.JSeparator; -import java.awt.BorderLayout; import java.util.List; +import java.awt.BorderLayout; /** @@ -49,6 +49,12 @@ public class MultiCategoryDataSetFieldsPane extends AbstractDataSetFieldsWithSer return list.toArray(new UIComboBox[list.size()]); } + @Override + public void checkBoxUse(boolean hasUse) { + super.checkBoxUse(hasUse); + multiCategoryPane.setHasUse(hasUse); + } + @Override public void refreshBoxListWithSelectTableData(List columnNameList) { super.refreshBoxListWithSelectTableData(columnNameList); diff --git a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/MultiPieDataSetFieldsPane.java b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/MultiPieDataSetFieldsPane.java index e18686616..26f623e37 100644 --- a/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/MultiPieDataSetFieldsPane.java +++ b/designer-chart/src/main/java/com/fr/design/chartx/fields/diff/MultiPieDataSetFieldsPane.java @@ -16,9 +16,9 @@ import javax.swing.BorderFactory; import javax.swing.JPanel; import javax.swing.JSeparator; import javax.swing.SwingConstants; +import java.util.List; import java.awt.BorderLayout; import java.awt.Component; -import java.util.List; /** * Created by shine on 2019/6/18. @@ -90,6 +90,12 @@ public class MultiPieDataSetFieldsPane extends AbstractDataSetFieldsPane { this.setLayout(new BorderLayout()); this.add(tableDataPane, BorderLayout.NORTH); this.add(dataSetFieldsPane, BorderLayout.CENTER); + checkBoxUse(); } /**