ztxkutils 2.10.66-31 → 2.10.66-33

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 { d as authority } from './authority-7a91cb9f.js';
2
2
  export { d as dataModel } from './dataModel-f1ef06bc.js';
3
3
  export { t as tools } from './tools-390e3466.js';
4
4
  export { v as validate } from './validate-2138d94a.js';
5
- export { r as request } from './request-40e9ca7b.js';
5
+ export { r as request } from './request-7bcf02f4.js';
6
6
  export { r as reqUrl } from './reqUrl-ea7ef876.js';
7
7
  import './i18next.js';
8
8
  import './tslib.es6-35653116.js';
package/dist/print.js CHANGED
@@ -396,11 +396,16 @@ function htmlToPdfNoCanvas(_a) {
396
396
  windowWidth: pageWidth,
397
397
  callback: function (res) {
398
398
  // 添加呈现的HTML所需的页面(从第2页开始)
399
- for (var i_1 = 2, j = res.internal.getNumberOfPages(); i_1 <= j; i_1++) {
400
- pdf.addPage(pageFormat, pageOrient);
401
- }
402
- for (var i_2 = 1, j = res.internal.getNumberOfPages(); i_2 <= j; i_2++) {
403
- pdf.setPage(i_2);
399
+ // 注释掉这里导致多出一页空白页
400
+ // for (
401
+ // let i = 2, j = (res as any).internal.getNumberOfPages();
402
+ // i <= j;
403
+ // i++
404
+ // ) {
405
+ // pdf.addPage(pageFormat, pageOrient);
406
+ // }
407
+ for (var i_1 = 1, j = res.internal.getNumberOfPages(); i_1 <= j; i_1++) {
408
+ pdf.setPage(i_1);
404
409
  // 添加水印
405
410
  if (isAddWater) {
406
411
  setPdfWater(pdf, waterBase64, imgWidth, imgHeight);
@@ -498,9 +503,13 @@ function htmlToPdfNoCanvas(_a) {
498
503
  windowWidth: pageWidth_1,
499
504
  callback: function (res) {
500
505
  // 添加呈现的HTML所需的页面(从第2页开始)
501
- for (var i = 2, j = res.internal.getNumberOfPages(); i <= j; i++) {
502
- pdf_3.addPage(pageFormat, pageOrient);
503
- }
506
+ // for (
507
+ // let i = 2, j = (res as any).internal.getNumberOfPages();
508
+ // i <= j;
509
+ // i++
510
+ // ) {
511
+ // pdf.addPage(pageFormat, pageOrient);
512
+ // }
504
513
  for (var i = 1, j = res.internal.getNumberOfPages(); i <= j; i++) {
505
514
  pdf_3.setPage(i);
506
515
  // 添加水印