Browse Source

Pull request #8412: REPORT-68915 数据列数据集显示丢失 && REPORT-68890 补充空白数据配置勾选后不出现数据倍数配置项

Merge in DESIGN/design from ~HENRY.WANG/design:release/11.0 to release/11.0

* commit 'b33926ae1e9d50c9b0b0c88cc619091b3a820655':
  REPORT-68915 数据列数据集显示丢失 && REPORT-68890 补充空白数据配置勾选后不出现数据倍数配置项
bugfix/11.0
Henry.Wang 3 years ago
parent
commit
65f65944e8
  1. 4
      designer-realize/src/main/java/com/fr/design/sort/header/HeaderAreaPane.java
  2. 1
      designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java

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

@ -208,7 +208,9 @@ public class HeaderAreaPane extends JPanel {
if (isNotSelectables(headerColumnRow)) { if (isNotSelectables(headerColumnRow)) {
SortHeader sortHeader = templateCellElement.getCellExpandAttr().getCellSortAttr().getSortHeader(); SortHeader sortHeader = templateCellElement.getCellExpandAttr().getCellSortAttr().getSortHeader();
headerColumnRow = ColumnRow.ERROR; headerColumnRow = ColumnRow.ERROR;
sortHeader.setHeaderArea(headerColumnRow.toString()); if (sortHeader != null) {
sortHeader.setHeaderArea(headerColumnRow.toString());
}
} else { } else {
handleDisableHeaderCell(templateCellElement); handleDisableHeaderCell(templateCellElement);
} }

1
designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java

@ -471,6 +471,7 @@ public class CellDSColumnEditor extends CellQuickEditor {
@Override @Override
public void attributeChange() { public void attributeChange() {
update(); update();
checkButtonEnabled();
fireTargetModified(); fireTargetModified();
} }
}; };

Loading…
Cancel
Save