Skip to content

Commit 2eee7c3

Browse files
luoxiao-supermapluoxiao-supermap
committed
【update】SP1插件升级 review by songym
1 parent bc185bd commit 2eee7c3

38 files changed

+24242
-4069
lines changed

‎dist/classic/include-classic.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@
5959
inputScript("https://iclient.supermap.io/web/libs/iclient8c/libs/SuperMap.Include.js");
6060
}
6161
if (inArray(includes, 'mapv')) {
62-
inputScript("https://mapv.baidu.com/build/mapv.min.js");
62+
inputScript("https://cdn.jsdelivr.net/npm/mapv@2.0.42/build/mapv.min.js");
6363
}
6464
if (inArray(includes, 'echarts')) {
65-
inputScript("https://cdn.bootcss.com/echarts/4.3.0-rc.2/echarts.min.js");
65+
inputScript('https://cdn.jsdelivr.net/npm/echarts@4.5.0/dist/echarts.min.js');
6666
}
6767
if (inArray(includes, 'nanoscroller')) {
6868
inputCSS("https://iclient.supermap.io/web/libs/iclient8c/examples/css/nanoscroller.css");

‎dist/leaflet/include-leaflet.js‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
var excludes = (targetScript.getAttribute('exclude') || "").split(",");
5454
// 在线
5555
if (!inArray(excludes, 'leaflet')) {
56-
inputCSS("https://cdn.bootcss.com/leaflet/1.5.1/leaflet.css");
57-
inputScript("https://cdn.bootcss.com/leaflet/1.5.1/leaflet.js");
56+
inputCSS('https://cdn.bootcss.com/leaflet/1.6.0/leaflet.css');
57+
inputScript('https://cdn.bootcss.com/leaflet/1.6.0/leaflet.js');
5858
}
5959
if (inArray(includes, 'leaflet.heat')) {
6060
inputScript("https://cdn.bootcss.com/leaflet.heat/0.2.0/leaflet-heat.js");
@@ -68,35 +68,35 @@
6868
inputCSS("https://cdn.bootcss.com/leaflet.draw/1.0.4/leaflet.draw.css");
6969
inputScript("https://cdn.bootcss.com/leaflet.draw/1.0.4/leaflet.draw.js");
7070
}
71-
if (inArray(includes, 'leaflet.pm')) {
72-
inputCSS("https://cdn.bootcss.com/leaflet.pm/2.2.0/leaflet.pm.css");
73-
inputScript("https://cdn.bootcss.com/leaflet.pm/2.2.0/leaflet.pm.min.js");
71+
if (inArray(includes, 'leaflet-geoman')) {
72+
inputCSS('https://unpkg.com/@geoman-io/leaflet-geoman-free@latest/dist/leaflet-geoman.css');
73+
inputScript('https://unpkg.com/@geoman-io/leaflet-geoman-free@2.3.0/dist/leaflet-geoman.min.js');
7474
}
7575
if (inArray(includes, 'leaflet.miniMap')) {
7676
inputCSS("https://cdn.bootcss.com/leaflet-minimap/3.6.1/Control.MiniMap.min.css");
7777
inputScript("https://cdn.bootcss.com/leaflet-minimap/3.6.1/Control.MiniMap.min.js");
7878
}
7979
if (inArray(includes, 'mapv')) {
80-
inputScript("https://mapv.baidu.com/build/mapv.min.js");
80+
inputScript("https://cdn.jsdelivr.net/npm/mapv@2.0.42/build/mapv.min.js");
8181
}
8282
if (inArray(includes, 'turf')) {
8383
inputScript("https://cdn.bootcss.com/Turf.js/5.1.6/turf.min.js");
8484
}
8585
if (inArray(includes, 'echarts')) {
86-
inputScript("https://cdn.bootcss.com/echarts/4.3.0-rc.2/echarts.min.js");
86+
inputScript('https://cdn.jsdelivr.net/npm/echarts@4.5.0/dist/echarts.min.js');
8787
}
8888
if (inArray(includes, 'elasticsearch')) {
89-
inputScript("https://cdn.bootcss.com/elasticsearch/16.3.0/elasticsearch.js");
89+
inputScript('https://cdn.bootcss.com/elasticsearch/16.5.0/elasticsearch.js');
9090
}
9191
if (inArray(includes, 'xlsx')) {
92-
inputScript("https://cdn.bootcss.com/xlsx/0.15.1/xlsx.core.min.js");
92+
inputScript('https://cdn.jsdelivr.net/npm/xlsx@0.15.4/dist/xlsx.core.min.js');
9393
}
9494
// 本地
9595
if (inArray(includes, 'leaflet.sidebyside')) {
9696
inputScript("https://iclient.supermap.io/web/libs/leaflet/plugins/leaflet-side-by-side/leaflet-side-by-side.min.js");
9797
}
9898
if (inArray(includes, 'd3')) {
99-
inputScript("https://iclient.supermap.io/web/libs/d3/5.12.0/d3.js");
99+
inputScript('https://cdnjs.cloudflare.com/ajax/libs/d3/5.14.2/d3.min.js');
100100
}
101101
if (inArray(includes, 'd3-hexbin')) {
102102
inputScript("https://d3js.org/d3-hexbin.v0.2.min.js");
@@ -145,7 +145,7 @@
145145
inputScript("https://unpkg.com/ant-design-vue@1.3.9/dist/antd.min.js");
146146
}
147147
if (inArray(includes, 'echarts-vue')) {
148-
inputScript("https://cdn.bootcss.com/echarts/4.3.0-rc.2/echarts.min.js");
148+
inputScript('https://cdn.jsdelivr.net/npm/echarts@4.5.0/dist/echarts.min.js');
149149
inputScript("https://cdn.jsdelivr.net/npm/vue-echarts@4.0.4/dist/vue-echarts.min.js");
150150
inputScript("https://iclient.supermap.io/web/libs/echarts-liquidfill/echarts-liquidfill.min.js");
151151
inputScript("https://iclient.supermap.io/web/libs/echartsLayer/EchartsLayer.min.js");

‎dist/mapboxgl/include-mapboxgl.js‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
var includes = (targetScript.getAttribute('include') || "").split(",");
5454
var excludes = (targetScript.getAttribute('exclude') || "").split(",");
5555
if (!inArray(includes, 'mapbox-gl-enhance') && !inArray(excludes, 'mapbox-gl')) {
56-
inputCSS("https://cdn.bootcss.com/mapbox-gl/1.3.1/mapbox-gl.css");
57-
inputScript("https://cdn.bootcss.com/mapbox-gl/1.3.1/mapbox-gl.js");
56+
inputCSS('https://cdn.jsdelivr.net/npm/mapbox-gl@1.6.1/dist/mapbox-gl.min.css');
57+
inputScript('https://cdn.jsdelivr.net/npm/mapbox-gl@1.6.1/dist/mapbox-gl.min.js');
5858
}
5959
if (inArray(includes, 'mapbox-gl-enhance')) {
6060
inputCSS("https://iclient.supermap.io/web/libs/mapbox-gl-js-enhance/1.2.0/mapbox-gl-enhance.css");
@@ -65,31 +65,35 @@
6565
inputScript("https://iclient.supermap.io/web/libs/mapbox-gl-js/plugins/mapbox-gl-draw/1.0.9/mapbox-gl-draw.js");
6666
}
6767
if (inArray(includes, 'compare')) {
68-
inputCSS("https://iclient.supermap.io/web/libs/mapbox-gl-js/plugins/mapbox-gl-compare/0.2.1/mapbox-gl-compare.css");
69-
inputScript("https://iclient.supermap.io/web/libs/mapbox-gl-js/plugins/mapbox-gl-compare/0.2.1/mapbox-gl-compare.js");
68+
inputCSS(
69+
'https://iclient.supermap.io/web/libs/mapbox-gl-js/plugins/mapbox-gl-compare/0.3.0/mapbox-gl-compare.css'
70+
);
71+
inputScript(
72+
'https://iclient.supermap.io/web/libs/mapbox-gl-js/plugins/mapbox-gl-compare/0.3.0/mapbox-gl-compare.js'
73+
);
7074
}
7175
if (inArray(includes, 'mapv')) {
72-
inputScript("https://mapv.baidu.com/build/mapv.min.js");
76+
inputScript("https://cdn.jsdelivr.net/npm/mapv@2.0.42/build/mapv.min.js");
7377
}
7478
if (inArray(includes, 'echarts')) {
75-
inputScript("https://cdn.bootcss.com/echarts/4.3.0-rc.2/echarts.min.js");
76-
inputScript("https://iclient.supermap.io/web/libs/echartsLayer/EchartsLayer.min.js");
77-
inputScript("https://iclient.supermap.io/web/libs/echarts-liquidfill/echarts-liquidfill.min.js");
79+
inputScript('https://cdn.jsdelivr.net/npm/echarts@4.5.0/dist/echarts.min.js');
80+
inputScript('https://iclient.supermap.io/web/libs/echartsLayer/EchartsLayer.min.js');
81+
inputScript('https://iclient.supermap.io/web/libs/echarts-liquidfill/echarts-liquidfill.min.js');
7882
}
7983
if (inArray(includes, 'echarts-vue')) {
80-
inputScript("https://cdn.bootcss.com/echarts/4.3.0-rc.2/echarts.min.js");
81-
inputScript("https://cdn.jsdelivr.net/npm/vue-echarts@4.0.4/dist/vue-echarts.min.js");
82-
inputScript("https://iclient.supermap.io/web/libs/echarts-liquidfill/echarts-liquidfill.min.js");
83-
inputScript("https://iclient.supermap.io/web/libs/echartsLayer/EchartsLayer.min.js");
84+
inputScript('https://cdn.jsdelivr.net/npm/echarts@4.5.0/dist/echarts.min.js');
85+
inputScript("https://cdn.jsdelivr.net/npm/vue-echarts@4.0.4/dist/vue-echarts.min.js");
86+
inputScript("https://iclient.supermap.io/web/libs/echarts-liquidfill/echarts-liquidfill.min.js");
87+
inputScript("https://iclient.supermap.io/web/libs/echartsLayer/EchartsLayer.min.js");
8488
}
8589
if (inArray(includes, 'three')) {
8690
inputScript("https://cdnjs.cloudflare.com/ajax/libs/three.js/92/three.min.js");
8791
}
8892
if (inArray(includes, 'xlsx')) {
89-
inputScript("https://cdn.bootcss.com/xlsx/0.15.1/xlsx.core.min.js");
93+
inputScript('https://cdn.bootcss.com/xlsx/0.15.3/xlsx.core.min.js');
9094
}
9195
if (inArray(includes, 'proj4')) {
92-
inputScript("https://cdn.bootcss.com/proj4js/2.5.0/proj4.js");
96+
inputScript('https://cdn.bootcss.com/proj4js/2.6.0/proj4.js');
9397
}
9498
if (inArray(includes, 'shapefile')) {
9599
inputScript("https://unpkg.com/shapefile@0.6.6/dist/shapefile.js");
@@ -108,7 +112,7 @@
108112
inputScript("https://iclient.supermap.io/web/libs/geostats/geostats.js");
109113
}
110114
if (inArray(includes, 'canvg')) {
111-
inputScript("https://iclient.supermap.io/web/libs/canvg/canvg.min.js");
115+
inputScript("https://cdn.jsdelivr.net/npm/canvg@3.0.2/lib/umd.min.js");
112116
}
113117
if (inArray(includes, 'convert')) {
114118
inputScript("https://iclient.supermap.io/web/libs/xml-js/1.6.8/xml-js.min.js");

‎dist/ol/include-ol.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,16 +66,16 @@
6666
inputScript("https://cdn.bootcss.com/openlayers/4.6.5/ol-debug.js");
6767
}
6868
if (inArray(includes, 'mapv')) {
69-
inputScript("https://mapv.baidu.com/build/mapv.min.js");
69+
inputScript("https://cdn.jsdelivr.net/npm/mapv@2.0.42/build/mapv.min.js");
7070
}
7171
if (inArray(includes, 'turf')) {
7272
inputScript("https://cdn.bootcss.com/Turf.js/5.1.6/turf.min.js");
7373
}
7474
if (inArray(includes, 'echarts')) {
75-
inputScript("https://cdn.bootcss.com/echarts/4.3.0-rc.2/echarts.min.js");
75+
inputScript('https://cdn.jsdelivr.net/npm/echarts@4.5.0/dist/echarts.min.js');
7676
}
7777
if (inArray(includes, 'proj4')) {
78-
inputScript("https://cdn.bootcss.com/proj4js/2.5.0/proj4.js");
78+
inputScript('https://cdn.bootcss.com/proj4js/2.6.0/proj4.js');
7979
}
8080
if (inArray(includes, 'ol3-echarts')) {
8181
inputScript("https://cdn.jsdelivr.net/npm/ol3-echarts@2.0.1/dist/ol3Echarts.min.js");
@@ -106,7 +106,7 @@
106106
inputScript("https://iclient.supermap.io/web/libs/geostats/geostats.js");
107107
}
108108
if (inArray(includes, 'canvg')) {
109-
inputScript("https://iclient.supermap.io/web/libs/canvg/canvg.min.js");
109+
inputScript("https://cdn.jsdelivr.net/npm/canvg@3.0.2/lib/umd.min.js");
110110
}
111111

112112
// dist

‎dist/openlayers/include-openlayers.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,16 +66,16 @@
6666
inputScript("https://cdn.bootcss.com/openlayers/4.6.5/ol-debug.js");
6767
}
6868
if (inArray(includes, 'mapv')) {
69-
inputScript("https://mapv.baidu.com/build/mapv.min.js");
69+
inputScript("https://cdn.jsdelivr.net/npm/mapv@2.0.42/build/mapv.min.js");
7070
}
7171
if (inArray(includes, 'turf')) {
7272
inputScript("https://cdn.bootcss.com/Turf.js/5.1.6/turf.min.js");
7373
}
7474
if (inArray(includes, 'echarts')) {
75-
inputScript("https://cdn.bootcss.com/echarts/4.3.0-rc.2/echarts.min.js");
75+
inputScript('https://cdn.jsdelivr.net/npm/echarts@4.5.0/dist/echarts.min.js');
7676
}
7777
if (inArray(includes, 'proj4')) {
78-
inputScript("https://cdn.bootcss.com/proj4js/2.5.0/proj4.js");
78+
inputScript('https://cdn.bootcss.com/proj4js/2.6.0/proj4.js');
7979
}
8080
if (inArray(includes, 'ol3-echarts')) {
8181
inputScript("https://cdn.jsdelivr.net/npm/ol3-echarts@2.0.1/dist/ol3Echarts.min.js");
@@ -106,7 +106,7 @@
106106
inputScript("https://iclient.supermap.io/web/libs/geostats/geostats.js");
107107
}
108108
if (inArray(includes, 'canvg')) {
109-
inputScript("https://iclient.supermap.io/web/libs/canvg/canvg.min.js");
109+
inputScript("https://cdn.jsdelivr.net/npm/canvg@3.0.2/lib/umd.min.js");
110110
}
111111

112112
// dist

‎examples/leaflet/components_dataServiceQuery.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<meta charset="UTF-8">
1010
<title data-i18n='resources.title_dataServiceQuery'></title>
1111
<script type="text/javascript" src="../js/include-web.js"></script>
12-
<script type="text/javascript" include="leaflet.pm,iclient-leaflet-css" src="../../dist/leaflet/include-leaflet.js"></script>
12+
<script type="text/javascript" include="leaflet-geoman,iclient-leaflet-css" src="../../dist/leaflet/include-leaflet.js"></script>
1313
</head>
1414

1515
<body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height:100%;position: absolute;top: 0;">

‎examples/leaflet/snapAndModify.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</head>
1111
<body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height:100%;position: absolute;top: 0;">
1212
<div id="map" style="width: 100%;height:100%"></div>
13-
<script type="text/javascript" include="leaflet.pm" src="../../dist/leaflet/include-leaflet.js"></script>
13+
<script type="text/javascript" include="leaflet-geoman" src="../../dist/leaflet/include-leaflet.js"></script>
1414
<script type="text/javascript">
1515
var host = window.isLocal ? window.server : "https://iserver.supermap.io";
1616
var map, url = host+"/iserver/services/map-china400/rest/maps/China";

‎examples/mapboxgl/04_surfaceAnalystService.html‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
<meta charset="UTF-8">
88
<title data-i18n="resources.title_surfaceAnalystService"></title>
99
<script type="text/javascript" src="../js/include-web.js"></script>
10-
<script type="text/javascript" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
11-
<script src="https://cdnjs.cloudflare.com/ajax/libs/proj4js/2.4.3/proj4.js"></script>
10+
<script type="text/javascript" include="proj4" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
1211
</head>
1312
<body style="margin: 0;overflow: hidden;background: #fff;width: 100%;height:100%;position: absolute;top: 0;">
1413
<div id="map" style="margin:0 auto;width: 100%;height: 100%"></div>

0 commit comments

Comments
 (0)