diff --git a/designer-realize/src/main/java/com/fr/design/sort/common/SortColumnRowPane.java b/designer-realize/src/main/java/com/fr/design/sort/common/SortColumnRowPane.java index 19b8ad50a..0db7af4a1 100644 --- a/designer-realize/src/main/java/com/fr/design/sort/common/SortColumnRowPane.java +++ b/designer-realize/src/main/java/com/fr/design/sort/common/SortColumnRowPane.java @@ -24,13 +24,16 @@ import com.fr.stable.ColumnRow; import com.fr.stable.EssentialUtils; import com.fr.stable.StringUtils; -import javax.swing.*; -import java.awt.*; +import javax.swing.Icon; +import javax.swing.JPanel; +import javax.swing.JTextField; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.FlowLayout; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.util.ArrayList; import java.util.HashMap; -import java.util.Iterator; import java.util.Map; public class SortColumnRowPane extends JPanel implements UIObserver { @@ -260,8 +263,10 @@ public class SortColumnRowPane extends JPanel implements UIObserver { disableHeaderCellsStyleMap = new HashMap<>(); tempHeaderCells = new ArrayList<>(); for (ColumnRow columnRow : notSelectables) { - TemplateCellElement templateCellElement - = elementCase.getTemplateCellElement(columnRow.column, columnRow.row); + TemplateCellElement templateCellElement = null; + if (columnRow != ColumnRow.ERROR) { + templateCellElement = elementCase.getTemplateCellElement(columnRow.column, columnRow.row); + } if (templateCellElement == null) { templateCellElement = new DefaultTemplateCellElement(columnRow.column, columnRow.row); elementCase.addCellElement(templateCellElement); @@ -280,8 +285,11 @@ public class SortColumnRowPane extends JPanel implements UIObserver { if (cellSelectionManager != null) { try { for (ColumnRow headerColumnRow : disableHeaderCellsStyleMap.keySet()) { - TemplateCellElement headerTemplateCellElement - = elementCase.getTemplateCellElement(headerColumnRow.column, headerColumnRow.row); + TemplateCellElement headerTemplateCellElement = null; + if (headerColumnRow != ColumnRow.ERROR) { + headerTemplateCellElement + = elementCase.getTemplateCellElement(headerColumnRow.column, headerColumnRow.row); + } if (headerTemplateCellElement != null) { headerTemplateCellElement.setStyle(disableHeaderCellsStyleMap.get(headerColumnRow)); }