ztxkutils 2.10.46 → 2.10.48

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/index.js CHANGED
@@ -2,7 +2,7 @@ export { c as authority } from './authority-e6bde99f.js';
2
2
  export { d as dataModel } from './dataModel-1fbaff40.js';
3
3
  export { t as tools } from './tools-09a4d620.js';
4
4
  export { v as validate } from './validate-18e52490.js';
5
- export { r as request } from './request-ba8abf99.js';
5
+ export { r as request } from './request-2c8dff05.js';
6
6
  export { r as reqUrl } from './reqUrl-787dd9e5.js';
7
7
  import './tslib.es6-35653116.js';
8
8
  import 'dayjs';
package/dist/print.js CHANGED
@@ -387,7 +387,8 @@ function htmlToPdfNoCanvas(_a) {
387
387
  setPdfVersion(pdf);
388
388
  supportJsPdfChinese(pdf, fileBinary);
389
389
  return [4 /*yield*/, new Promise(function (resolve) {
390
- new jsPDF(pdfOptions).html(item, {
390
+ // 正确呈现文档
391
+ pdf.html(item, {
391
392
  autoPaging: 'text',
392
393
  margin: [pageMarginY, pageMarginX, pageMarginY, pageMarginX],
393
394
  width: pageWidth,
@@ -397,30 +398,63 @@ function htmlToPdfNoCanvas(_a) {
397
398
  for (var i_1 = 2, j = res.internal.getNumberOfPages(); i_1 <= j; i_1++) {
398
399
  pdf.addPage(pageFormat, pageOrient);
399
400
  }
400
- // 正确呈现文档
401
- pdf.html(item, {
402
- autoPaging: 'text',
403
- margin: [pageMarginY, pageMarginX, pageMarginY, pageMarginX],
404
- width: pageWidth,
405
- windowWidth: pageWidth,
406
- callback: function () {
407
- for (var i_2 = 1, j = res.internal.getNumberOfPages(); i_2 <= j; i_2++) {
408
- pdf.setPage(i_2);
409
- // 添加水印
410
- if (isAddWater) {
411
- setPdfWater(pdf, waterBase64, imgWidth, imgHeight);
412
- }
413
- }
414
- if (isDownload) {
415
- pdf.save(pdfName + "_" + i + ".pdf");
416
- }
417
- pdfBase64_2.push(pdf.output('dataurlstring'));
418
- pdfs_2.push(pdf);
419
- resolve({});
420
- },
421
- });
401
+ for (var i_2 = 1, j = res.internal.getNumberOfPages(); i_2 <= j; i_2++) {
402
+ pdf.setPage(i_2);
403
+ // 添加水印
404
+ if (isAddWater) {
405
+ setPdfWater(pdf, waterBase64, imgWidth, imgHeight);
406
+ }
407
+ }
408
+ if (isDownload) {
409
+ pdf.save(pdfName + "_" + i + ".pdf");
410
+ }
411
+ pdfBase64_2.push(pdf.output('dataurlstring'));
412
+ pdfs_2.push(pdf);
413
+ resolve({});
422
414
  },
423
415
  });
416
+ // new jsPDF(pdfOptions).html(item, {
417
+ // autoPaging: 'text',
418
+ // margin: [pageMarginY, pageMarginX, pageMarginY, pageMarginX],
419
+ // width: pageWidth,
420
+ // windowWidth: pageWidth,
421
+ // callback: function (res) {
422
+ // // 添加呈现的HTML所需的页面(从第2页开始)
423
+ // for (
424
+ // let i = 2, j = (res as any).internal.getNumberOfPages();
425
+ // i <= j;
426
+ // i++
427
+ // ) {
428
+ // pdf.addPage(pageFormat, pageOrient);
429
+ // }
430
+ // // 正确呈现文档
431
+ // pdf.html(item, {
432
+ // autoPaging: 'text',
433
+ // margin: [pageMarginY, pageMarginX, pageMarginY, pageMarginX],
434
+ // width: pageWidth,
435
+ // windowWidth: pageWidth,
436
+ // callback: function () {
437
+ // for (
438
+ // let i = 1, j = (res as any).internal.getNumberOfPages();
439
+ // i <= j;
440
+ // i++
441
+ // ) {
442
+ // pdf.setPage(i);
443
+ // // 添加水印
444
+ // if (isAddWater) {
445
+ // setPdfWater(pdf, waterBase64, imgWidth, imgHeight);
446
+ // }
447
+ // }
448
+ // if (isDownload) {
449
+ // pdf.save(`${pdfName}_${i}.pdf`);
450
+ // }
451
+ // pdfBase64.push(pdf.output('dataurlstring'));
452
+ // pdfs.push(pdf);
453
+ // resolve({});
454
+ // },
455
+ // });
456
+ // },
457
+ // });
424
458
  })];
425
459
  case 1:
426
460
  _b.sent();
@@ -455,7 +489,8 @@ function htmlToPdfNoCanvas(_a) {
455
489
  setPdfVersion(pdf_3);
456
490
  supportJsPdfChinese(pdf_3, fileBinary);
457
491
  return [2 /*return*/, new Promise(function (resolve) {
458
- new jsPDF(pdfOptions).html(dom, {
492
+ // 正确呈现文档
493
+ pdf_3.html(dom, {
459
494
  autoPaging: 'text',
460
495
  margin: [pageMarginY, pageMarginX, pageMarginY, pageMarginX],
461
496
  width: pageWidth_1,
@@ -465,31 +500,65 @@ function htmlToPdfNoCanvas(_a) {
465
500
  for (var i = 2, j = res.internal.getNumberOfPages(); i <= j; i++) {
466
501
  pdf_3.addPage(pageFormat, pageOrient);
467
502
  }
468
- // 正确呈现文档
469
- pdf_3.html(dom, {
470
- autoPaging: 'text',
471
- margin: [pageMarginY, pageMarginX, pageMarginY, pageMarginX],
472
- width: pageWidth_1,
473
- windowWidth: pageWidth_1,
474
- callback: function () {
475
- for (var i = 1, j = res.internal.getNumberOfPages(); i <= j; i++) {
476
- pdf_3.setPage(i);
477
- // 添加水印
478
- if (isAddWater) {
479
- setPdfWater(pdf_3, waterBase64, imgWidth, imgHeight);
480
- }
481
- }
482
- if (isDownload) {
483
- pdf_3.save(pdfName + ".pdf");
484
- }
485
- resolve({
486
- pdfs: [pdf_3],
487
- pdfBase64: [pdf_3.output('dataurlstring')],
488
- });
489
- },
503
+ for (var i = 1, j = res.internal.getNumberOfPages(); i <= j; i++) {
504
+ pdf_3.setPage(i);
505
+ // 添加水印
506
+ if (isAddWater) {
507
+ setPdfWater(pdf_3, waterBase64, imgWidth, imgHeight);
508
+ }
509
+ }
510
+ if (isDownload) {
511
+ pdf_3.save(pdfName + ".pdf");
512
+ }
513
+ resolve({
514
+ pdfs: [pdf_3],
515
+ pdfBase64: [pdf_3.output('dataurlstring')],
490
516
  });
491
517
  },
492
518
  });
519
+ // new jsPDF(pdfOptions).html(dom, {
520
+ // autoPaging: 'text',
521
+ // margin: [pageMarginY, pageMarginX, pageMarginY, pageMarginX],
522
+ // width: pageWidth,
523
+ // windowWidth: pageWidth,
524
+ // callback: function (res) {
525
+ // // 添加呈现的HTML所需的页面(从第2页开始)
526
+ // for (
527
+ // let i = 2, j = (res as any).internal.getNumberOfPages();
528
+ // i <= j;
529
+ // i++
530
+ // ) {
531
+ // pdf.addPage(pageFormat, pageOrient);
532
+ // }
533
+ // // 正确呈现文档
534
+ // pdf.html(dom, {
535
+ // autoPaging: 'text',
536
+ // margin: [pageMarginY, pageMarginX, pageMarginY, pageMarginX],
537
+ // width: pageWidth,
538
+ // windowWidth: pageWidth,
539
+ // callback: function () {
540
+ // for (
541
+ // let i = 1, j = (res as any).internal.getNumberOfPages();
542
+ // i <= j;
543
+ // i++
544
+ // ) {
545
+ // pdf.setPage(i);
546
+ // // 添加水印
547
+ // if (isAddWater) {
548
+ // setPdfWater(pdf, waterBase64, imgWidth, imgHeight);
549
+ // }
550
+ // }
551
+ // if (isDownload) {
552
+ // pdf.save(`${pdfName}.pdf`);
553
+ // }
554
+ // resolve({
555
+ // pdfs: [pdf],
556
+ // pdfBase64: [pdf.output('dataurlstring')],
557
+ // });
558
+ // },
559
+ // });
560
+ // },
561
+ // });
493
562
  })];
494
563
  }
495
564
  });