ztxkutils 2.10.66-31 → 2.10.66-32

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.
Files changed (2) hide show
  1. package/dist/print.js +17 -8
  2. package/package.json +112 -112
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
  // 添加水印
package/package.json CHANGED
@@ -1,112 +1,112 @@
1
- {
2
- "name": "ztxkutils",
3
- "version": "2.10.66-31",
4
- "description": "",
5
- "main": "./dist/index.js",
6
- "module": "./dist/index.js",
7
- "types": "./dist/index.d.js",
8
- "scripts": {
9
- "build": "rollup -c",
10
- "prepublish": "yarn build"
11
- },
12
- "files": [
13
- "dist",
14
- "./zti18n-cli",
15
- "./zti18n-core",
16
- "./locales"
17
- ],
18
- "keywords": [],
19
- "author": "ZTXK",
20
- "license": "MIT",
21
- "bin": {
22
- "zti18n": "./zti18n-cli/bin/index.js"
23
- },
24
- "devDependencies": {
25
- "@rollup/plugin-commonjs": "^19.0.0",
26
- "@rollup/plugin-json": "^4.1.0",
27
- "@rollup/plugin-node-resolve": "^13.0.0",
28
- "@types/crypto-js": "^4.0.1",
29
- "@types/react": "^17.0.0",
30
- "@types/react-dom": "^17.0.0",
31
- "@typescript-eslint/eslint-plugin": "^4.19.0",
32
- "@typescript-eslint/parser": "^4.19.0",
33
- "axios": "^0.21.1",
34
- "dayjs": "^1.10.4",
35
- "eslint": "^7.22.0",
36
- "eslint-config-prettier": "^8.1.0",
37
- "eslint-plugin-prettier": "^3.3.1",
38
- "eslint-webpack-plugin": "^2.5.4",
39
- "html2canvas": "^1.4.1",
40
- "jspdf": "^2.5.1",
41
- "lodash": "^4.17.21",
42
- "number-precision": "^1.5.0",
43
- "prettier": "^2.2.1",
44
- "pubsub-js": "^1.9.3",
45
- "react": "^17.0.2",
46
- "react-dom": "^17.0.1",
47
- "react-router-dom": "5.2",
48
- "rollup": "^2.47.0",
49
- "rollup-plugin-typescript2": "^0.30.0",
50
- "ts-loader": "^8.0.18",
51
- "tslib": "^2.2.0",
52
- "typescript": "^4.2.4",
53
- "ztxkui": "^0.4.1"
54
- },
55
- "dependencies": {
56
- "@babel/core": "^7.18.10",
57
- "@babel/generator": "^7.18.0",
58
- "@babel/plugin-proposal-optional-chaining": "^7.18.9",
59
- "@babel/plugin-syntax-async-generators": "^7.8.4",
60
- "@babel/plugin-syntax-class-properties": "^7.12.13",
61
- "@babel/plugin-syntax-decorators": "^7.18.6",
62
- "@babel/plugin-syntax-do-expressions": "^7.18.6",
63
- "@babel/plugin-syntax-dynamic-import": "^7.8.3",
64
- "@babel/plugin-syntax-flow": "^7.18.6",
65
- "@babel/plugin-syntax-function-bind": "^7.18.6",
66
- "@babel/plugin-syntax-function-sent": "^7.18.6",
67
- "@babel/plugin-syntax-jsx": "^7.18.6",
68
- "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
69
- "@babel/preset-typescript": "^7.18.6",
70
- "@babel/traverse": "^7.18.10",
71
- "@babel/types": "^7.18.10",
72
- "@prettier/plugin-pug": "^1.8.1",
73
- "@typescript-eslint/typescript-estree": "^3.8.0",
74
- "babel-template": "^6.26.0",
75
- "chalk": "^3.0.0",
76
- "commander": "^2.18.0",
77
- "crypto-js": "^4.1.1",
78
- "decimal.js-light": "^2.5.1",
79
- "dexie": "^3.2.3",
80
- "di18n-core": "^0.1.29",
81
- "glob": "^7.1.6",
82
- "i18next": "^23.16.4",
83
- "inquirer": "^6.2.2",
84
- "js-base64": "^3.6.0",
85
- "jwt-decode": "^3.1.2",
86
- "mustache": "^4.0.1",
87
- "parse5": "^5.1.1",
88
- "pug-lexer": "^4.1.0",
89
- "pug-parser": "^5.0.1",
90
- "pug-source-gen": "0.0.2",
91
- "screenfull": "^5.1.0",
92
- "sockjs-client": "^1.5.1",
93
- "stompjs": "^2.3.3",
94
- "vue-template-compiler": "^2.7.16",
95
- "zt-sockjs-client": "^0.0.2",
96
- "zt-stompjs": "^1.1.2"
97
- },
98
- "peerDependencies": {
99
- "axios": ">=0.21.1",
100
- "dayjs": ">=1.10.4",
101
- "html2canvas": ">=1.4.1",
102
- "jspdf": ">=2.5.1",
103
- "lodash": ">=4.17.21",
104
- "number-precision": ">=1.5.0",
105
- "react": ">=17.0.1",
106
- "react-dom": ">=17.0.1",
107
- "react-router-dom": ">=5.2.0",
108
- "zt-sockjs-client": ">=0.0.1",
109
- "zt-stompjs": ">=1.0.3",
110
- "ztxkui": ">=0.4.1"
111
- }
112
- }
1
+ {
2
+ "name": "ztxkutils",
3
+ "version": "2.10.66-32",
4
+ "description": "",
5
+ "main": "./dist/index.js",
6
+ "module": "./dist/index.js",
7
+ "types": "./dist/index.d.js",
8
+ "scripts": {
9
+ "build": "rollup -c",
10
+ "prepublish": "yarn build"
11
+ },
12
+ "files": [
13
+ "dist",
14
+ "./zti18n-cli",
15
+ "./zti18n-core",
16
+ "./locales"
17
+ ],
18
+ "keywords": [],
19
+ "author": "ZTXK",
20
+ "license": "MIT",
21
+ "bin": {
22
+ "zti18n": "./zti18n-cli/bin/index.js"
23
+ },
24
+ "devDependencies": {
25
+ "@rollup/plugin-commonjs": "^19.0.0",
26
+ "@rollup/plugin-json": "^4.1.0",
27
+ "@rollup/plugin-node-resolve": "^13.0.0",
28
+ "@types/crypto-js": "^4.0.1",
29
+ "@types/react": "^17.0.0",
30
+ "@types/react-dom": "^17.0.0",
31
+ "@typescript-eslint/eslint-plugin": "^4.19.0",
32
+ "@typescript-eslint/parser": "^4.19.0",
33
+ "axios": "^0.21.1",
34
+ "dayjs": "^1.10.4",
35
+ "eslint": "^7.22.0",
36
+ "eslint-config-prettier": "^8.1.0",
37
+ "eslint-plugin-prettier": "^3.3.1",
38
+ "eslint-webpack-plugin": "^2.5.4",
39
+ "html2canvas": "^1.4.1",
40
+ "jspdf": "^2.5.1",
41
+ "lodash": "^4.17.21",
42
+ "number-precision": "^1.5.0",
43
+ "prettier": "^2.2.1",
44
+ "pubsub-js": "^1.9.3",
45
+ "react": "^17.0.2",
46
+ "react-dom": "^17.0.1",
47
+ "react-router-dom": "5.2",
48
+ "rollup": "^2.47.0",
49
+ "rollup-plugin-typescript2": "^0.30.0",
50
+ "ts-loader": "^8.0.18",
51
+ "tslib": "^2.2.0",
52
+ "typescript": "^4.2.4",
53
+ "ztxkui": "^0.4.1"
54
+ },
55
+ "dependencies": {
56
+ "@babel/core": "^7.18.10",
57
+ "@babel/generator": "^7.18.0",
58
+ "@babel/plugin-proposal-optional-chaining": "^7.18.9",
59
+ "@babel/plugin-syntax-async-generators": "^7.8.4",
60
+ "@babel/plugin-syntax-class-properties": "^7.12.13",
61
+ "@babel/plugin-syntax-decorators": "^7.18.6",
62
+ "@babel/plugin-syntax-do-expressions": "^7.18.6",
63
+ "@babel/plugin-syntax-dynamic-import": "^7.8.3",
64
+ "@babel/plugin-syntax-flow": "^7.18.6",
65
+ "@babel/plugin-syntax-function-bind": "^7.18.6",
66
+ "@babel/plugin-syntax-function-sent": "^7.18.6",
67
+ "@babel/plugin-syntax-jsx": "^7.18.6",
68
+ "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
69
+ "@babel/preset-typescript": "^7.18.6",
70
+ "@babel/traverse": "^7.18.10",
71
+ "@babel/types": "^7.18.10",
72
+ "@prettier/plugin-pug": "^1.8.1",
73
+ "@typescript-eslint/typescript-estree": "^3.8.0",
74
+ "babel-template": "^6.26.0",
75
+ "chalk": "^3.0.0",
76
+ "commander": "^2.18.0",
77
+ "crypto-js": "^4.1.1",
78
+ "decimal.js-light": "^2.5.1",
79
+ "dexie": "^3.2.3",
80
+ "di18n-core": "^0.1.29",
81
+ "glob": "^7.1.6",
82
+ "i18next": "^23.16.4",
83
+ "inquirer": "^6.2.2",
84
+ "js-base64": "^3.6.0",
85
+ "jwt-decode": "^3.1.2",
86
+ "mustache": "^4.0.1",
87
+ "parse5": "^5.1.1",
88
+ "pug-lexer": "^4.1.0",
89
+ "pug-parser": "^5.0.1",
90
+ "pug-source-gen": "0.0.2",
91
+ "screenfull": "^5.1.0",
92
+ "sockjs-client": "^1.5.1",
93
+ "stompjs": "^2.3.3",
94
+ "vue-template-compiler": "^2.7.16",
95
+ "zt-sockjs-client": "^0.0.2",
96
+ "zt-stompjs": "^1.1.2"
97
+ },
98
+ "peerDependencies": {
99
+ "axios": ">=0.21.1",
100
+ "dayjs": ">=1.10.4",
101
+ "html2canvas": ">=1.4.1",
102
+ "jspdf": ">=2.5.1",
103
+ "lodash": ">=4.17.21",
104
+ "number-precision": ">=1.5.0",
105
+ "react": ">=17.0.1",
106
+ "react-dom": ">=17.0.1",
107
+ "react-router-dom": ">=5.2.0",
108
+ "zt-sockjs-client": ">=0.0.1",
109
+ "zt-stompjs": ">=1.0.3",
110
+ "ztxkui": ">=0.4.1"
111
+ }
112
+ }