Skip to content

Commit 80541d3

Browse files
authored
Merge pull request #184 from Wang-Huan66/PrintRowspanInvalid
fix:修复生成pdf时table的rowspan属性不生效问题
2 parents 18c5dd2 + 97c8d80 commit 80541d3

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,14 @@
5656
},
5757
"dependencies": {
5858
"@claviska/jquery-minicolors": "^2.3.6",
59-
"@wtto00/html2canvas": "^1.4.3",
6059
"bwip-js": "^4.0.0",
6160
"canvg": "^3.0.10",
6261
"jquery": "^3.6.0",
6362
"jsbarcode": "^3.11.5",
6463
"jspdf": "^2.5.1",
6564
"lodash": "^4.17.21",
6665
"nzh": "^1.0.8",
67-
"socket.io-client": "^4.5.1"
66+
"socket.io-client": "^4.5.1",
67+
"dom-to-image-more": "3.7.2"
6868
}
69-
}
69+
}

src/hiprint/hiprint.bundle.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ import lImg from "./css/image/l_img.svg";
5252
import vImg from "./css/image/v_img.svg";
5353
// pdf
5454
import {jsPDF} from "jspdf";
55-
import html2canvas from "@wtto00/html2canvas";
55+
import domtoimage from 'dom-to-image-more'
5656
// 数字转中文,大写,金额
5757
import Nzh from "nzh/dist/nzh.min.js";
5858
// 解析svg 到 canvas, 二维码条形码需要
@@ -10873,7 +10873,7 @@ var hiprint = function (t) {
1087310873
var u = this.getTempContainer();
1087410874
this.svg2canvas(l), u.html(l[0]);
1087510875
var d = u.find(".hiprint-printPanel .hiprint-printPaper").length;
10876-
$(l).css("position:fixed"), html2canvas(l[0], p).then(function (t) {
10876+
$(l).css("position:fixed"), domtoimage.toCanvas(l[0], p).then(function (t) {
1087710877
var n = t.getContext("2d");
1087810878
n.mozImageSmoothingEnabled = !1, n.webkitImageSmoothingEnabled = !1, n.msImageSmoothingEnabled = !1, n.imageSmoothingEnabled = !1;
1087910879

0 commit comments

Comments
 (0)