Browse Source

Merge pull request #8428 in DESIGN/design from release/11.0 to feature/x

* commit 'e9023e3bd21226076aadc05af3ad631419c91b6c':
  REPORT-68915 数据列数据集显示丢失 && REPORT-68890 补充空白数据配置勾选后不出现数据倍数配置项
  REPORT-69009 mac新系统下getSelectedFiles方法返回为空
feature/x
superman 3 years ago
parent
commit
577e24102d
  1. 6
      designer-base/src/main/java/com/fr/design/gui/ifilechooser/SwingFileChooser.java
  2. 4
      designer-realize/src/main/java/com/fr/design/sort/header/HeaderAreaPane.java
  3. 1
      designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java

6
designer-base/src/main/java/com/fr/design/gui/ifilechooser/SwingFileChooser.java

@ -32,7 +32,11 @@ class SwingFileChooser implements FileChooserProvider {
@Override
public File[] getSelectedFiles() {
return fileChooser.getSelectedFiles();
if (ArrayUtils.isNotEmpty(fileChooser.getSelectedFiles())) {
return fileChooser.getSelectedFiles();
} else {
return new File[]{fileChooser.getSelectedFile()};
}
}
@Override

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)) {
SortHeader sortHeader = templateCellElement.getCellExpandAttr().getCellSortAttr().getSortHeader();
headerColumnRow = ColumnRow.ERROR;
sortHeader.setHeaderArea(headerColumnRow.toString());
if (sortHeader != null) {
sortHeader.setHeaderArea(headerColumnRow.toString());
}
} else {
handleDisableHeaderCell(templateCellElement);
}

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

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

Loading…
Cancel
Save