Skip to content

Commit 2db93af

Browse files
SuperHuZhiPengSuperHuZhiPeng
committed
Merge branch 'master' of github.com:SuperMap/iClient-JavaScript
2 parents b06b911 + b815c5f commit 2db93af

File tree

137 files changed

+164
-145
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+164
-145
lines changed

‎dist/mapboxgl/include-mapboxgl.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@
5959
inputScript(libsurl + '/mapbox-gl-js/1.13.2/mapbox-gl.js');
6060
}
6161
if (inArray(includes, 'mapbox-gl-enhance')) {
62-
inputCSS(libsurl + '/mapbox-gl-js-enhance/1.12.1-10/mapbox-gl-enhance.css');
63-
inputScript(libsurl + '/mapbox-gl-js-enhance/1.12.1-10/mapbox-gl-enhance.js');
62+
inputCSS(libsurl + '/mapbox-gl-js-enhance/1.12.1-11/mapbox-gl-enhance.css');
63+
inputScript(libsurl + '/mapbox-gl-js-enhance/1.12.1-11/mapbox-gl-enhance.js');
6464
}
6565
if (inArray(includes, 'L7')) {
6666
inputScript(libsurl + '/mapboxgl-l7-render/0.0.3/mapboxgl-l7-render.js');

‎dist/ol/include-ol.js‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,19 @@
5555
var includes = (targetScript.getAttribute('include') || '').split(',');
5656
var excludes = (targetScript.getAttribute('exclude') || '').split(',');
5757
// 在线
58-
if (!inArray(includes, 'ol-debug') && !inArray(includes, '[email protected]') && !inArray(excludes, 'ol')) {
58+
if (!inArray(includes, 'ol-debug') && !inArray(includes, '[email protected]') && !inArray(includes, 'ol-enhance') && !inArray(excludes, 'ol')) {
5959
inputCSS(libsurl + '/openlayers/10.5.0/ol.min.css');
6060
inputScript(libsurl + '/openlayers/10.5.0/ol.min.js');
6161
}
62-
if (inArray(includes, '[email protected]')) {
62+
if (!inArray(includes, 'ol-enhance') && inArray(includes, '[email protected]')) {
6363
inputCSS(libsurl + '/openlayers/4.6.5/ol.css');
6464
inputScript(libsurl + '/openlayers/4.6.5/ol.js');
6565
}
66-
if (inArray(includes, 'ol-debug')) {
66+
if (inArray(includes, 'ol-enhance')) {
67+
inputCSS(libsurl + '/ol-enhance/7.5.2-1/ol-enhance.min.css');
68+
inputScript(libsurl + '/ol-enhance/7.5.2-1/ol-enhance.js');
69+
}
70+
if (!inArray(includes, 'ol-enhance') && inArray(includes, 'ol-debug')) {
6771
inputCSS(libsurl + '/openlayers/4.6.5/ol-debug.css');
6872
inputScript(libsurl + '/openlayers/4.6.5/ol-debug.js');
6973
}
@@ -89,7 +93,7 @@
8993
inputScript(libsurl + '/openlayers/ol3-echarts/1.3.6/ol3Echarts.min.js');
9094
}
9195
if (inArray(includes, 'ol-mapbox-style')) {
92-
inputScript(libsurl + '/openlayers/plugins/ol-mapbox-style/2.11.2-6/olms.js');
96+
inputScript(libsurl + '/openlayers/plugins/ol-mapbox-style/2.11.2-7/olms.js');
9397
}
9498
if (inArray(includes, 'deck')) {
9599
inputScript(libsurl + '/deck.gl/5.1.3/deck.gl.min.js');

‎dist/openlayers/include-openlayers.js‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,19 @@
5555
var includes = (targetScript.getAttribute('include') || '').split(',');
5656
var excludes = (targetScript.getAttribute('exclude') || '').split(',');
5757
// 在线
58-
if (!inArray(includes, 'ol-debug') && !inArray(includes, '[email protected]') && !inArray(excludes, 'ol')) {
58+
if (!inArray(includes, 'ol-debug') && !inArray(includes, '[email protected]') && !inArray(includes, 'ol-enhance') && !inArray(excludes, 'ol')) {
5959
inputCSS(libsurl + '/openlayers/10.5.0/ol.min.css');
6060
inputScript(libsurl + '/openlayers/10.5.0/ol.min.js');
6161
}
62-
if (inArray(includes, '[email protected]')) {
62+
if (!inArray(includes, 'ol-enhance') && inArray(includes, '[email protected]')) {
6363
inputCSS(libsurl + '/openlayers/4.6.5/ol.css');
6464
inputScript(libsurl + '/openlayers/4.6.5/ol.js');
6565
}
66-
if (inArray(includes, 'ol-debug')) {
66+
if (inArray(includes, 'ol-enhance')) {
67+
inputCSS(libsurl + '/ol-enhance/7.5.2-1/ol-enhance.min.css');
68+
inputScript(libsurl + '/ol-enhance/7.5.2-1/ol-enhance.js');
69+
}
70+
if (!inArray(includes, 'ol-enhance') && inArray(includes, 'ol-debug')) {
6771
inputCSS(libsurl + '/openlayers/4.6.5/ol-debug.css');
6872
inputScript(libsurl + '/openlayers/4.6.5/ol-debug.js');
6973
}
@@ -89,7 +93,7 @@
8993
inputScript(libsurl + '/openlayers/ol3-echarts/1.3.6/ol3Echarts.min.js');
9094
}
9195
if (inArray(includes, 'ol-mapbox-style')) {
92-
inputScript(libsurl + '/openlayers/plugins/ol-mapbox-style/2.11.2-6/olms.js');
96+
inputScript(libsurl + '/openlayers/plugins/ol-mapbox-style/2.11.2-7/olms.js');
9397
}
9498
if (inArray(includes, 'deck')) {
9599
inputScript(libsurl + '/deck.gl/5.1.3/deck.gl.min.js');

‎examples/component/components_animate_marker_layer_react.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<!--********************************************************************
55
* 该示例需要引入
66
* ant-design (https://github.com/ant-design/ant-design)
7-
* mapbox-gl-enhance (https://iclient.supermap.io/web/libs/mapbox-gl-js-enhance/1.12.1-10/mapbox-gl-enhance.js)
7+
* mapbox-gl-enhance (https://iclient.supermap.io/web/libs/mapbox-gl-js-enhance/1.12.1-11/mapbox-gl-enhance.js)
88
*********************************************************************-->
99
<!DOCTYPE html>
1010
<html>

‎examples/component/components_animate_marker_layer_vue.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<!--********************************************************************
55
* 该示例需要引入
66
* vue-iclient (https://github.com/SuperMap/vue-iclient)
7-
* mapbox-gl-enhance (https://iclient.supermap.io/web/libs/mapbox-gl-js-enhance/1.12.1-10/mapbox-gl-enhance.js)
7+
* mapbox-gl-enhance (https://iclient.supermap.io/web/libs/mapbox-gl-js-enhance/1.12.1-11/mapbox-gl-enhance.js)
88
*********************************************************************-->
99
<!DOCTYPE html>
1010
<html>

‎examples/component/components_attribute_panel_vue.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<!--********************************************************************
55
* 该示例需要引入
66
* vue-iclient (https://github.com/SuperMap/vue-iclient)
7-
* mapbox-gl-enhance (https://iclient.supermap.io/web/libs/mapbox-gl-js-enhance/1.12.1-10/mapbox-gl-enhance.js)
7+
* mapbox-gl-enhance (https://iclient.supermap.io/web/libs/mapbox-gl-js-enhance/1.12.1-11/mapbox-gl-enhance.js)
88
*********************************************************************-->
99
<!DOCTYPE html>
1010
<html>

‎examples/component/components_attributes_vue.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<!--********************************************************************
55
* 该示例需要引入
66
* vue-iclient (https://github.com/SuperMap/vue-iclient)
7-
* mapbox-gl-enhance (https://iclient.supermap.io/web/libs/mapbox-gl-js-enhance/1.12.1-10/mapbox-gl-enhance.js)
7+
* mapbox-gl-enhance (https://iclient.supermap.io/web/libs/mapbox-gl-js-enhance/1.12.1-11/mapbox-gl-enhance.js)
88
*********************************************************************-->
99
<!DOCTYPE html>
1010
<html>

‎examples/component/components_basic_vue.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Echarts (https://github.com/apache/echarts)
77
* echarts-liquidfill (https://github.com/ecomfe/echarts-liquidfill)
88
* vue-iclient (https://github.com/SuperMap/vue-iclient)
9-
* mapbox-gl-enhance (https://iclient.supermap.io/web/libs/mapbox-gl-js-enhance/1.12.1-10/mapbox-gl-enhance.js)
9+
* mapbox-gl-enhance (https://iclient.supermap.io/web/libs/mapbox-gl-js-enhance/1.12.1-11/mapbox-gl-enhance.js)
1010
*********************************************************************-->
1111
<!DOCTYPE html>
1212
<html>

‎examples/component/components_border_vue.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Echarts (https://github.com/apache/echarts)
77
* vue-echarts (https://github.com/ecomfe/vue-echarts)
88
* vue-iclient (https://github.com/SuperMap/vue-iclient)
9-
* mapbox-gl-enhance (https://iclient.supermap.io/web/libs/mapbox-gl-js-enhance/1.12.1-10/mapbox-gl-enhance.js)
9+
* mapbox-gl-enhance (https://iclient.supermap.io/web/libs/mapbox-gl-js-enhance/1.12.1-11/mapbox-gl-enhance.js)
1010
*********************************************************************-->
1111
<!DOCTYPE html>
1212
<html>

‎examples/component/components_chart_vue.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Echarts (https://github.com/apache/echarts)
77
* vue-echarts (https://github.com/ecomfe/vue-echarts)
88
* vue-iclient (https://github.com/SuperMap/vue-iclient)
9-
* mapbox-gl-enhance (https://iclient.supermap.io/web/libs/mapbox-gl-js-enhance/1.12.1-10/mapbox-gl-enhance.js)
9+
* mapbox-gl-enhance (https://iclient.supermap.io/web/libs/mapbox-gl-js-enhance/1.12.1-11/mapbox-gl-enhance.js)
1010
*********************************************************************-->
1111
<!DOCTYPE html>
1212
<html>

0 commit comments

Comments
 (0)