Skip to content

Commit 042551c

Browse files
Yuki-ZhaoYuki-Zhao
authored
Merge pull request SuperMap#9 from SuperMap/master
更新iclient最新代码
2 parents f90d09f + 3778694 commit 042551c

39 files changed

+37133
-2679
lines changed

‎.github/workflows/linter.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,8 @@ jobs:
2323
- uses: actions/checkout@v2
2424

2525
# Runs a single command using the runners shell
26-
- name: Run a one-line script
27-
run: echo Hello, world!
28-
29-
# Runs a set of commands using the runners shell
30-
- name: Run a multi-line script
31-
run: |
32-
echo Add other actions to build,
33-
echo test, and deploy your project.
26+
- name: Install Dependencies
27+
run: npm i
3428
################################
3529
# Run Linter against code base #
3630
################################

‎dist/mapboxgl/iclient-mapboxgl-vue.css

Lines changed: 222 additions & 198 deletions
Large diffs are not rendered by default.

‎dist/mapboxgl/iclient-mapboxgl-vue.js

Lines changed: 6867 additions & 2327 deletions
Large diffs are not rendered by default.

‎dist/mapboxgl/iclient-mapboxgl-vue.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/mapboxgl/iclient-mapboxgl-vue.min.js

Lines changed: 138 additions & 138 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/mapboxgl/include-mapboxgl.js

Lines changed: 34 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,20 @@
6161
inputScript('https://iclient.supermap.io/web/libs/mapbox-gl-js-enhance/1.12.0/mapbox-gl-enhance.js');
6262
}
6363
if (inArray(includes, 'draw')) {
64-
inputCSS('https://iclient.supermap.io/web/libs/mapbox-gl-js/plugins/mapbox-gl-draw/1.2.0/mapbox-gl-draw.css');
65-
inputScript('https://iclient.supermap.io/web/libs/mapbox-gl-js/plugins/mapbox-gl-draw/1.2.0/mapbox-gl-draw.js');
64+
inputCSS(
65+
'https://iclient.supermap.io/web/libs/mapbox-gl-js/plugins/mapbox-gl-draw/1.2.0/mapbox-gl-draw.css'
66+
);
67+
inputScript(
68+
'https://iclient.supermap.io/web/libs/mapbox-gl-js/plugins/mapbox-gl-draw/1.2.0/mapbox-gl-draw.js'
69+
);
6670
}
6771
if (inArray(includes, 'compare')) {
68-
inputCSS('https://iclient.supermap.io/web/libs/mapbox-gl-js/plugins/mapbox-gl-compare/0.4.0/mapbox-gl-compare.css');
69-
inputScript('https://iclient.supermap.io/web/libs/mapbox-gl-js/plugins/mapbox-gl-compare/0.4.0/mapbox-gl-compare.js');
72+
inputCSS(
73+
'https://iclient.supermap.io/web/libs/mapbox-gl-js/plugins/mapbox-gl-compare/0.4.0/mapbox-gl-compare.css'
74+
);
75+
inputScript(
76+
'https://iclient.supermap.io/web/libs/mapbox-gl-js/plugins/mapbox-gl-compare/0.4.0/mapbox-gl-compare.js'
77+
);
7078
}
7179
if (inArray(includes, 'mapv')) {
7280
inputScript('https://cdn.jsdelivr.net/npm/mapv@2.0.56/build/mapv.min.js');
@@ -119,11 +127,25 @@
119127
inputScript('https://iclient.supermap.io/web/libs/xml-js/1.6.8/xml-js.min.js');
120128
}
121129
if (inArray(includes, 'LegacyJSONLoader')) {
122-
inputScript('https://cdn.jsdelivr.net/npm/three@0.110.0/examples/js/loaders/deprecated/LegacyJSONLoader.js');
130+
inputScript(
131+
'https://cdn.jsdelivr.net/npm/three@0.110.0/examples/js/loaders/deprecated/LegacyJSONLoader.js'
132+
);
123133
}
124134
if (inArray(includes, 'OBJLoader')) {
125135
inputScript('https://cdn.jsdelivr.net/npm/three@0.121.1/examples/js/loaders/OBJLoader.js');
126136
}
137+
138+
if (inArray(includes, 'three92')) {
139+
inputScript('https://cdn.bootcss.com/three.js/92/three.min.js');
140+
}
141+
if (inArray(includes, 'LoaderSupport')) {
142+
inputScript('https://iclient.supermap.io/web/libs/three/plugins/loaders/LoaderCommons.js');
143+
inputScript('https://iclient.supermap.io/web/libs/three/plugins/loaders/LoaderBuilder.js');
144+
inputScript('https://iclient.supermap.io/web/libs/three/plugins/loaders/LoaderWorkerSupport.js');
145+
}
146+
if (inArray(includes, 'OBJLoader2')) {
147+
inputScript('https://iclient.supermap.io/web/libs/three/plugins/loaders/OBJLoader2.js');
148+
}
127149
if (inArray(includes, 'MTLLoader')) {
128150
inputScript('https://cdn.jsdelivr.net/npm/three@0.121.1/examples/js/loaders/MTLLoader.js');
129151
}
@@ -136,6 +158,13 @@
136158
if (inArray(includes, 'mapbox-print-pdf')) {
137159
inputScript('https://iclient.supermap.io/web/libs/mapbox-print-pdf/0.4.4/mapbox-print-pdf.min.js');
138160
}
161+
if (inArray(includes, 'moment')) {
162+
inputScript('https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.29.1/moment.min.js');
163+
}
164+
if (inArray(includes, 'lodash')) {
165+
inputScript('https://cdn.jsdelivr.net/npm/lodash@4.17.20/lodash.min.js');
166+
}
167+
139168
// dist
140169
if (!inArray(excludes, 'iclient-mapboxgl')) {
141170
if (supportES6()) {

‎examples/component/components_coordinate_conversion_vue.html

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<!--********************************************************************
2+
* Copyright© 2000 - 2021 SuperMap Software Co.Ltd. All rights reserved.
3+
*********************************************************************-->
4+
<!DOCTYPE html>
5+
<html>
6+
<head>
7+
<meta charset="UTF-8" />
8+
<title data-i18n="resources.title_componentsCoordinateConversion_Vue"></title>
9+
<script type="text/javascript" include="vue" src="../js/include-web.js"></script>
10+
<script
11+
include="iclient-mapboxgl-vue,mapbox-gl-enhance,draw"
12+
src="../../dist/mapboxgl/include-mapboxgl.js"
13+
></script>
14+
<style>
15+
#main {
16+
margin: 0 auto;
17+
width: 100%;
18+
height: 100%;
19+
}
20+
</style>
21+
</head>
22+
23+
<body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height:100%;position: absolute;top: 0;">
24+
<div id="main">
25+
<sm-web-map server-url="https://iportal.supermap.io/iportal" map-id="801571284">
26+
<sm-coordinate-conversion></sm-coordinate-conversion>
27+
</sm-web-map>
28+
</div>
29+
30+
<script>
31+
new Vue({
32+
el: '#main',
33+
created() {
34+
SuperMap.Components.setTheme('dark');
35+
}
36+
});
37+
</script>
38+
</body>
39+
</html>

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy