Browse Source

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

* commit '4e6da5c2a3ebd75130d3d2b865e3e5f86c815b1a':
  CHART-9783 地图相关操作慢
bugfix/10.0
zheng 5 years ago
parent
commit
378ba587b3
  1. 5
      designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/data/comp/MapDataTree.java

5
designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/data/comp/MapDataTree.java

@ -97,7 +97,8 @@ public class MapDataTree extends JTree {
} }
String dirPath = el.getUserObject().toString(); String dirPath = el.getUserObject().toString();
String url = CompatibleGEOJSONHelper.getJsonUrlByPathIncludeParam(dirPath); String url = CompatibleGEOJSONHelper.getJsonUrlByPathIncludeParam(dirPath);
if (GEOJSONTreeHelper.isValidDirPath(dirPath) && ComparatorUtils.equals(jsonUrl, url)) { //先equals再valid原因:valid 远程下实时去服务器看有没有json文件
if (ComparatorUtils.equals(jsonUrl, url) && GEOJSONTreeHelper.isValidDirPath(dirPath)) {
selectTreeNode(el, m_model); selectTreeNode(el, m_model);
return el; return el;
} }
@ -150,7 +151,7 @@ public class MapDataTree extends JTree {
DefaultMutableTreeNode el = els.nextElement(); DefaultMutableTreeNode el = els.nextElement();
String path = el.getUserObject().toString(); String path = el.getUserObject().toString();
String fileName = ChartGEOJSONHelper.getPresentNameWithPath(path); String fileName = ChartGEOJSONHelper.getPresentNameWithPath(path);
if (GEOJSONTreeHelper.isValidDirPath(path) && StringUtils.contains(fileName, text)) { if (StringUtils.contains(fileName, text) && GEOJSONTreeHelper.isValidDirPath(path)) {
selectTreeNode(el, m_model); selectTreeNode(el, m_model);
return; return;
} }

Loading…
Cancel
Save