Skip to content

Commit b28d0c4

Browse files
committed
【fix】升级canvg
1 parent 0b06094 commit b28d0c4

26 files changed

+32
-68
lines changed

build/webpack.config.classic.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ module.exports = {
2020
resolve: configBase.resolve,
2121
externals: Object.assign({}, configBase.externals, {
2222
'xlsx': "function(){try{return XLSX}catch(e){return {}}}()",
23-
'canvg': "function(){try{return canvg}catch(e){return {}}}()",
2423
'jsonsql': "function(){try{return jsonsql}catch(e){return {}}}()",
2524
'xml-js': "function(){try{return convert}catch(e){return {}}}()"
2625
}),

build/webpack.config.mapboxgl.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ module.exports = {
3232
'luma.gl': '(function(){try{return luma}catch(e){return {}}})()',
3333
'webgl-debug': '(function(){try{return webgl-debug}catch(e){return {}}})()',
3434
xlsx: 'function(){try{return XLSX}catch(e){return {}}}()',
35-
canvg: 'function(){try{return canvg}catch(e){return {}}}()',
3635
'@turf/turf': 'function(){try{return turf}catch(e){return {}}}()',
3736
jsonsql: 'function(){try{return jsonsql}catch(e){return {}}}()',
3837
'./L7/l7-render': 'function(){try{return L7}catch(e){return {}}}()',

build/webpack.config.maplibregl.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ module.exports = {
3131
'webgl-debug': '(function(){try{return webgl-debug}catch(e){return {}}})()',
3232
'luma.gl': '(function(){try{return luma}catch(e){return {}}})()',
3333
xlsx: 'function(){try{return XLSX}catch(e){return {}}}()',
34-
canvg: 'function(){try{return canvg}catch(e){return {}}}()',
3534
jsonsql: 'function(){try{return jsonsql}catch(e){return {}}}()',
3635
'xml-js': 'function(){try{return convert}catch(e){return {}}}()',
3736
'./L7/l7-render': 'function(){try{return L7}catch(e){return {}}}()',

build/webpack.config.openlayers.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ var externals = [
2020
'luma.gl': '(function(){try{return luma}catch(e){return {}}})()',
2121
'webgl-debug': '(function(){try{return webgl-debug}catch(e){return {}}})()',
2222
xlsx: 'function(){try{return XLSX}catch(e){return {}}}()',
23-
canvg: 'function(){try{return canvg}catch(e){return {}}}()',
2423
jsonsql: 'function(){try{return jsonsql}catch(e){return {}}}()',
2524
three: 'function(){try{return THREE}catch(e){return {}}}()'
2625
}),

dist/mapboxgl/include-mapboxgl.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,6 @@
131131
if (inArray(includes, 'geostats')) {
132132
inputScript(libsurl + '/geostats/geostats.js');
133133
}
134-
if (inArray(includes, 'canvg')) {
135-
inputScript(libsurl + '/canvg/3.0.10/umd.min.js');
136-
}
137134
if (inArray(includes, 'XMLParser')) {
138135
inputScript(libsurl + '/fast-xml-parser/4.2.7/fxparser.min.js');
139136
}

dist/maplibregl/include-maplibregl.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,6 @@
128128
if (inArray(includes, 'geostats')) {
129129
inputScript(libsurl + '/geostats/geostats.js');
130130
}
131-
if (inArray(includes, 'canvg')) {
132-
inputScript(libsurl + '/canvg/3.0.10/umd.min.js');
133-
}
134131
if (inArray(includes, 'LegacyJSONLoader')) {
135132
inputScript(libsurl + '/three/0.110.0/examples/js/loaders/deprecated/LegacyJSONLoader.js');
136133
}

dist/ol/include-ol.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,6 @@
114114
if (inArray(includes, 'geostats')) {
115115
inputScript(libsurl + '/geostats/geostats.js');
116116
}
117-
if (inArray(includes, 'canvg')) {
118-
inputScript(libsurl + '/canvg/3.0.10/umd.min.js');
119-
}
120117
if (inArray(includes, 'tensorflow')) {
121118
inputScript(libsurl + '/tensorflow/3.9.0/tf.min.js');
122119
}

dist/openlayers/include-openlayers.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,6 @@
114114
if (inArray(includes, 'geostats')) {
115115
inputScript(libsurl + '/geostats/geostats.js');
116116
}
117-
if (inArray(includes, 'canvg')) {
118-
inputScript(libsurl + '/canvg/3.0.10/umd.min.js');
119-
}
120117
if (inArray(includes, 'tensorflow')) {
121118
inputScript(libsurl + '/tensorflow/3.9.0/tf.min.js');
122119
}

examples/mapboxgl/iPortalWebmap_heat.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
* 该示例需要引入
66
* xml-js (https://github.com/nashwaan/xml-js)
77
* jsonSQL (https://github.com/rockdragon/jsonSQL)
8-
* canvg (https://github.com/canvg/canvg)
98
* geostats (https://github.com/simogeo/geostats)
109
* mapbox-gl-enhance (https://iclient.supermap.io/web/libs/mapbox-gl-js-enhance/1.12.1/mapbox-gl-enhance.js)
1110
*********************************************************************-->
@@ -15,7 +14,7 @@
1514
<meta charset="UTF-8">
1615
<title data-i18n="resources.title_iportalWebMap_heat"></title>
1716
<script type="text/javascript" src="../js/include-web.js"></script>
18-
<script type="text/javascript" include='jsonsql,canvg,geostats,mapbox-gl-enhance' src="../../dist/mapboxgl/include-mapboxgl.js"></script>
17+
<script type="text/javascript" include='jsonsql,geostats,mapbox-gl-enhance' src="../../dist/mapboxgl/include-mapboxgl.js"></script>
1918
</head>
2019
<body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height: 100%">
2120
<div id="map" style="width: 100%;height:100%"></div>

examples/mapboxgl/iPortalWebmap_label.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
* 该示例需要引入
66
* xml-js (https://github.com/nashwaan/xml-js)
77
* jsonSQL (https://github.com/rockdragon/jsonSQL)
8-
* canvg (https://github.com/canvg/canvg)
98
* geostats (https://github.com/simogeo/geostats)
109
* mapbox-gl-enhance (https://iclient.supermap.io/web/libs/mapbox-gl-js-enhance/1.12.1/mapbox-gl-enhance.js)
1110
*********************************************************************-->
@@ -15,7 +14,7 @@
1514
<meta charset="UTF-8">
1615
<title data-i18n="resources.title_iportalWebMap_label"></title>
1716
<script type="text/javascript" src="../js/include-web.js"></script>
18-
<script type="text/javascript" include='jsonsql,canvg,geostats,mapbox-gl-enhance' src="../../dist/mapboxgl/include-mapboxgl.js"></script>
17+
<script type="text/javascript" include='jsonsql,geostats,mapbox-gl-enhance' src="../../dist/mapboxgl/include-mapboxgl.js"></script>
1918
</head>
2019
<body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height: 100%">
2120
<div id="map" style="width: 100%;height:100%"></div>

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