Pull request #3538: CHART-18182 模糊匹配方法移动到平台 & CHART-18190 点地图透明度控件

Merge in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0

* commit '9f56de62b6d9842a02b4488f1f2f35a138aa03f5':
  CHART-18182 模糊匹配方法移动到平台 & CHART-18190 点地图透明度控件

designer-chart/src/main/java/com/fr/design/chartx/component/MapAreaMatchPane.java

@@ -6,6 +6,7 @@ import com.fr.data.TableDataSource;
 import com.fr.data.TableDataSourceTailor;
 import com.fr.data.impl.EmbeddedTableData;
 import com.fr.data.impl.NameTableData;
+import com.fr.decision.webservice.v10.map.geojson.helper.GEOJSONHelper;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.data.DesignTableDataManager;
 import com.fr.design.data.datapane.TableDataComboBox;
@@ -21,7 +22,6 @@ import com.fr.general.GeneralUtils;
 import com.fr.general.data.DataModel;
 import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.chart.map.data.MapMatchResult;
-import com.fr.plugin.chart.map.server.ChartGEOJSONHelper;
 import com.fr.script.Calculator;
 import com.fr.stable.StringUtils;
 
@@ -246,7 +246,7 @@ public class MapAreaMatchPane extends BasicBeanPane<MapMatchResult> {
     private void populateMatchData(Object[] columnData) {
         Set<String> geoAreas = matchAreaTable.getItems();
 
-        Map<String, String> resultMap = ChartGEOJSONHelper.matchAreaList(columnData, geoAreas, matchResultTable.getCustomResult());
+        Map<String, String> resultMap = GEOJSONHelper.getInstance().matchAreaList(columnData, geoAreas, matchResultTable.getCustomResult());
 
         Object[][] data = new Object[resultMap.size()][2];
 

designer-chart/src/main/java/com/fr/design/chartx/component/MatchAreaTable.java

@@ -1,8 +1,8 @@
 package com.fr.design.chartx.component;
 
+import com.fr.decision.webservice.v10.map.geojson.helper.GEOJSONHelper;
 import com.fr.design.i18n.Toolkit;
 import com.fr.general.GeneralUtils;
-import com.fr.plugin.chart.map.server.ChartGEOJSONHelper;
 
 import javax.swing.AbstractCellEditor;
 import javax.swing.JTable;
@@ -88,7 +88,7 @@ public class MatchAreaTable extends JTable {
             return;
         }
         int index = areaNameIndex.get(areaName);
-        String result = ChartGEOJSONHelper.matchArea(GeneralUtils.objectToString(areaName), items);
+        String result = GEOJSONHelper.getInstance().matchArea(GeneralUtils.objectToString(areaName), items, new HashMap<>());
         getColumnModel().getColumn(1).getCellEditor().stopCellEditing();
         this.setValueAt(result, index, 1);
     }

designer-chart/src/main/java/com/fr/van/chart/map/VanChartMapSeriesPane.java

@@ -443,7 +443,7 @@ public class VanChartMapSeriesPane extends VanChartColorValueSeriesPane {
 
     //不透明度
     private JPanel createPointAlphaPane() {
-        pointAlphaPane = new UINumberDragPane(0, 100);
+        pointAlphaPane = new UINumberDragPaneWithPercent(0, 100);
         return TableLayout4VanChartHelper.createGapTableLayoutPane(Toolkit.i18nText("Fine-Design_Report_Alpha"), pointAlphaPane);
     }