Skip to content

Commit f3b2ef8

Browse files
committed
fix 打印回调问题
1 parent 3c48e03 commit f3b2ef8

File tree

2 files changed

+29
-19
lines changed

2 files changed

+29
-19
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "electron-hiprint",
3-
"version": "1.0.8",
3+
"version": "1.0.9",
44
"description": "vue-plugin-hiprint client",
55
"main": "main.js",
66
"author": "CcSimple<[email protected]>",

src/print.js

Lines changed: 28 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -119,12 +119,15 @@ function initPrintEvent() {
119119
fs.writeFileSync(pdfPath, pdfData);
120120
printPdf(pdfPath, deviceName, data)
121121
.then(() => {
122-
socket &&
123-
socket.emit("success", {
122+
if (socket) {
123+
const result = {
124124
msg: "打印成功",
125125
templateId: data.templateId,
126126
replyId: data.replyId
127-
});
127+
};
128+
socket.emit("successs", result); // 兼容 vue-plugin-hiprint 0.0.56 之前包
129+
socket.emit("success", result);
130+
}
128131
})
129132
.catch((err) => {
130133
socket &&
@@ -152,12 +155,15 @@ function initPrintEvent() {
152155
if (isUrlPdf) {
153156
printPdf(data.pdf_path, deviceName, data)
154157
.then(() => {
155-
socket &&
156-
socket.emit("success", {
158+
if (socket) {
159+
const result = {
157160
msg: "打印成功",
158161
templateId: data.templateId,
159-
replyId: data.replyId
160-
});
162+
replyId: data.replyId,
163+
};
164+
socket.emit("successs", result); // 兼容 vue-plugin-hiprint 0.0.56 之前包
165+
socket.emit("success", result);
166+
}
161167
})
162168
.catch((err) => {
163169
socket &&
@@ -204,17 +210,21 @@ function initPrintEvent() {
204210
},
205211
(success, failureReason) => {
206212
if (socket) {
207-
success
208-
? socket.emit("success", {
209-
msg: "打印成功",
210-
templateId: data.templateId,
211-
replyId: data.replyId
212-
})
213-
: socket.emit("error", {
214-
msg: failureReason,
215-
templateId: data.templateId,
216-
replyId: data.replyId
217-
});
213+
if (success) {
214+
const result = {
215+
msg: "打印成功",
216+
templateId: data.templateId,
217+
replyId: data.replyId,
218+
};
219+
socket.emit("successs", result); // 兼容 vue-plugin-hiprint 0.0.56 之前包
220+
socket.emit("success", result);
221+
} else {
222+
socket.emit("error", {
223+
msg: failureReason,
224+
templateId: data.templateId,
225+
replyId: data.replyId,
226+
});
227+
}
218228
}
219229
// 通过 taskMap 调用 task done 回调
220230
PRINT_RUNNER_DONE[data.taskId]();

0 commit comments

Comments
 (0)