【fix】升级canvg

Author: songyumeng

build/webpack.config.classic.js

@@ -20,7 +20,6 @@ module.exports = {
     resolve: configBase.resolve,
     externals: Object.assign({}, configBase.externals, {
         'xlsx': "function(){try{return XLSX}catch(e){return {}}}()",
-        'canvg': "function(){try{return canvg}catch(e){return {}}}()",
         'jsonsql': "function(){try{return jsonsql}catch(e){return {}}}()",
         'xml-js': "function(){try{return convert}catch(e){return {}}}()"
     }),

build/webpack.config.mapboxgl.js

@@ -32,7 +32,6 @@ module.exports = {
       'luma.gl': '(function(){try{return luma}catch(e){return {}}})()',
       'webgl-debug': '(function(){try{return webgl-debug}catch(e){return {}}})()',
       xlsx: 'function(){try{return XLSX}catch(e){return {}}}()',
-      canvg: 'function(){try{return canvg}catch(e){return {}}}()',
       '@turf/turf': 'function(){try{return turf}catch(e){return {}}}()',
       jsonsql: 'function(){try{return jsonsql}catch(e){return {}}}()',
       './L7/l7-render': 'function(){try{return L7}catch(e){return {}}}()',

build/webpack.config.maplibregl.js

@@ -31,7 +31,6 @@ module.exports = {
     'webgl-debug': '(function(){try{return webgl-debug}catch(e){return {}}})()',
     'luma.gl': '(function(){try{return luma}catch(e){return {}}})()',
     xlsx: 'function(){try{return XLSX}catch(e){return {}}}()',
-    canvg: 'function(){try{return canvg}catch(e){return {}}}()',
     jsonsql: 'function(){try{return jsonsql}catch(e){return {}}}()',
     'xml-js': 'function(){try{return convert}catch(e){return {}}}()',
     './L7/l7-render': 'function(){try{return L7}catch(e){return {}}}()',

build/webpack.config.openlayers.js

@@ -23,7 +23,6 @@ var externals = [
         'luma.gl': '(function(){try{return luma}catch(e){return {}}})()',
         'webgl-debug': '(function(){try{return webgl-debug}catch(e){return {}}})()',
         xlsx: 'function(){try{return XLSX}catch(e){return {}}}()',
-        canvg: 'function(){try{return canvg}catch(e){return {}}}()',
         jsonsql: 'function(){try{return jsonsql}catch(e){return {}}}()',
         three: 'function(){try{return THREE}catch(e){return {}}}()'
     }),

dist/mapboxgl/include-mapboxgl.js

@@ -131,9 +131,6 @@
     if (inArray(includes, 'geostats')) {
       inputScript(libsurl + '/geostats/geostats.js');
     }
-    if (inArray(includes, 'canvg')) {
-      inputScript(libsurl + '/canvg/3.0.10/umd.min.js');
-    }
     if (inArray(includes, 'XMLParser')) {
       inputScript(libsurl + '/fast-xml-parser/4.2.7/fxparser.min.js');
     }

dist/maplibregl/include-maplibregl.js

@@ -128,9 +128,6 @@
     if (inArray(includes, 'geostats')) {
       inputScript(libsurl + '/geostats/geostats.js');
     }
-    if (inArray(includes, 'canvg')) {
-      inputScript(libsurl + '/canvg/3.0.10/umd.min.js');
-    }
     if (inArray(includes, 'LegacyJSONLoader')) {
       inputScript(libsurl + '/three/0.110.0/examples/js/loaders/deprecated/LegacyJSONLoader.js');
     }

dist/ol/include-ol.js

@@ -114,9 +114,6 @@
         if (inArray(includes, 'geostats')) {
             inputScript(libsurl + '/geostats/geostats.js');
         }
-        if (inArray(includes, 'canvg')) {
-            inputScript(libsurl + '/canvg/3.0.10/umd.min.js');
-        }
         if (inArray(includes, 'tensorflow')) {
           inputScript(libsurl + '/tensorflow/3.9.0/tf.min.js');
         }

dist/openlayers/include-openlayers.js

@@ -114,9 +114,6 @@
         if (inArray(includes, 'geostats')) {
             inputScript(libsurl + '/geostats/geostats.js');
         }
-        if (inArray(includes, 'canvg')) {
-          inputScript(libsurl + '/canvg/3.0.10/umd.min.js');
-        }
         if (inArray(includes, 'tensorflow')) {
           inputScript(libsurl + '/tensorflow/3.9.0/tf.min.js');
         }

package.json

@@ -145,7 +145,7 @@
     "@turf/center": "^6.5.0",
     "@turf/meta": "^6.5.0",
     "@turf/turf": "6.5.0",
-    "canvg": "3.0.10",
+    "canvg": "^4.0.3",
     "echarts": "5.5.0",
     "fast-xml-parser": "^4.2.7",
     "fetch-ie8": "1.5.0",

src/common/mapping/WebMapV2Base.js

@@ -1,4 +1,4 @@
-import Canvg from 'canvg';
+import { Canvg } from 'canvg';
 import { coordEach } from '@turf/meta';
 import difference from 'lodash.difference';
 import { WebMapService } from './WebMapService';
@@ -548,7 +548,7 @@ export function createWebMapV2BaseExtending(SuperClass = Events, fireField = 'tr
       canvas.style.display = 'none';
       divDom.appendChild(canvas);
       if (svgUrl) {
-        const canvgs = (window.canvg || {}).default ? window.canvg.default : Canvg;
+        const canvgs = Canvg;
         const ctx = canvas.getContext('2d');
         canvgs.from(ctx, svgUrl, {
           ignoreMouse: true,

src/common/package.json

@@ -19,7 +19,7 @@
     "@supermapgis/tile-decryptor": "^1.0.0",
     "@turf/center": "^6.5.0",
     "@turf/meta": "^6.5.0",
-    "canvg": "3.0.10",
+    "canvg": "^4.0.3",
     "echarts": "5.5.0",
     "fast-xml-parser": "^4.2.7",
     "fetch-ie8": "1.5.0",

src/openlayers/core/StyleUtils.js

@@ -6,7 +6,7 @@ import { StringExt } from '@supermapgis/iclient-common/commontypes/BaseTypes';
 import { StyleMap } from '../overlay/vectortile/StyleMap';
 import { DeafultCanvasStyle } from '../overlay/vectortile/DeafultCanvasStyle';
 import { Util } from '../core/Util';
-import Canvg from 'canvg';
+import { Canvg } from 'canvg';
 import Style from 'ol/style/Style';
 import Icon from 'ol/style/Icon';
 import CircleStyle from 'ol/style/Circle';
@@ -966,7 +966,7 @@ export class StyleUtils {
    */
   static async getCanvasFromSVG(svgUrl, divDom, callBack) {
     //一个图层对应一个canvas
-    const canvgs = window.canvg && window.canvg.default ? window.canvg.default : Canvg;
+    const canvgs = Canvg;
     let canvas = document.createElement('canvas');
     canvas.id = 'dataviz-canvas-' + Util.newGuid(8);
     canvas.style.display = "none";

src/openlayers/package.json

@@ -20,7 +20,7 @@
     "@turf/turf": "6.5.0",
     "mapv": "2.0.62",
     "ol": "7.5.2",
-    "canvg": "3.0.10",
+    "canvg": "^4.0.3",
     "lodash.clonedeep": "^4.5.0",
     "lodash.remove": "^4.7.0",
     "lodash.difference": "^4.5.0",