zmdms-utils 0.0.60 → 0.0.62

package/dist/es/common.js

@@ -76,7 +76,19 @@ function parseQueryParams(url) {
             var searchList = queryString.split("&");
             for (var i = 0; i < searchList.length; i++) {
                 var _a = searchList[i].split("="), key = _a[0], value = _a[1];
-                result[key] = value;
+                var val = decodeURIComponent(value);
+                if (val.startsWith("{")) {
+                    try {
+                        val = JSON.parse(val);
+                    }
+                    catch (err) {
+                        console.log("解析失败", err);
+                    }
+                }
+                else if (val === "true" || val === "false") {
+                    val = val === "true";
+                }
+                result[key] = val;
             }
         }
     }

package/dist/es/htmlToPdf.d.ts

@@ -26,6 +26,10 @@ interface IConfig {
      * pdf相关配置
      */
     pdfConfig?: IImgToPdfConfig["pdfConfig"];
+    /**
+     * 生成PDF的左边距
+     */
+    leftPadding?: number;
     /**
      * 是否下载pdf
      */

package/dist/es/htmlToPdf.js

@@ -5,7 +5,7 @@ import { domToCanvas } from './canvas.js';
 
 function htmlToPdf(config) {
     var _this = this;
-    var container = config.container, pageDom = config.pageDom, _a = config.useCanvas, useCanvas = _a === void 0 ? true : _a, isMultiple = config.isMultiple, pdfConfig = config.pdfConfig, pdfName = config.pdfName, isDownload = config.isDownload, waterConfig = config.waterConfig;
+    var container = config.container, pageDom = config.pageDom, _a = config.useCanvas, useCanvas = _a === void 0 ? true : _a, isMultiple = config.isMultiple, pdfConfig = config.pdfConfig, pdfName = config.pdfName, isDownload = config.isDownload, waterConfig = config.waterConfig, leftPadding = config.leftPadding;
     // 找到需要转换的dom
     var domList;
     if (typeof pageDom === "string") {
@@ -44,6 +44,7 @@ function htmlToPdf(config) {
                                         height: canvasHeight,
                                     },
                                     pdfConfig: pdfConfig,
+                                    leftPadding: leftPadding,
                                     pdfDownloadConfig: {
                                         isDownload: isDownload,
                                         pdfName: pdfName ? pdfName : dataTitle,
@@ -75,6 +76,7 @@ function htmlToPdf(config) {
                 pdfName: pdfName ? pdfName : dataTitle,
             },
             waterConfig: waterConfig,
+            leftPadding: leftPadding,
         });
     }
 }

package/dist/es/pdf.js

