ztxkutils 2.10.28 → 2.10.29

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/print.d.ts CHANGED
@@ -31,11 +31,12 @@ export declare function htmlToPdf({ pageClassName, dom, pdfName, isShowPage, noW
31
31
  imgPositionX?: number;
32
32
  waterText?: string;
33
33
  }): Promise<jsPDF>;
34
- export declare function htmlToPdfUseCanvas({ pageClassName, dom, pdfName, isShowPage, noWater, pdfOptions, imgPositionX, isDownload, }: {
34
+ export declare function htmlToPdfUseCanvas({ pageClassName, dom, pdfName, isShowPage, isOnlyOne, noWater, pdfOptions, imgPositionX, isDownload, }: {
35
35
  pageClassName?: string;
36
36
  dom: HTMLElement;
37
37
  pdfName: string;
38
38
  isShowPage?: boolean;
39
+ isOnlyOne?: boolean;
39
40
  noWater?: boolean;
40
41
  pdfOptions?: any;
41
42
  imgPositionX?: number;
package/dist/print.js CHANGED
@@ -232,7 +232,7 @@ function htmlToPdf(_a) {
232
232
  }
233
233
  }
234
234
  function htmlToPdfUseCanvas(_a) {
235
- var pageClassName = _a.pageClassName, dom = _a.dom, pdfName = _a.pdfName, isShowPage = _a.isShowPage, noWater = _a.noWater, pdfOptions = _a.pdfOptions, imgPositionX = _a.imgPositionX, isDownload = _a.isDownload;
235
+ var pageClassName = _a.pageClassName, dom = _a.dom, pdfName = _a.pdfName, isShowPage = _a.isShowPage, isOnlyOne = _a.isOnlyOne, noWater = _a.noWater, pdfOptions = _a.pdfOptions, imgPositionX = _a.imgPositionX, isDownload = _a.isDownload;
236
236
  var allDom = document.querySelectorAll(pageClassName ? pageClassName : '.html2canvas-container-page');
237
237
  var format = (pdfOptions === null || pdfOptions === void 0 ? void 0 : pdfOptions.format) || [632.28, 841.89];
238
238
  var _pdfOptions = __assign({ unit: 'pt', format: format }, (pdfOptions || {}));
@@ -245,17 +245,59 @@ function htmlToPdfUseCanvas(_a) {
245
245
  scale: 2,
246
246
  });
247
247
  });
248
+ if (isOnlyOne) {
249
+ var pdf_1 = new jsPDF(_pdfOptions);
250
+ return (function () {
251
+ return __awaiter(this, void 0, void 0, function () {
252
+ var i, _i, promiseAllDomArray_4, item, canvas;
253
+ return __generator(this, function (_a) {
254
+ switch (_a.label) {
255
+ case 0:
256
+ i = 0;
257
+ _i = 0, promiseAllDomArray_4 = promiseAllDomArray_3;
258
+ _a.label = 1;
259
+ case 1:
260
+ if (!(_i < promiseAllDomArray_4.length)) return [3 /*break*/, 4];
261
+ item = promiseAllDomArray_4[_i];
262
+ i++;
263
+ return [4 /*yield*/, item];
264
+ case 2:
265
+ canvas = _a.sent();
266
+ createPdf(canvas, pdf_1, noWater, imgPositionX, {
267
+ width: format === null || format === void 0 ? void 0 : format[0],
268
+ height: format === null || format === void 0 ? void 0 : format[1],
269
+ });
270
+ if (i < promiseAllDomArray_3.length) {
271
+ pdf_1.addPage();
272
+ }
273
+ _a.label = 3;
274
+ case 3:
275
+ _i++;
276
+ return [3 /*break*/, 1];
277
+ case 4:
278
+ if (isDownload) {
279
+ pdf_1.save(pdfName + ".pdf");
280
+ }
281
+ return [2 /*return*/, Promise.resolve({
282
+ pdfs: [pdf_1],
283
+ pdfBase64: [pdf_1.output('dataurlstring')],
284
+ })];
285
+ }
286
+ });
287
+ });
288
+ })();
289
+ }
248
290
  return (function () {
249
291
  return __awaiter(this, void 0, void 0, function () {
250
- var _i, promiseAllDomArray_4, item, pdf, canvas;
292
+ var _i, promiseAllDomArray_5, item, pdf, canvas;
251
293
  return __generator(this, function (_a) {
252
294
  switch (_a.label) {
253
295
  case 0:
254
- _i = 0, promiseAllDomArray_4 = promiseAllDomArray_3;
296
+ _i = 0, promiseAllDomArray_5 = promiseAllDomArray_3;
255
297
  _a.label = 1;
256
298
  case 1:
257
- if (!(_i < promiseAllDomArray_4.length)) return [3 /*break*/, 4];
258
- item = promiseAllDomArray_4[_i];
299
+ if (!(_i < promiseAllDomArray_5.length)) return [3 /*break*/, 4];
300
+ item = promiseAllDomArray_5[_i];
259
301
  pdf = new jsPDF(_pdfOptions);
260
302
  return [4 /*yield*/, item];
261
303
  case 2:
@@ -283,18 +325,18 @@ function htmlToPdfUseCanvas(_a) {
283
325
  })();
284
326
  }
285
327
  else {
286
- var pdf_1 = new jsPDF(_pdfOptions);
328
+ var pdf_2 = new jsPDF(_pdfOptions);
287
329
  return html2canvas(dom, { scale: 2 }).then(function (canvas) {
288
- createPdf(canvas, pdf_1, noWater, imgPositionX, {
330
+ createPdf(canvas, pdf_2, noWater, imgPositionX, {
289
331
  width: format === null || format === void 0 ? void 0 : format[0],
290
332
  height: format === null || format === void 0 ? void 0 : format[1],
291
333
  });
292
334
  if (isDownload) {
293
- pdf_1.save(pdfName + ".pdf");
335
+ pdf_2.save(pdfName + ".pdf");
294
336
  }
295
337
  return {
296
- pdfs: [pdf_1],
297
- pdfBase64: [pdf_1.output('dataurlstring')],
338
+ pdfs: [pdf_2],
339
+ pdfBase64: [pdf_2.output('dataurlstring')],
298
340
  };
299
341
  });
300
342
  }
@@ -303,7 +345,7 @@ function htmlToPdfNoCanvas(_a) {
303
345
  var _b, _c;
304
346
  var pageClassName = _a.pageClassName, dom = _a.dom, isShowPage = _a.isShowPage, fileBinary = _a.fileBinary, pdfName = _a.pdfName, isDownload = _a.isDownload, pdfOption = _a.pdfOption, isAddWater = _a.isAddWater, waterBase64 = _a.waterBase64, imgWidth = _a.imgWidth, imgHeight = _a.imgHeight, isCompress = _a.isCompress; _a.waterText;
305
347
  return __awaiter(this, void 0, void 0, function () {
306
- var allDom, pageFormat, pageOrient, pageMarginX, pageMarginY, pdfOptions, allDomArray_1, pdfBase64_2, pdfs_2, pdf_2, pageWidth_1;
348
+ var allDom, pageFormat, pageOrient, pageMarginX, pageMarginY, pdfOptions, allDomArray_1, pdfBase64_2, pdfs_2, pdf_3, pageWidth_1;
307
349
  return __generator(this, function (_d) {
308
350
  allDom = dom.querySelectorAll(pageClassName ? pageClassName : '.html2canvas-container-page');
309
351
  pageFormat = (pdfOption === null || pdfOption === void 0 ? void 0 : pdfOption.pageFormat) ? pdfOption.pageFormat : 'a4';
@@ -408,10 +450,10 @@ function htmlToPdfNoCanvas(_a) {
408
450
  })()];
409
451
  }
410
452
  else {
411
- pdf_2 = new jsPDF(pdfOptions);
412
- pageWidth_1 = pdf_2.internal.pageSize.width - pageMarginX * 2;
413
- setPdfVersion(pdf_2);
414
- supportJsPdfChinese(pdf_2, fileBinary);
453
+ pdf_3 = new jsPDF(pdfOptions);
454
+ pageWidth_1 = pdf_3.internal.pageSize.width - pageMarginX * 2;
455
+ setPdfVersion(pdf_3);
456
+ supportJsPdfChinese(pdf_3, fileBinary);
415
457
  return [2 /*return*/, new Promise(function (resolve) {
416
458
  new jsPDF(pdfOptions).html(dom, {
417
459
  autoPaging: 'text',
@@ -421,28 +463,28 @@ function htmlToPdfNoCanvas(_a) {
421
463
  callback: function (res) {
422
464
  // 添加呈现的HTML所需的页面(从第2页开始)
423
465
  for (var i = 2, j = res.internal.getNumberOfPages(); i <= j; i++) {
424
- pdf_2.addPage(pageFormat, pageOrient);
466
+ pdf_3.addPage(pageFormat, pageOrient);
425
467
  }
426
468
  // 正确呈现文档
427
- pdf_2.html(dom, {
469
+ pdf_3.html(dom, {
428
470
  autoPaging: 'text',
429
471
  margin: [pageMarginY, pageMarginX, pageMarginY, pageMarginX],
430
472
  width: pageWidth_1,
431
473
  windowWidth: pageWidth_1,
432
474
  callback: function () {
433
475
  for (var i = 1, j = res.internal.getNumberOfPages(); i <= j; i++) {
434
- pdf_2.setPage(i);
476
+ pdf_3.setPage(i);
435
477
  // 添加水印
436
478
  if (isAddWater) {
437
- setPdfWater(pdf_2, waterBase64, imgWidth, imgHeight);
479
+ setPdfWater(pdf_3, waterBase64, imgWidth, imgHeight);
438
480
  }
439
481
  }
440
482
  if (isDownload) {
441
- pdf_2.save(pdfName + ".pdf");
483
+ pdf_3.save(pdfName + ".pdf");
442
484
  }
443
485
  resolve({
444
- pdfs: [pdf_2],
445
- pdfBase64: [pdf_2.output('dataurlstring')],
486
+ pdfs: [pdf_3],
487
+ pdfBase64: [pdf_3.output('dataurlstring')],
446
488
  });
447
489
  },
448
490
  });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ztxkutils",
3
- "version": "2.10.28",
3
+ "version": "2.10.29",
4
4
  "description": "",
5
5
  "main": "./dist/index.js",
6
6
  "module": "./dist/index.js",