Skip to content

Commit 2e12dc6

Browse files
xiongjiaojiaoxiongjiaojiao
committed
【update】视频增强组件模板优化例子; review by qiw"
1 parent bad8a69 commit 2e12dc6

33 files changed

+1001
-901
lines changed

‎dist/mapboxgl/include-mapboxgl.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@
5757
inputScript('https://iclient.supermap.io/web/libs/mapbox-gl-js/1.13.2/mapbox-gl.js');
5858
}
5959
if (inArray(includes, 'mapbox-gl-enhance')) {
60-
inputCSS('https://iclient.supermap.io/web/libs/mapbox-gl-js-enhance/1.12.0/mapbox-gl-enhance.css');
61-
inputScript('https://iclient.supermap.io/web/libs/mapbox-gl-js-enhance/1.12.0/mapbox-gl-enhance.js');
60+
inputCSS('https://iclient.supermap.io/web/libs/mapbox-gl-js-enhance/1.12.0-1/mapbox-gl-enhance.css');
61+
inputScript('https://iclient.supermap.io/web/libs/mapbox-gl-js-enhance/1.12.0-1/mapbox-gl-enhance.js');
6262
}
6363
if (inArray(includes, 'turf')) {
6464
inputScript('https://iclient.supermap.io/web/libs/turf/6.5.0/turf.min.js');

‎examples/component/components_graph_theme_layer_react.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ <h5 class="panel-title text-center" data-i18n="resources.text_attributeTable"></
176176
contentHTML += '</div>';
177177

178178
var tempPoint = map.unproject({ x: e.event.x, y: e.event.y });
179-
popup = new mapboxgl.Popup({ closeOnClick: false })
179+
popup = new mapboxgl.Popup({ closeButton: false })
180180
.setLngLat([tempPoint.lng, tempPoint.lat])
181181
.setHTML(contentHTML)
182182
.addTo(map);

‎examples/component/components_graph_theme_layer_vue.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
contentHTML += '</div>';
127127

128128
var tempPoint = map.unproject({ x: e.event.x, y: e.event.y });
129-
popup = new mapboxgl.Popup({ closeOnClick: false })
129+
popup = new mapboxgl.Popup({ closeButton: false })
130130
.setLngLat([tempPoint.lng, tempPoint.lat])
131131
.setHTML(contentHTML)
132132
.addTo(map);

‎examples/component/components_labeltheme_react.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@
135135
}
136136

137137
if (!popup) {
138-
popup = new mapboxgl.Popup(({ maxWidth: 600 }));
138+
popup = new mapboxgl.Popup({ maxWidth: 600, closeButton: false });
139139
}
140140

141141
var statisticsData = getStatisticsData();

‎examples/component/components_labeltheme_vue.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@
160160
}
161161

162162
if (!this.popup) {
163-
this.popup = new mapboxgl.Popup({ maxWidth: 600 });
163+
this.popup = new mapboxgl.Popup({ maxWidth: 600, closeButton: false });
164164
}
165165

166166
var statisticsData = this.getStatisticsData();

‎examples/component/components_ranksymboltheme_react.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
}
130130
contentHTML += '</div>';
131131
var tempPoint = map.unproject(new window.mapboxgl.Point(e.event.x, e.event.y));
132-
popup = new mapboxgl.Popup({ closeOnClick: false })
132+
popup = new mapboxgl.Popup({ closeButton: false })
133133
.setLngLat([tempPoint.lng, tempPoint.lat])
134134
.setHTML(contentHTML)
135135
.addTo(map);

‎examples/component/components_ranksymboltheme_vue.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@
159159
}
160160
contentHTML += '</div>';
161161
var tempPoint = map.unproject(new window.mapboxgl.Point(e.event.x, e.event.y));
162-
this.popup = new mapboxgl.Popup({ closeOnClick: false })
162+
this.popup = new mapboxgl.Popup({ closeButton: false })
163163
.setLngLat([tempPoint.lng, tempPoint.lat])
164164
.setHTML(contentHTML)
165165
.addTo(map);

‎examples/component/components_video_plus_vue.html

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
height: 100%;
1515
}
1616

