Browse Source

Pull request #9249: REPORT-73811 图表条件属性汇总字段值,汇总方式下拉内容显示了两遍

Merge in DESIGN/design from ~PENGDA/design:release/11.0 to release/11.0

* commit '2476285d676850ea743544f2f5e5641e0105b987':
  REPORT-73811 图表条件属性汇总字段值,汇总方式下拉内容显示了两遍
release/11.0
pengda 2 years ago
parent
commit
1a93bda29d
  1. 6
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ColSelectedWithSummaryMethodEditor.java

6
designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ColSelectedWithSummaryMethodEditor.java

@ -46,8 +46,9 @@ public class ColSelectedWithSummaryMethodEditor extends Editor<DSColumnWithSumma
}
private static void refreshComboBoxModel(String[] columnNames) {
columnNameComboBoxModel.removeAllElements();
summaryMethodComboBoxModel.removeAllElements();
if (columnNames != null) {
columnNameComboBoxModel.removeAllElements();
for (String columnName : columnNames) {
columnNameComboBoxModel.addElement(columnName);
}
@ -56,9 +57,6 @@ public class ColSelectedWithSummaryMethodEditor extends Editor<DSColumnWithSumma
}
columnNameComboBoxModel.setSelectedItem(null);
summaryMethodComboBoxModel.setSelectedItem(null);
} else {
columnNameComboBoxModel.removeAllElements();
summaryMethodComboBoxModel.removeAllElements();
}
}

Loading…
Cancel
Save