Browse Source

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

* commit 'c9cb2e9aea5ad4413821c4909db88e3e45f40fe4':
  CHART-2982 gis轮播图 修改typepane update时候会替换默认chart
master
zheng 6 years ago
parent
commit
9c5d365182
  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