Browse Source

Merge pull request #2886 in DESIGN/design from bugfix/10.0 to feature/10.0

* commit '5873107ec7499149d8ee5c61616daa0d194a6bb6':
  CHART-14142	钻取地图同名区域处理
research/11.0
superman 4 years ago
parent
commit
24112273c8
  1. 4
      designer-chart/src/main/java/com/fr/design/chartx/fields/diff/MapDataSetFieldsPane.java
  2. 2
      designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/table/VanMapTableDataContentPane.java

4
designer-chart/src/main/java/com/fr/design/chartx/fields/diff/MapDataSetFieldsPane.java

@ -18,11 +18,11 @@ import com.fr.plugin.chart.vanchart.VanChart;
import javax.swing.JFrame;
import javax.swing.JPanel;
import javax.swing.tree.DefaultMutableTreeNode;
import java.util.Set;
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.Set;
/**
* @author Bjorn
@ -64,7 +64,7 @@ public abstract class MapDataSetFieldsPane<T extends ColumnFieldCollectionWithSe
public void actionPerformed(ActionEvent e) {
VanChartMapPlot plot = chart.getPlot();
if (treeNodeAndItems == null) {
treeNodeAndItems = ChartGEOJSONHelper.getTreeNodeAndItems(plot.getGeoUrl(), level, plot.getMapType());
treeNodeAndItems = ChartGEOJSONHelper.getTreeNodeAndItems(plot.getGeoUrl(), level, plot.getMapType(), true);
}
final MapAreaMatchPane pane = new MapAreaMatchPane(treeNodeAndItems);

2
designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/table/VanMapTableDataContentPane.java

@ -71,7 +71,7 @@ public abstract class VanMapTableDataContentPane extends AbstractTableDataConten
@Override
public void actionPerformed(ActionEvent e) {
if (treeNodeAndItems == null) {
treeNodeAndItems = ChartGEOJSONHelper.getTreeNodeAndItems(plot.getGeoUrl(), level, plot.getMapType());
treeNodeAndItems = ChartGEOJSONHelper.getTreeNodeAndItems(plot.getGeoUrl(), level, plot.getMapType(), true);
}
final MapAreaMatchPane pane = new MapAreaMatchPane(treeNodeAndItems);

Loading…
Cancel
Save