Browse Source

Merge pull request #1519 in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0

* commit '76aa8a08d36f5f07e9fe91941e9533b2c5e30064':
  CHART-13116 自定义匹配时把匹配数据转换为String
feature/big-screen
Bjorn 5 years ago
parent
commit
4a521d73bb
  1. 2
      designer-chart/src/main/java/com/fr/design/chartx/component/MapAreaMatchPane.java

2
designer-chart/src/main/java/com/fr/design/chartx/component/MapAreaMatchPane.java

@ -247,7 +247,7 @@ public class MapAreaMatchPane extends BasicBeanPane<MapMatchResult> {
HashSet<Object> columnData = new LinkedHashSet<>(); HashSet<Object> columnData = new LinkedHashSet<>();
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
Object valueAt = dataModel.getValueAt(i, colIndex); Object valueAt = dataModel.getValueAt(i, colIndex);
columnData.add(valueAt == null ? StringUtils.EMPTY : valueAt); columnData.add(GeneralUtils.objectToString(valueAt));
} }
return columnData.toArray(); return columnData.toArray();
} catch (TableDataException ignore) { } catch (TableDataException ignore) {

Loading…
Cancel
Save