fanruan
/
design
6
1
Fork 2
Code Issues 2 Pull Requests Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/final/11.0' into final/11.0

new-design
Destiny.Lin 1 year ago
parent
f025058d0e 836bbefda2
commit
7bb13edcbe
1 changed files with 15 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 22
      designer-realize/src/main/java/com/fr/design/sort/common/SortColumnRowPane.java

22
designer-realize/src/main/java/com/fr/design/sort/common/SortColumnRowPane.java
Unescape View File

@ -24,13 +24,16 @@ import com.fr.stable.ColumnRow;
import com.fr.stable.EssentialUtils; import com.fr.stable.EssentialUtils;
import com.fr.stable.StringUtils; import com.fr.stable.StringUtils;
import javax.swing.*; import javax.swing.Icon;
import java.awt.*; 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.MouseAdapter;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator;
import java.util.Map; import java.util.Map;
public class SortColumnRowPane extends JPanel implements UIObserver { public class SortColumnRowPane extends JPanel implements UIObserver {
@ -260,8 +263,10 @@ public class SortColumnRowPane extends JPanel implements UIObserver {
disableHeaderCellsStyleMap = new HashMap<>(); disableHeaderCellsStyleMap = new HashMap<>();
tempHeaderCells = new ArrayList<>(); tempHeaderCells = new ArrayList<>();
for (ColumnRow columnRow : notSelectables) { for (ColumnRow columnRow : notSelectables) {
TemplateCellElement templateCellElement TemplateCellElement templateCellElement = null;
= elementCase.getTemplateCellElement(columnRow.column, columnRow.row); if (columnRow != ColumnRow.ERROR) {
templateCellElement = elementCase.getTemplateCellElement(columnRow.column, columnRow.row);
}
if (templateCellElement == null) { if (templateCellElement == null) {
templateCellElement = new DefaultTemplateCellElement(columnRow.column, columnRow.row); templateCellElement = new DefaultTemplateCellElement(columnRow.column, columnRow.row);
elementCase.addCellElement(templateCellElement); elementCase.addCellElement(templateCellElement);
@ -280,8 +285,11 @@ public class SortColumnRowPane extends JPanel implements UIObserver {
if (cellSelectionManager != null) { if (cellSelectionManager != null) {
try { try {
for (ColumnRow headerColumnRow : disableHeaderCellsStyleMap.keySet()) { for (ColumnRow headerColumnRow : disableHeaderCellsStyleMap.keySet()) {
TemplateCellElement headerTemplateCellElement TemplateCellElement headerTemplateCellElement = null;
= elementCase.getTemplateCellElement(headerColumnRow.column, headerColumnRow.row); if (headerColumnRow != ColumnRow.ERROR) {
headerTemplateCellElement
= elementCase.getTemplateCellElement(headerColumnRow.column, headerColumnRow.row);
}
if (headerTemplateCellElement != null) { if (headerTemplateCellElement != null) {
headerTemplateCellElement.setStyle(disableHeaderCellsStyleMap.get(headerColumnRow)); headerTemplateCellElement.setStyle(disableHeaderCellsStyleMap.get(headerColumnRow));
} }

Write Preview
Loading…
Cancel
Save