@@ -3,13 +3,13 @@ import { jsPDF } from 'jspdf';
 import dayjs from 'dayjs';
 
 function imgToPdf(config) {
-    var images = config.images, _a = config.leftPadding, leftPadding = _a === void 0 ? 20 : _a, pdfConfig = config.pdfConfig, pdfDownloadConfig = config.pdfDownloadConfig, waterConfig = config.waterConfig;
-    var _b = pdfDownloadConfig || {}, isDownload = _b.isDownload, pdfName = _b.pdfName;
+    var images = config.images, leftPadding = config.leftPadding, pdfConfig = config.pdfConfig, pdfDownloadConfig = config.pdfDownloadConfig, waterConfig = config.waterConfig;
+    var _a = pdfDownloadConfig || {}, isDownload = _a.isDownload, pdfName = _a.pdfName;
     if (Array.isArray(images)) {
         // 合并成一个pdf导出
         // 解析pdf参数
         var resultPdfConfig = parsePdfConfig(pdfConfig);
-        var _c = resultPdfConfig.format, pdfWidth_1 = _c[0], pdfHeight_1 = _c[1];
+        var _b = resultPdfConfig.format, pdfWidth_1 = _b[0], pdfHeight_1 = _b[1];
         // 创建一个新的jsPDF实例
         var pdf_1 = new jsPDF(resultPdfConfig);
         return (function () {
@@ -116,7 +116,7 @@ function parsePdfConfig(pdfConfig) {
 }
 // 将图片插入pdf中
 function insertImgToPdf(pdf, pdfWidth, pdfHeight, config) {
-    var imageConfig = config.imageConfig, _a = config.leftPadding, leftPadding = _a === void 0 ? 20 : _a, waterConfig = config.waterConfig;
+    var imageConfig = config.imageConfig, _a = config.leftPadding, leftPadding = _a === void 0 ? 15 : _a, waterConfig = config.waterConfig;
     var image = imageConfig.image, width = imageConfig.width, height = imageConfig.height;
     // 缩放图片 以适应PDF页面宽度
     var canvasWidth = width; // 图片原始宽度
@@ -124,7 +124,7 @@ function insertImgToPdf(pdf, pdfWidth, pdfHeight, config) {
     // 一页pdf能显示的canvas高度
     var pageHeight = (canvasWidth / pdfWidth) * pdfHeight;
     // 将绘制图片的宽度 设置 成pdf的宽度 （减去偏移）
-    var imgWidth = pdfWidth - leftPadding;
+    var imgWidth = pdfWidth - leftPadding * 2;
     // 等比例换算绘制图片高度
     var imgHeight = (imgWidth / canvasWidth) * canvasHeight;
     // 需要打印的图片总高度，初始状态和图片高度相等

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zmdms-utils",
-  "version": "0.0.60",
+  "version": "0.0.62",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.js",

package/src/common.ts

@@ -81,7 +81,17 @@ export function parseQueryParams(url: string): { [key: string]: string } {
       const searchList = queryString.split("&");
       for (let i = 0; i < searchList.length; i++) {
         const [key, value] = searchList[i].split("=");
-        result[key] = value;
+        let val: any = decodeURIComponent(value);
+        if (val.startsWith("{")) {
+          try {
+            val = JSON.parse(val);
+          } catch (err) {
+            console.log("解析失败", err);
+          }
+        } else if (val === "true" || val === "false") {
+          val = val === "true";
+        }
+        result[key] = val;
       }
     }
   } catch (err) {

package/src/htmlToPdf.ts

@@ -28,6 +28,10 @@ interface IConfig {
    * pdf相关配置
    */
   pdfConfig?: IImgToPdfConfig["pdfConfig"];
+  /**
+   * 生成PDF的左边距
+   */
+  leftPadding?: number;
   /**
    * 是否下载pdf
    */
@@ -48,6 +52,7 @@ export function htmlToPdf(config: IConfig) {
     pdfName,
     isDownload,
     waterConfig,
+    leftPadding,
   } = config;
   // 找到需要转换的dom
   let domList: any;
@@ -88,6 +93,7 @@ export function htmlToPdf(config: IConfig) {
             height: canvasHeight,
           },
           pdfConfig,
+          leftPadding,
           pdfDownloadConfig: {
             isDownload,
             pdfName: pdfName ? pdfName : dataTitle,
@@ -115,6 +121,7 @@ export function htmlToPdf(config: IConfig) {
         pdfName: pdfName ? pdfName : dataTitle,
       },
       waterConfig,
+      leftPadding,
     });
   }
 }

package/src/pdf.ts

@@ -3,13 +3,8 @@ import dayjs from "dayjs";
 import { IWaterResult } from "./water";
 
 export function imgToPdf(config: IImgToPdfConfig) {
-  const {
-    images,
-    leftPadding = 20,
-    pdfConfig,
-    pdfDownloadConfig,
-    waterConfig,
-  } = config;
+  const { images, leftPadding, pdfConfig, pdfDownloadConfig, waterConfig } =
+    config;
   const { isDownload, pdfName } = pdfDownloadConfig || {};
   if (Array.isArray(images)) {
     // 合并成一个pdf导出
@@ -118,7 +113,7 @@ export function insertImgToPdf(
     waterConfig?: IWaterResult;
   }
 ) {
-  const { imageConfig, leftPadding = 20, waterConfig } = config;
+  const { imageConfig, leftPadding = 15, waterConfig } = config;
   const { image, width, height } = imageConfig;
   // 缩放图片 以适应PDF页面宽度
   const canvasWidth = width; // 图片原始宽度
@@ -127,7 +122,7 @@ export function insertImgToPdf(
   // 一页pdf能显示的canvas高度
   let pageHeight = (canvasWidth / pdfWidth) * pdfHeight;
   // 将绘制图片的宽度 设置 成pdf的宽度 （减去偏移）
-  let imgWidth = pdfWidth - leftPadding;
+  let imgWidth = pdfWidth - leftPadding * 2;
   // 等比例换算绘制图片高度
   let imgHeight = (imgWidth / canvasWidth) * canvasHeight;
   // 需要打印的图片总高度，初始状态和图片高度相等