17-
18-
1917
.mapboxgl-popup-tip {
2018
align-self: center;
2119
}
@@ -257,17 +255,13 @@
257255
},
258256
methods: {
259257
handleMapClick(e) {
260-
if (e.mapEvent.target.getCanvas().style.cursor !== 'pointer') {
258+
if (e.target.getCanvas().style.cursor !== 'pointer') {
261259
this.popupVisible = false;
262260
}
263261
},
264262
handleLayerClick(e) {
265263
this.popupVisible = true;
266264
this.coordinate = e.pixelPoint;
267-
const features = e.target.queryRenderedFeatures(
268-
[5, -5],
269-
{ layers: ['smvideopluslayer'] }
270-
);
271265
this.activeData = e.features[0].properties;
272266
},
273267
toggleLayerCursor(e) {

‎examples/component/img/components_theme_vue.png

-972 KB
Loading

‎examples/mapboxgl/01_mapService.html

Lines changed: 50 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -3,67 +3,75 @@
33
*********************************************************************-->
44
<!DOCTYPE html>
55
<html>
6+
67
<head>
7-
<meta charset="UTF-8">
8-
<title data-i18n="resources.title_mapService"></title>
9-
<script type="text/javascript" src="../js/include-web.js"></script>
8+
<meta charset="UTF-8">
9+
<title data-i18n="resources.title_mapService"></title>
10+
<script type="text/javascript" src="../js/include-web.js"></script>
11+
<style>
12+
.mapboxgl-popup-close-button {
13+
outline: none;
14+
}
15+
</style>
1016
</head>
17+
1118
<body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height:100%;position: absolute;top: 0;">
12-
<div id="map" style="margin:0 auto;width: 100%;height: 100%"></div>
13-
<script type="text/javascript" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
14-
<script type="text/javascript">
19+
<div id="map" style="margin:0 auto;width: 100%;height: 100%"></div>
20+
<script type="text/javascript" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
21+
<script type="text/javascript">
1522
var host = window.isLocal ? window.server : "https://iserver.supermap.io";
1623
var url = host + "/iserver/services/map-world/rest/maps/World";
1724
var attribution = "<a href='https://www.mapbox.com/about/maps/' target='_blank'>© Mapbox </a>" +
18-
"with <span>© <a href='https://iclient.supermap.io' target='_blank'>SuperMap iClient</a> | </span>" +
19-
" Map Data <span>© <a href='http://support.supermap.com.cn/product/iServer.aspx' target='_blank'>SuperMap iServer</a></span> ";
25+
"with <span>© <a href='https://iclient.supermap.io' target='_blank'>SuperMap iClient</a> | </span>" +
26+
" Map Data <span>© <a href='http://support.supermap.com.cn/product/iServer.aspx' target='_blank'>SuperMap iServer</a></span> ";
2027
var map = new mapboxgl.Map({
21-
container: 'map',
22-
style: {
23-
"version": 8,
24-
"sources": {
25-
"raster-tiles": {
26-
"attribution": attribution,
27-
"type": "raster",
28-
"tiles": [host + '/iserver/services/maps/rest/maps/World/zxyTileImage.png?prjCoordSys='+encodeURIComponent('{"epsgCode":3857}')+'&z={z}&x={x}&y={y}'],
29-
"tileSize": 256,
30-
},
31-
},
32-
"layers": [{
33-
"id": "simple-tiles",
34-
"type": "raster",
35-
"source": "raster-tiles",
36-
"minzoom": 0,
37-
"maxzoom": 22
38-
}]
28+
container: 'map',
29+
style: {
30+
"version": 8,
31+
"sources": {
32+
"raster-tiles": {
33+
"attribution": attribution,
34+
"type": "raster",
35+
"tiles": [host + '/iserver/services/maps/rest/maps/World/zxyTileImage.png?prjCoordSys=' + encodeURIComponent('{"epsgCode":3857}') + '&z={z}&x={x}&y={y}'],
36+
"tileSize": 256,
37+
},
3938
},
40-
center: [-74.50, 40],
41-
maxZoom: 18,
42-
zoom: 2
39+
"layers": [{
40+
"id": "simple-tiles",
41+
"type": "raster",
42+
"source": "raster-tiles",
43+
"minzoom": 0,
44+
"maxzoom": 22
45+
}]
46+
},
47+
center: [-74.50, 40],
48+
maxZoom: 18,
49+
zoom: 2
4350
});
4451
map.addControl(new mapboxgl.supermap.LogoControl(), 'bottom-right');
4552
map.addControl(new mapboxgl.NavigationControl(), 'top-left');
4653

4754
map.on('load', function () {
48-
mapService();
55+
mapService();
4956
});
5057

5158
function mapService() {
52-
new mapboxgl.supermap.MapService(url).getMapInfo(callback);
59+
new mapboxgl.supermap.MapService(url).getMapInfo(callback);
5360
}
5461

5562
function callback(serviceResult) {
56-
var result = serviceResult.result;
57-
var innerHTML = "(" + resources.text_mapInfoPrint + ")" + "<br><br>";
58-
innerHTML += resources.text_mapName + "：" + JSON.stringify(result.name) + "<br>";
59-
innerHTML += resources.text_center + ":" + JSON.stringify(result.center) + "<br>";
60-
innerHTML += "Bounds:" + JSON.stringify(result.bounds) + "<br>";
61-
new mapboxgl.Popup({closeOnClick: false})
62-
.setLngLat([-96, 37.8])
63-
.setHTML(innerHTML + "</br>")
64-
.addTo(map);
63+
var result = serviceResult.result;
64+
var innerHTML = "(" + resources.text_mapInfoPrint + ")" + "<br><br>";
65+
innerHTML += resources.text_mapName + "：" + JSON.stringify(result.name) + "<br>";
66+
innerHTML += resources.text_center + ":" + JSON.stringify(result.center) + "<br>";
67+
innerHTML += "Bounds:" + JSON.stringify(result.bounds) + "<br>";
68+
new mapboxgl.Popup({ closeOnClick: false })
69+
.setLngLat([-96, 37.8])
70+
.setHTML(innerHTML + "</br>")
71+
.addTo(map);
6572
}
6673

67-
</script>
74+
</script>
6875
</body>
69-
</html>
76+
77+
</html>

‎examples/mapboxgl/02_fieldsService.html

Lines changed: 47 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -3,60 +3,68 @@
33
*********************************************************************-->
44
<!DOCTYPE html>
55
<html lang="en">
6+
67
<head>
7-
<meta charset="UTF-8">
8-
<title data-i18n="resources.title_fieldService"></title>
9-
<script type="text/javascript" include="bootstrap-css" src="../js/include-web.js"></script>
10-
<script type="text/javascript" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
8+
<meta charset="UTF-8">
9+
<title data-i18n="resources.title_fieldService"></title>
10+
<script type="text/javascript" include="bootstrap-css" src="../js/include-web.js"></script>
11+
<script type="text/javascript" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
12+
<style>
13+
.mapboxgl-popup-close-button {
14+
outline: none;
15+
}
16+
</style>
1117
</head>
18+
1219
<body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height:100%;position: absolute;top: 0;">
13-
<div id="map" style="margin:0 auto;width: 100%;height: 100%"></div>
14-
<script>
20+
<div id="map" style="margin:0 auto;width: 100%;height: 100%"></div>
21+
<script>
1522
var map,
16-
baseUrl = (window.isLocal ? window.server : "https://iserver.supermap.io") + "/iserver/services/map-world/rest/maps/World Map/zxyTileImage.png?z={z}&x={x}&y={y}",
17-
dataUrl = (window.isLocal ? window.server : "https://iserver.supermap.io") + "/iserver/services/data-world/rest/data";
23+
baseUrl = (window.isLocal ? window.server : "https://iserver.supermap.io") + "/iserver/services/map-world/rest/maps/World Map/zxyTileImage.png?z={z}&x={x}&y={y}",
24+
dataUrl = (window.isLocal ? window.server : "https://iserver.supermap.io") + "/iserver/services/data-world/rest/data";
1825
var attribution = "<a href='https://www.mapbox.com/about/maps/' target='_blank'>© Mapbox </a>" +
19-
" with <span>© <a href='https://iclient.supermap.io' target='_blank'>SuperMap iClient</a> | </span>" +
20-
" Map Data <span>© <a href='http://support.supermap.com.cn/product/iServer.aspx' target='_blank'>SuperMap iServer</a></span> ";
26+
" with <span>© <a href='https://iclient.supermap.io' target='_blank'>SuperMap iClient</a> | </span>" +
27+
" Map Data <span>© <a href='http://support.supermap.com.cn/product/iServer.aspx' target='_blank'>SuperMap iServer</a></span> ";
2128

2229
map = new mapboxgl.Map({
23-
container: 'map',
24-
style: {
25-
"version": 8,
26-
"sources": {
27-
"raster-tiles": {
28-
"attribution": attribution,
29-
"type": "raster",
30-
"tiles": [baseUrl],
31-
"tileSize": 256
32-
}
33-
},
34-
"layers": [{
35-
"id": "simple-tiles",
36-
"type": "raster",
37-
"source": "raster-tiles",
38-
}]
30+
container: 'map',
31+
style: {
32+
"version": 8,
33+
"sources": {
34+
"raster-tiles": {
35+
"attribution": attribution,
36+
"type": "raster",
37+
"tiles": [baseUrl],
38+
"tileSize": 256
39+
}
3940
},
40-
center: [0, 0],
41-
zoom: 2
41+
"layers": [{
42+
"id": "simple-tiles",
43+
"type": "raster",
44+
"source": "raster-tiles",
45+
}]
46+
},
47+
center: [0, 0],
48+
zoom: 2
4249
});
4350
map.addControl(new mapboxgl.NavigationControl(), 'top-left');
4451
map.addControl(new mapboxgl.supermap.LogoControl(), 'bottom-right');
4552

4653
map.on("load", function () {
47-
mapService();
54+
mapService();
4855
});
4956

5057
function mapService() {
51-
var param = new mapboxgl.supermap.FieldParameters({
52-
datasource: "World",
53-
dataset: "continent_T"
54-
});
55-
new mapboxgl.supermap.FieldService(dataUrl).getFields(param, function (serviceResult) {
56-
var innerHTML = serviceResult.result.fieldNames.join(', ');
57-
new mapboxgl.Popup().setLngLat([0, 0]).setHTML(innerHTML).addTo(map);
58-
});
58+
var param = new mapboxgl.supermap.FieldParameters({
59+
datasource: "World",
60+
dataset: "continent_T"
61+
});
62+
new mapboxgl.supermap.FieldService(dataUrl).getFields(param, function (serviceResult) {
63+
var innerHTML = serviceResult.result.fieldNames.join(', ');
64+
new mapboxgl.Popup().setLngLat([0, 0]).setHTML(innerHTML).addTo(map);
65+
});
5966
}
60-
</script>
67+
</script>
6168
</body>
62-
</html>
69+
70+
</html>

0 commit comments

Comments
 (0)