Browse Source

Merge pull request #551 in DESIGN/design from ~ZHENG/c-design:release/10.0 to release/10.0

* commit '90bd695b0d14afe31dfb79e4d25a50e6dd7e63c6':
  CHART-2982 gis轮播图 修改typepane update时候会替换默认chart
final/10.0
zheng 6 years ago
parent
commit
db164d3b9f
  1. 3
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypePane.java

3
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypePane.java

@ -152,8 +152,9 @@ public class ChartTypePane extends AbstractChartAttrPane{
try{ try{
Chart newDefaultChart = (Chart)((AbstractChartTypePane)getSelectedPane()).getDefaultChart().clone(); Chart newDefaultChart = (Chart)((AbstractChartTypePane)getSelectedPane()).getDefaultChart().clone();
if(!chart.accept(newDefaultChart.getClass())){ if (!ComparatorUtils.equals(chart.getClass(), newDefaultChart.getClass())) {
//vanChart 和 chart 之间切换 //vanChart 和 chart 之间切换
//不同chart之间切换
editingCollection.removeNameObject(editingCollection.getSelectedIndex()); editingCollection.removeNameObject(editingCollection.getSelectedIndex());
editingCollection.addChart(newDefaultChart); editingCollection.addChart(newDefaultChart);
chart = newDefaultChart; chart = newDefaultChart;

Loading…
Cancel
Save