Skip to content

Commit 2ff72e6

Browse files
luoxiao-supermapluoxiao-supermap
committed
[fix]leaflet mapboxgl maplibregl升级echarts@5 review by qiw
1 parent c5981b4 commit 2ff72e6

26 files changed

+44
-127
lines changed

‎dist/leaflet/include-leaflet.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
inputScript(libsurl + '/turf/6.5.0/turf.min.js');
9595
}
9696
if (inArray(includes, 'echarts')) {
97-
inputScript(libsurl + '/echarts/4.9.0/echarts.min.js');
97+
inputScript(libsurl + '/echarts/5.4.3/echarts.min.js');
9898
}
9999
if (inArray(includes, 'elasticsearch')) {
100100
inputScript(libsurl + '/elasticsearch/16.7.3/elasticsearch.min.js');

‎dist/mapboxgl/include-mapboxgl.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,7 @@
8484
inputScript(libsurl + '/mapv/2.0.62/mapv.min.js');
8585
}
8686
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');
8988
inputScript(libsurl + '/echartsLayer/EchartsLayer.min.js');
9089
}
9190
if (inArray(includes, 'echarts-vue')) {
@@ -159,7 +158,7 @@
159158
inputScript(libsurl + '/three/0.129.0/examples/js/loaders/GLTFLoader.js');
160159
}
161160
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');
163162
}
164163
if (inArray(includes, 'mapbox-print-pdf')) {
165164
inputScript(libsurl + '/mapbox-print-pdf/0.4.4/mapbox-print-pdf.min.js');

‎dist/maplibregl/include-maplibregl.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,7 @@
7676
inputScript(libsurl + '/mapv/2.0.62/mapv.min.js');
7777
}
7878
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');
8180
inputScript(libsurl + '/maplibre-echartsLayer/EchartsLayer.min.js');
8281
}
8382
if (inArray(includes, 'echarts-vue')) {
@@ -151,7 +150,7 @@
151150
inputScript(libsurl + '/three/0.129.0/examples/js/loaders/GLTFLoader.js');
152151
}
153152
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');
155154
}
156155
if (inArray(includes, 'mapbox-print-pdf')) {
157156
inputScript(libsurl + '/mapbox-print-pdf/0.4.4/mapbox-print-pdf.min.js');

‎examples/component/components_basic_vue.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<meta charset="UTF-8">
1616
<title data-i18n='resources.title_componentsBasic_Vue'></title>
1717
<script type="text/javascript" include="vue" src="../js/include-web.js"></script>
18-
<script include="echarts,iclient-mapboxgl-vue,mapbox-gl-enhance" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
18+
<script include="echarts-vue,iclient-mapboxgl-vue,mapbox-gl-enhance" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
1919
<style>
2020
body {
2121
margin: 0;

‎examples/component/components_chart.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<meta charset="UTF-8">
1313
<title data-i18n='resources.title_chart'></title>
1414
<script type="text/javascript" include="bootstrap" src="../js/include-web.js"></script>
15-
<script type="text/javascript" include="iclient-leaflet-css,echarts" src="../../dist/leaflet/include-leaflet.js"></script>
15+
<script type="text/javascript" include="iclient-leaflet-css,echarts-vue" src="../../dist/leaflet/include-leaflet.js"></script>
1616

1717
<style>
1818
.chart-setting {

‎examples/component/components_echarts_react.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<meta charset="UTF-8" />
1515
<title data-i18n="resources.title_componentsEcharts_React"></title>
1616
<script type="text/javascript" include="react,jquery" src="../js/include-web.js"></script>
17-
<script include="antd,iclient-mapboxgl-react,mapbox-gl-enhance,echarts" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
17+
<script include="antd,iclient-mapboxgl-react,mapbox-gl-enhance,echarts-vue" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
1818
<style>
1919
html,
2020
body {

‎examples/component/components_echarts_vue.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<title data-i18n="resources.title_componentsEcharts_Vue"></title>
1616
<script type="text/javascript" include="vue,jquery" src="../js/include-web.js"></script>
1717
<script
18-
include="iclient-mapboxgl-vue,mapbox-gl-enhance,echarts"
18+
include="iclient-mapboxgl-vue,mapbox-gl-enhance,echarts-vue"
1919
src="../../dist/mapboxgl/include-mapboxgl.js"
2020
></script>
2121
<style>

‎examples/component/components_pie_chart_vue.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
<meta charset="UTF-8" />
1515
<title data-i18n="resources.title_componentsChart_Vue(pie)"></title>
1616
<script type="text/javascript" include="vue" src="../js/include-web.js"></script>
17-
<!-- <script include="echarts" src="../../dist/mapboxgl/include-mapboxgl.js"></script> -->
1817
<script include="echarts-vue,iclient-mapboxgl-vue,mapbox-gl-enhance" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
1918
<style>
2019
#main {

‎examples/mapboxgl/echartsAnimatorCar.html

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,13 +89,9 @@
8989
GLMap: {
9090
roam: true
9191
},
92-
coordinateSystem: 'GLMap',
93-
geo: {
94-
map: 'GLMap',
95-
},
96-
9792
series: [{
9893
type: 'lines',
94+
coordinateSystem: 'GLMap',
9995
polyline: true,
10096
data: lines,
10197
silent: true,

‎examples/mapboxgl/echartsGL_GlobalWind.html

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,6 @@
8989
GLMap: {
9090
roam: true,
9191
},
92-
geo: {
93-
map: "GLMap"
94-
},
9592
visualMap: {
9693
left: 'right',
9794
min: minMag,

‎examples/mapboxgl/echarts_ChangchunPublicTransportNetwork.html

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,10 @@
7070
GLMap: {
7171
roam: true
7272
},
73-
coordinateSystem: 'GLMap',
74-
geo: {
75-
map: 'GLMap',
76-
},
7773

7874
series: [{
7975
type: 'lines',
76+
coordinateSystem: 'GLMap',
8077
polyline: true,
8178
data: data,
8279
silent: true,

‎examples/mapboxgl/echarts_cellMap.html

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,6 @@
6969
GLMap: {
7070
roam: true,
7171
},
72-
geo: {
73-
geoIndex: 0
74-
},
7572
series: [{
7673
type: 'custom',
7774
coordinateSystem: 'GLMap',

‎examples/mapboxgl/echarts_geoline.html

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -497,24 +497,6 @@
497497
},
498498
selectedMode: 'single'
499499
},
500-
geo: {
501-
map: 'GLMap',
502-
label: {
503-
emphasis: {
504-
show: false
505-
}
506-
},
507-
roam: true,
508-
itemStyle: {
509-
normal: {
510-
areaColor: '#323c48',
511-
borderColor: '#404a59'
512-
},
513-
emphasis: {
514-
areaColor: '#2a333d'
515-
}
516-
}
517-
},
518500
series: series
519501
};
520502

‎examples/mapboxgl/echarts_scatterWeibo.html

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@
8282
}
8383
return res;
8484
});
85-
8685
var echartslayer = new EchartsLayer(map);
8786
echartslayer.chart.setOption(option = {
8887

@@ -109,25 +108,6 @@
109108
color: '#ccc'
110109
}
111110
},
112-
geo: {
113-
name: resources.text_strong,
114-
type: 'scatter',
115-
map: 'GLMap',
116-
label: {
117-
emphasis: {
118-
show: false
119-
}
120-
},
121-
itemStyle: {
122-
normal: {
123-
areaColor: '#323c48',
124-
borderColor: '#111'
125-
},
126-
emphasis: {
127-
areaColor: '#2a333d'
128-
}
129-
}
130-
},
131111
series: [{
132112
name: resources.text_weak,
133113
type: 'scatter',

‎examples/maplibregl/echartsAnimatorCar.html

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,13 +89,9 @@
8989
GLMap: {
9090
roam: true
9191
},
92-
coordinateSystem: 'GLMap',
93-
geo: {
94-
map: 'GLMap',
95-
},
96-
9792
series: [{
9893
type: 'lines',
94+
coordinateSystem: 'GLMap',
9995
polyline: true,
10096
data: lines,
10197
silent: true,

‎examples/maplibregl/echartsGL_GlobalWind.html

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,6 @@
8989
GLMap: {
9090
roam: true,
9191
},
92-
geo: {
93-
map: "GLMap"
94-
},
9592
visualMap: {
9693
left: 'right',
9794
min: minMag,

‎examples/maplibregl/echarts_ChangchunPublicTransportNetwork.html

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,9 @@
7070
GLMap: {
7171
roam: true
7272
},
73-
coordinateSystem: 'GLMap',
74-
geo: {
75-
map: 'GLMap',
76-
},
77-
7873
series: [{
7974
type: 'lines',
75+
coordinateSystem: 'GLMap',
8076
polyline: true,
8177
data: data,
8278
silent: true,

‎examples/maplibregl/echarts_cellMap.html

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,6 @@
6969
GLMap: {
7070
roam: true,
7171
},
72-
geo: {
73-
geoIndex: 0
74-
},
7572
series: [{
7673
type: 'custom',
7774
coordinateSystem: 'GLMap',

‎examples/maplibregl/echarts_geoline.html

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -497,24 +497,6 @@
497497
},
498498
selectedMode: 'single'
499499
},
500-
geo: {
501-
map: 'GLMap',
502-
label: {
503-
emphasis: {
504-
show: false
505-
}
506-
},
507-
roam: true,
508-
itemStyle: {
509-
normal: {
510-
areaColor: '#323c48',
511-
borderColor: '#404a59'
512-
},
513-
emphasis: {
514-
areaColor: '#2a333d'
515-
}
516-
}
517-
},
518500
series: series
519501
};
520502

‎examples/maplibregl/echarts_scatterWeibo.html

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,9 @@
8585

8686
var echartslayer = new EchartsLayer(map);
8787
echartslayer.chart.setOption(option = {
88-
8988
GLMap: {
9089
roam: true
9190
},
92-
coordinateSystem: 'GLMap',
9391
title: {
9492
text: resources.text_weiboChina,
9593
subtext: 'From ThinkGIS',
@@ -109,25 +107,6 @@
109107
color: '#ccc'
110108
}
111109
},
112-
geo: {
113-
name: resources.text_strong,
114-
type: 'scatter',
115-
map: 'GLMap',
116-
label: {
117-
emphasis: {
118-
show: false
119-
}
120-
},
121-
itemStyle: {
122-
normal: {
123-
areaColor: '#323c48',
124-
borderColor: '#111'
125-
},
126-
emphasis: {
127-
areaColor: '#2a333d'
128-
}
129-
}
130-
},
131110
series: [{
132111
name: resources.text_weak,
133112
type: 'scatter',

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
"@turf/turf": "6.5.0",
138138
"canvg": "3.0.10",
139139
"core-js": "^3.30.2",
140-
"echarts": "4.9.0",
140+
"echarts": "5.4.3",
141141
"fetch-ie8": "1.5.0",
142142
"fetch-jsonp": "1.1.3",
143143
"flatgeobuf": "3.23.1",

‎src/common/components/chart/ChartView.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* Copyright© 2000 - 2023 SuperMap Software Co.Ltd. All rights reserved.
22
* This program are made available under the terms of the Apache License, Version 2.0
33
* which accompanies this distribution and is available at http://www.apache.org/licenses/LICENSE-2.0.html.*/
4-
import echarts from "echarts";
4+
import * as echarts from "echarts";
55
import {
66
ChartViewModel
77
} from "./ChartViewModel";

‎src/common/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"dependencies": {
1717
"@antv/g6": "^4.8.14",
1818
"@elastic/elasticsearch": "^5.6.22",
19-
"echarts": "4.9.0",
19+
"echarts": "5.4.3",
2020
"fetch-ie8": "1.5.0",
2121
"fetch-jsonp": "1.1.3",
2222
"promise-polyfill": "8.2.3",

‎src/leaflet/overlay/EChartsLayer.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* which accompanies this distribution and is available at http://www.apache.org/licenses/LICENSE-2.0.html.*/
44
import L from "leaflet";
55
import '../core/Base';
6-
import echarts from "echarts";
6+
import * as echarts from "echarts";
77
import Attributions from '../core/Attributions'
88

99
/**
@@ -329,7 +329,7 @@ LeafletMapCoordSys.create = function (ecModel) {
329329
leafletMapModel.coordinateSystem.setMapOffset(leafletMapModel.__mapOffset || _getMapOffset(leafletMap));
330330
});
331331
ecModel.eachSeries(function (seriesModel) {
332-
if (!seriesModel.get('coordinateSystem') || seriesModel.get('coordinateSystem') === 'leaflet') {
332+
if (seriesModel.get('coordinateSystem') === 'leaflet') {
333333
if (!coordSys) {
334334
coordSys = new LeafletMapCoordSys(leafletMap);
335335
}

‎src/leaflet/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"license": "Apache-2.0",
1717
"dependencies": {
1818
"@turf/turf": "6.5.0",
19-
"echarts":"4.9.0",
19+
"echarts":"5.4.3",
2020
"mapv":"2.0.62",
2121
"leaflet": "1.9.4",
2222
"@supermap/iclient-common": "11.1.1-dev",

0 commit comments

Comments
 (0)