Browse Source

Pull request #1644: CHART-13786 解决共用静态变量导致的自动标记点显示问题

Merge in DESIGN/design from ~QINGHUI.LIU/design:release/10.0 to release/10.0

* commit '6038ec9c87a4d6f87b17f74cc81852ec079ee194':
  CHART-13786 解决共用静态变量导致的自动标记点显示问题
feature/big-screen
Qinghui.Liu 5 years ago
parent
commit
c68b774228
  1. 11
      designer-chart/src/main/java/com/fr/van/chart/designer/component/marker/VanChartCommonMarkerPane.java

11
designer-chart/src/main/java/com/fr/van/chart/designer/component/marker/VanChartCommonMarkerPane.java

@ -53,18 +53,19 @@ public class VanChartCommonMarkerPane extends BasicBeanPane<VanChartAttrMarker>
return normalMarkers;
}
private static Marker[] normalMarkersWithAuto = null;
protected static Marker[] getNormalMarkersWithAuto() {
if (normalMarkers == null) {
normalMarkers = new Marker[NORMAL_TYPES.length + 1];
normalMarkers[0] = Marker.createMarker(MarkerType.MARKER_AUTO);
if (normalMarkersWithAuto == null) {
normalMarkersWithAuto = new Marker[NORMAL_TYPES.length + 1];
normalMarkersWithAuto[0] = Marker.createMarker(MarkerType.MARKER_AUTO);
int i = 1;
for (MarkerType markerType : NORMAL_TYPES) {
normalMarkers[i++] = Marker.createMarker(markerType);
normalMarkersWithAuto[i++] = Marker.createMarker(markerType);
}
}
return normalMarkers;
return normalMarkersWithAuto;
}
//没有无这个选项

Loading…
Cancel
Save