Browse Source

Merge pull request #9787 in DESIGN/design from release/11.0 to bugfix/11.0

* commit '8c1bd3c70a70579128525bae0ce05cf6106055e6':
  REPORT-77337 表头排序-表头区域异常
bugfix/11.0
superman 2 years ago
parent
commit
5b0a64d60a
  1. 2
      designer-realize/src/main/java/com/fr/design/sort/header/HeaderAreaPane.java

2
designer-realize/src/main/java/com/fr/design/sort/header/HeaderAreaPane.java

@ -168,7 +168,9 @@ public class HeaderAreaPane extends JPanel {
public void populateBean(ColumnRow columnRow, boolean showHeaderArea, boolean enabled) { public void populateBean(ColumnRow columnRow, boolean showHeaderArea, boolean enabled) {
cellSelectionManager.build(cellElement, columnRow); cellSelectionManager.build(cellElement, columnRow);
if(showHeaderArea){
columnRow = cellSelectionManager.buildCurrentCell(cellElement, columnRow); columnRow = cellSelectionManager.buildCurrentCell(cellElement, columnRow);
}
columnRowPane.populateBean(columnRow, enabled, cellSelectionManager); columnRowPane.populateBean(columnRow, enabled, cellSelectionManager);
setSortColumnRowPaneShow(showHeaderArea); setSortColumnRowPaneShow(showHeaderArea);
uiComboBox.setSelectedIndex(showHeaderArea ? 1 : 0); uiComboBox.setSelectedIndex(showHeaderArea ? 1 : 0);

Loading…
Cancel
Save