@mapgis/leaflet-easyprint 16.6.0 → 17.0.0

package/package.json

@@ -1,29 +1,42 @@
 {
-  "name": "@mapgis/leaflet-easyprint",
-  "version": "16.6.0",
-  "description": "A leaflet plugin which adds an icon to print the map",
-  "main": "dist/bundle.js",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/rowanwins/leaflet-easyPrint.git"
-  },
-  "scripts": {
-    "build": "rollup -c",
-    "dev": "rollup -c -w"
+  "_from": "@mapgis/leaflet-easyprint@^16.6.0",
+  "_id": "@mapgis/leaflet-easyprint@16.6.0",
+  "_inBundle": false,
+  "_integrity": "sha512-5hoXt44CGxdCI+zFFHYi061FEHpbZF8CWOVCso6EUgx42CTDVzqwz2V16NcexefIIGXRt2YXXRhmS5JuQgh/NA==",
+  "_location": "/@mapgis/leaflet-easyprint",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "range",
+    "registry": true,
+    "raw": "@mapgis/leaflet-easyprint@^16.6.0",
+    "name": "@mapgis/leaflet-easyprint",
+    "escapedName": "@mapgis%2fleaflet-easyprint",
+    "scope": "@mapgis",
+    "rawSpec": "^16.6.0",
+    "saveSpec": null,
+    "fetchSpec": "^16.6.0"
   },
-  "keywords": [
-    "leaflet"
+  "_requiredBy": [
+    "/"
   ],
-  "author": "Rowan Winsemius <rowanwins@yahoo.com.au>",
-  "license": "MIT",
+  "_resolved": "http://192.168.11.130:4873/@mapgis%2fleaflet-easyprint/-/leaflet-easyprint-16.6.0.tgz",
+  "_shasum": "7661d6af855e9e48c39fa0b7322b6950baa966fb",
+  "_spec": "@mapgis/leaflet-easyprint@^16.6.0",
+  "_where": "F:\\YTR\\project\\webclient-javascript-1113\\src\\leaflet",
+  "author": {
+    "name": "Rowan Winsemius",
+    "email": "rowanwins@yahoo.com.au"
+  },
   "bugs": {
     "url": "https://github.com/rowanwins/leaflet-easyPrint/issues"
   },
-  "homepage": "https://github.com/rowanwins/leaflet-easyPrint#readme",
+  "bundleDependencies": false,
   "dependencies": {
     "dom-to-image": "^2.5.2",
     "file-saver": "^1.3.3"
   },
+  "deprecated": false,
+  "description": "A leaflet plugin which adds an icon to print the map",
   "devDependencies": {
     "babel-plugin-external-helpers": "^6.22.0",
     "babel-preset-latest": "^6.24.1",
@@ -35,5 +48,19 @@
     "rollup-plugin-node-resolve": "^3.0.0",
     "rollup-plugin-uglify": "^1.0.2",
     "rollup-watch": "^3.2.2"
-  }
+  },
+  "homepage": "https://github.com/rowanwins/leaflet-easyPrint#readme",
+  "keywords": [
+    "leaflet"
+  ],
+  "license": "MIT",
+  "main": "dist/bundle.js",
+  "name": "@mapgis/leaflet-easyprint",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/rowanwins/leaflet-easyPrint.git"
+  },
+  "scripts": {
+  },
+  "version": "17.0.0"
 }

package/src/index.js

@@ -198,27 +198,46 @@ function EasyPrint(L) {
         }
       }, plugin.options.tileWait);
     },
-  
+
+    _getValidDom: function(dom){
+      // var cloneDom = dom.cloneNode(true)
+      var cloneDom = dom
+      var leafletTileDoms = cloneDom.getElementsByClassName("leaflet-tile")
+      for(var i = 0; i < leafletTileDoms.length; i++){
+        var el = leafletTileDoms[i]
+        if ( !el.classList.contains('leaflet-tile-loaded') && el.parentElement.classList.contains('leaflet-tile-container')) {
+          el.remove()
+          i --
+        }
+      }
+      dom.parentNode.appendChild(cloneDom)
+      return cloneDom
+    },
+
     _printOpertion: function (sizemode) {
       var plugin = this;
-      
-      var widthForExport = this.options.width
-      // var widthForExport = this.mapContainer.style.width
-      var heightForExport = this.options.height
+      var widthForExport = this.mapContainer.style.width
+      // var widthForExport = this.options.width
+      // var heightForExport = this.options.height
+      var isDownload = this.options.isDownload
       if (this.originalState.widthWasAuto && sizemode === 'CurrentSize' || this.originalState.widthWasPercentage && sizemode === 'CurrentSize') {
         widthForExport = this.originalState.mapWidth
       }
       
       return new Promise((resolve)=>{
-        domtoimage[this.formatFun](plugin.mapContainer, {
+        domtoimage[this.formatFun]( plugin._getValidDom(plugin.mapContainer), {
         // domtoimage.toPng(plugin.mapContainer, {
+            // width: parseInt(widthForExport),
+            // height: parseInt(heightForExport)
             width: parseInt(widthForExport),
-            height: parseInt(heightForExport)
+            height: parseInt(plugin.mapContainer.style.height.replace('px'))
           })
           .then(function (dataUrl) {
               var blob = plugin._dataURItoBlob(dataUrl);
               if (plugin.options.exportOnly) {
-                fileSaver.saveAs(blob, plugin.options.filename + '.' + plugin.format);
+                if (isDownload) {
+                  fileSaver.saveAs(blob, plugin.options.filename + '.' + plugin.format);
+                }
               } else {
                 plugin._sendToBrowserPrint(dataUrl, plugin.orientation);
               }
@@ -472,8 +491,6 @@ function EasyPrint(L) {
   L.EasyPrint = function(options) {
     return new L.Control.EasyPrint(options);
   };
-  console.log("1--"+L.EasyPrint)
-  
 }
 
 export default EasyPrint