[fix]leaflet mapboxgl maplibregl升级echarts@5 review by qiw

luoxiao-supermap · luoxiao-supermap · commit 2ff72e61775d · 2023-07-20T15:50:56.000+08:00
diff --git a/dist/leaflet/include-leaflet.js b/dist/leaflet/include-leaflet.js
@@ -94,7 +94,7 @@
             inputScript(libsurl + '/turf/6.5.0/turf.min.js');
         }
         if (inArray(includes, 'echarts')) {
-            inputScript(libsurl + '/echarts/4.9.0/echarts.min.js');
+          inputScript(libsurl + '/echarts/5.4.3/echarts.min.js');
         }
         if (inArray(includes, 'elasticsearch')) {
             inputScript(libsurl + '/elasticsearch/16.7.3/elasticsearch.min.js');
diff --git a/dist/mapboxgl/include-mapboxgl.js b/dist/mapboxgl/include-mapboxgl.js
@@ -84,8 +84,7 @@
       inputScript(libsurl + '/mapv/2.0.62/mapv.min.js');
     }
     if (inArray(includes, 'echarts')) {
-      inputScript(libsurl + '/echarts/4.9.0/echarts.min.js');
-      inputScript(libsurl + '/echarts-liquidfill/2.0.6/echarts-liquidfill.min.js');
+      inputScript(libsurl + '/echarts/5.4.3/echarts.min.js');
       inputScript(libsurl + '/echartsLayer/EchartsLayer.min.js');
     }
     if (inArray(includes, 'echarts-vue')) {
@@ -159,7 +158,7 @@
       inputScript(libsurl + '/three/0.129.0/examples/js/loaders/GLTFLoader.js');
     }
     if (inArray(includes, 'echarts-gl')) {
-      inputScript(libsurl + '/echarts-gl/1.1.2-fix/echarts-gl.min.js');
+      inputScript(libsurl + '/echarts-gl/2.0.8/echarts-gl.min.js');
     }
     if (inArray(includes, 'mapbox-print-pdf')) {
       inputScript(libsurl + '/mapbox-print-pdf/0.4.4/mapbox-print-pdf.min.js');
diff --git a/dist/maplibregl/include-maplibregl.js b/dist/maplibregl/include-maplibregl.js
@@ -76,8 +76,7 @@
       inputScript(libsurl + '/mapv/2.0.62/mapv.min.js');
     }
     if (inArray(includes, 'echarts')) {
-      inputScript(libsurl + '/echarts/4.9.0/echarts.min.js');
-      inputScript(libsurl + '/echarts-liquidfill/2.0.6/echarts-liquidfill.min.js');
+      inputScript(libsurl + '/echarts/5.4.3/echarts.min.js');
       inputScript(libsurl + '/maplibre-echartsLayer/EchartsLayer.min.js');
     }
     if (inArray(includes, 'echarts-vue')) {
@@ -151,7 +150,7 @@
       inputScript(libsurl + '/three/0.129.0/examples/js/loaders/GLTFLoader.js');
     }
     if (inArray(includes, 'echarts-gl')) {
-      inputScript(libsurl + '/echarts-gl/1.1.2-fix/echarts-gl.min.js');
+      inputScript(libsurl + '/echarts-gl/2.0.8/echarts-gl.min.js');
     }
     if (inArray(includes, 'mapbox-print-pdf')) {
       inputScript(libsurl + '/mapbox-print-pdf/0.4.4/mapbox-print-pdf.min.js');
diff --git a/examples/component/components_basic_vue.html b/examples/component/components_basic_vue.html
@@ -15,7 +15,7 @@
   <meta charset="UTF-8">
   <title data-i18n='resources.title_componentsBasic_Vue'></title>
   <script type="text/javascript" include="vue" src="../js/include-web.js"></script>
-  <script include="echarts,iclient-mapboxgl-vue,mapbox-gl-enhance" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
+  <script include="echarts-vue,iclient-mapboxgl-vue,mapbox-gl-enhance" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
   <style>
     body {
       margin: 0;
diff --git a/examples/component/components_chart.html b/examples/component/components_chart.html
@@ -12,7 +12,7 @@
     <meta charset="UTF-8">
     <title data-i18n='resources.title_chart'></title>
     <script type="text/javascript" include="bootstrap" src="../js/include-web.js"></script>
-    <script type="text/javascript" include="iclient-leaflet-css,echarts" src="../../dist/leaflet/include-leaflet.js"></script>
+    <script type="text/javascript" include="iclient-leaflet-css,echarts-vue" src="../../dist/leaflet/include-leaflet.js"></script>
 
     <style>
         .chart-setting {
diff --git a/examples/component/components_echarts_react.html b/examples/component/components_echarts_react.html
@@ -14,7 +14,7 @@
     <meta charset="UTF-8" />
     <title data-i18n="resources.title_componentsEcharts_React"></title>
     <script type="text/javascript" include="react,jquery" src="../js/include-web.js"></script>
-    <script include="antd,iclient-mapboxgl-react,mapbox-gl-enhance,echarts" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
+    <script include="antd,iclient-mapboxgl-react,mapbox-gl-enhance,echarts-vue" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
     <style>
       html,
       body {
diff --git a/examples/component/components_echarts_vue.html b/examples/component/components_echarts_vue.html
@@ -15,7 +15,7 @@
         <title data-i18n="resources.title_componentsEcharts_Vue"></title>
         <script type="text/javascript" include="vue,jquery" src="../js/include-web.js"></script>
         <script
-            include="iclient-mapboxgl-vue,mapbox-gl-enhance,echarts"
+            include="iclient-mapboxgl-vue,mapbox-gl-enhance,echarts-vue"
             src="../../dist/mapboxgl/include-mapboxgl.js"
         ></script>
         <style>
diff --git a/examples/component/components_pie_chart_vue.html b/examples/component/components_pie_chart_vue.html
@@ -14,7 +14,6 @@
         <meta charset="UTF-8" />
         <title data-i18n="resources.title_componentsChart_Vue(pie)"></title>
         <script type="text/javascript" include="vue" src="../js/include-web.js"></script>
-        <!-- <script include="echarts" src="../../dist/mapboxgl/include-mapboxgl.js"></script> -->
         <script include="echarts-vue,iclient-mapboxgl-vue,mapbox-gl-enhance" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
         <style>
             #main {
diff --git a/examples/mapboxgl/echartsAnimatorCar.html b/examples/mapboxgl/echartsAnimatorCar.html
@@ -89,13 +89,9 @@
             GLMap: {
                 roam: true
             },
-            coordinateSystem: 'GLMap',
-            geo: {
-                map: 'GLMap',
-            },
-
             series: [{
                 type: 'lines',
+                coordinateSystem: 'GLMap',
                 polyline: true,
                 data: lines,
                 silent: true,
diff --git a/examples/mapboxgl/echartsGL_GlobalWind.html b/examples/mapboxgl/echartsGL_GlobalWind.html
@@ -89,9 +89,6 @@
                     GLMap: {
                         roam: true,
                     },
-                    geo: {
-                        map: "GLMap"
-                    },
                     visualMap: {
                         left: 'right',
                         min: minMag,
diff --git a/examples/mapboxgl/echarts_ChangchunPublicTransportNetwork.html b/examples/mapboxgl/echarts_ChangchunPublicTransportNetwork.html
@@ -70,13 +70,10 @@
             GLMap: {
                 roam: true
             },
-            coordinateSystem: 'GLMap',
-            geo: {
-                map: 'GLMap',
-            },
 
             series: [{
                 type: 'lines',
+                coordinateSystem: 'GLMap',
                 polyline: true,
                 data: data,
                 silent: true,
diff --git a/examples/mapboxgl/echarts_cellMap.html b/examples/mapboxgl/echarts_cellMap.html
@@ -69,9 +69,6 @@
         GLMap: {
             roam: true,
         },
-        geo: {
-            geoIndex: 0
-        },
         series: [{
             type: 'custom',
             coordinateSystem: 'GLMap',
diff --git a/examples/mapboxgl/echarts_geoline.html b/examples/mapboxgl/echarts_geoline.html
@@ -497,24 +497,6 @@
             },
             selectedMode: 'single'
         },
-        geo: {
-            map: 'GLMap',
-            label: {
-                emphasis: {
-                    show: false
-                }
-            },
-            roam: true,
-            itemStyle: {
-                normal: {
-                    areaColor: '#323c48',
-                    borderColor: '#404a59'
-                },
-                emphasis: {
-                    areaColor: '#2a333d'
-                }
-            }
-        },
         series: series
     };
 
diff --git a/examples/mapboxgl/echarts_scatterWeibo.html b/examples/mapboxgl/echarts_scatterWeibo.html
@@ -82,7 +82,6 @@
             }
             return res;
         });
-
         var echartslayer = new EchartsLayer(map);
         echartslayer.chart.setOption(option = {
 
@@ -109,25 +108,6 @@
                     color: '#ccc'
                 }
             },
-            geo: {
-                name: resources.text_strong,
-                type: 'scatter',
-                map: 'GLMap',
-                label: {
-                    emphasis: {
-                        show: false
-                    }
-                },
-                itemStyle: {
-                    normal: {
-                        areaColor: '#323c48',
-                        borderColor: '#111'
-                    },
-                    emphasis: {
-                        areaColor: '#2a333d'
-                    }
-                }
-            },
             series: [{
                 name: resources.text_weak,
                 type: 'scatter',
diff --git a/examples/maplibregl/echartsAnimatorCar.html b/examples/maplibregl/echartsAnimatorCar.html
@@ -89,13 +89,9 @@
             GLMap: {
                 roam: true
             },
-            coordinateSystem: 'GLMap',
-            geo: {
-                map: 'GLMap',
-            },
-
             series: [{
                 type: 'lines',
+                coordinateSystem: 'GLMap',
                 polyline: true,
                 data: lines,
                 silent: true,
diff --git a/examples/maplibregl/echartsGL_GlobalWind.html b/examples/maplibregl/echartsGL_GlobalWind.html
@@ -89,9 +89,6 @@
                     GLMap: {
                         roam: true,
                     },
-                    geo: {
-                        map: "GLMap"
-                    },
                     visualMap: {
                         left: 'right',
                         min: minMag,
diff --git a/examples/maplibregl/echarts_ChangchunPublicTransportNetwork.html b/examples/maplibregl/echarts_ChangchunPublicTransportNetwork.html
@@ -70,13 +70,9 @@
             GLMap: {
                 roam: true
             },
-            coordinateSystem: 'GLMap',
-            geo: {
-                map: 'GLMap',
-            },
-
             series: [{
                 type: 'lines',
+                coordinateSystem: 'GLMap',
                 polyline: true,
                 data: data,
                 silent: true,
diff --git a/examples/maplibregl/echarts_cellMap.html b/examples/maplibregl/echarts_cellMap.html
@@ -69,9 +69,6 @@
         GLMap: {
             roam: true,
         },
-        geo: {
-            geoIndex: 0
-        },
         series: [{
             type: 'custom',
             coordinateSystem: 'GLMap',
diff --git a/examples/maplibregl/echarts_geoline.html b/examples/maplibregl/echarts_geoline.html
@@ -497,24 +497,6 @@
             },
             selectedMode: 'single'
         },
-        geo: {
-            map: 'GLMap',
-            label: {
-                emphasis: {
-                    show: false
-                }
-            },
-            roam: true,
-            itemStyle: {
-                normal: {
-                    areaColor: '#323c48',
-                    borderColor: '#404a59'
-                },
-                emphasis: {
-                    areaColor: '#2a333d'
-                }
-            }
-        },
         series: series
     };
 
diff --git a/examples/maplibregl/echarts_scatterWeibo.html b/examples/maplibregl/echarts_scatterWeibo.html
@@ -85,11 +85,9 @@
 
         var echartslayer = new EchartsLayer(map);
         echartslayer.chart.setOption(option = {
-
             GLMap: {
                 roam: true
             },
-            coordinateSystem: 'GLMap',
             title: {
                 text: resources.text_weiboChina,
                 subtext: 'From ThinkGIS',
@@ -109,25 +107,6 @@
                     color: '#ccc'
                 }
             },
-            geo: {
-                name: resources.text_strong,
-                type: 'scatter',
-                map: 'GLMap',
-                label: {
-                    emphasis: {
-                        show: false
-                    }
-                },
-                itemStyle: {
-                    normal: {
-                        areaColor: '#323c48',
-                        borderColor: '#111'
-                    },
-                    emphasis: {
-                        areaColor: '#2a333d'
-                    }
-                }
-            },
             series: [{
                 name: resources.text_weak,
                 type: 'scatter',
diff --git a/package.json b/package.json
@@ -137,7 +137,7 @@
     "@turf/turf": "6.5.0",
     "canvg": "3.0.10",
     "core-js": "^3.30.2",
-    "echarts": "4.9.0",
+    "echarts": "5.4.3",
     "fetch-ie8": "1.5.0",
     "fetch-jsonp": "1.1.3",
     "flatgeobuf": "3.23.1",
diff --git a/src/common/components/chart/ChartView.js b/src/common/components/chart/ChartView.js
@@ -1,7 +1,7 @@
 /* Copyright© 2000 - 2023 SuperMap Software Co.Ltd. All rights reserved.
  * This program are made available under the terms of the Apache License, Version 2.0
  * which accompanies this distribution and is available at http://www.apache.org/licenses/LICENSE-2.0.html.*/
-import echarts from "echarts";
+import * as echarts from "echarts";
 import {
     ChartViewModel
 } from "./ChartViewModel";
diff --git a/src/common/package.json b/src/common/package.json
@@ -16,7 +16,7 @@
   "dependencies": {
     "@antv/g6": "^4.8.14",
     "@elastic/elasticsearch": "^5.6.22",
-    "echarts": "4.9.0",
+    "echarts": "5.4.3",
     "fetch-ie8": "1.5.0",
     "fetch-jsonp": "1.1.3",
     "promise-polyfill": "8.2.3",
diff --git a/src/leaflet/overlay/EChartsLayer.js b/src/leaflet/overlay/EChartsLayer.js
@@ -3,7 +3,7 @@
  * which accompanies this distribution and is available at http://www.apache.org/licenses/LICENSE-2.0.html.*/
 import L from "leaflet";
 import '../core/Base';
-import echarts from "echarts";
+import * as echarts from "echarts";
 import Attributions from '../core/Attributions'
 
 /**
@@ -329,7 +329,7 @@ LeafletMapCoordSys.create = function (ecModel) {
         leafletMapModel.coordinateSystem.setMapOffset(leafletMapModel.__mapOffset || _getMapOffset(leafletMap));
     });
     ecModel.eachSeries(function (seriesModel) {
-        if (!seriesModel.get('coordinateSystem') || seriesModel.get('coordinateSystem') === 'leaflet') {
+        if (seriesModel.get('coordinateSystem') === 'leaflet') {
             if (!coordSys) {
                 coordSys = new LeafletMapCoordSys(leafletMap);
             }
diff --git a/src/leaflet/package.json b/src/leaflet/package.json
@@ -16,7 +16,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@turf/turf": "6.5.0",
-    "echarts":"4.9.0",
+    "echarts":"5.4.3",
     "mapv":"2.0.62",
     "leaflet": "1.9.4",
     "@supermap/iclient-common": "11.1.1-dev",
diff --git a/test/leaflet/overlay/EchartsLayerSpec.js b/test/leaflet/overlay/EchartsLayerSpec.js

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@`
`94`	`94`	`inputScript(libsurl + '/turf/6.5.0/turf.min.js');`
`95`	`95`	`}`
`96`	`96`	`if (inArray(includes, 'echarts')) {`
`97`		`- inputScript(libsurl + '/echarts/4.9.0/echarts.min.js');`
	`97`	`+ inputScript(libsurl + '/echarts/5.4.3/echarts.min.js');`
`98`	`98`	`}`
`99`	`99`	`if (inArray(includes, 'elasticsearch')) {`
`100`	`100`	`inputScript(libsurl + '/elasticsearch/16.7.3/elasticsearch.min.js');`
Original file line number	Diff line number	Diff line change
`@@ -84,8 +84,7 @@`
`84`	`84`	`inputScript(libsurl + '/mapv/2.0.62/mapv.min.js');`
`85`	`85`	`}`
`86`	`86`	`if (inArray(includes, 'echarts')) {`
`87`		`- inputScript(libsurl + '/echarts/4.9.0/echarts.min.js');`
`88`		`- inputScript(libsurl + '/echarts-liquidfill/2.0.6/echarts-liquidfill.min.js');`
	`87`	`+ inputScript(libsurl + '/echarts/5.4.3/echarts.min.js');`
`89`	`88`	`inputScript(libsurl + '/echartsLayer/EchartsLayer.min.js');`
`90`	`89`	`}`
`91`	`90`	`if (inArray(includes, 'echarts-vue')) {`
`@@ -159,7 +158,7 @@`
`159`	`158`	`inputScript(libsurl + '/three/0.129.0/examples/js/loaders/GLTFLoader.js');`
`160`	`159`	`}`
`161`	`160`	`if (inArray(includes, 'echarts-gl')) {`
`162`		`- inputScript(libsurl + '/echarts-gl/1.1.2-fix/echarts-gl.min.js');`
	`161`	`+ inputScript(libsurl + '/echarts-gl/2.0.8/echarts-gl.min.js');`
`163`	`162`	`}`
`164`	`163`	`if (inArray(includes, 'mapbox-print-pdf')) {`
`165`	`164`	`inputScript(libsurl + '/mapbox-print-pdf/0.4.4/mapbox-print-pdf.min.js');`
Original file line number	Diff line number	Diff line change
`@@ -76,8 +76,7 @@`
`76`	`76`	`inputScript(libsurl + '/mapv/2.0.62/mapv.min.js');`
`77`	`77`	`}`
`78`	`78`	`if (inArray(includes, 'echarts')) {`
`79`		`- inputScript(libsurl + '/echarts/4.9.0/echarts.min.js');`
`80`		`- inputScript(libsurl + '/echarts-liquidfill/2.0.6/echarts-liquidfill.min.js');`
	`79`	`+ inputScript(libsurl + '/echarts/5.4.3/echarts.min.js');`
`81`	`80`	`inputScript(libsurl + '/maplibre-echartsLayer/EchartsLayer.min.js');`
`82`	`81`	`}`
`83`	`82`	`if (inArray(includes, 'echarts-vue')) {`
`@@ -151,7 +150,7 @@`
`151`	`150`	`inputScript(libsurl + '/three/0.129.0/examples/js/loaders/GLTFLoader.js');`
`152`	`151`	`}`
`153`	`152`	`if (inArray(includes, 'echarts-gl')) {`
`154`		`- inputScript(libsurl + '/echarts-gl/1.1.2-fix/echarts-gl.min.js');`
	`153`	`+ inputScript(libsurl + '/echarts-gl/2.0.8/echarts-gl.min.js');`
`155`	`154`	`}`
`156`	`155`	`if (inArray(includes, 'mapbox-print-pdf')) {`
`157`	`156`	`inputScript(libsurl + '/mapbox-print-pdf/0.4.4/mapbox-print-pdf.min.js');`