yh-hiprint 2.6.5 → 2.6.6

package/index.js

@@ -1,12 +1,20 @@
 import './libs/jquery';
-import { ElDialog, ElSelect, ElOption, ElButton, ElMessageBox, ElLoading } from 'element-plus';
+import { ElDialog, ElSelect, ElOption, ElButton, ElMessageBox,ElLoading } from 'element-plus';
+import { createApp,createVNode } from 'vue';
 export { hiprint, defaultElementTypeProvider, print, print2, usePaper, useScale, useDataSource } from './hooks/useHiprint';
 export { default as fontSize } from './font-size';
 export { default as scale } from './scale';
 export { default as zIndex } from './z-index';
 export { default as panel } from './panel';
 import { getPrintTemplate } from 'yh-hiprint/libs/index.js';
-import { createVNode, render, createApp } from 'vue';
+import printCss from 'yh-hiprint/libs/css/print-lock.css?inline';
+
+export function guid () {
+  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (t) {
+    var e = (16 * Math.random()) | 0;
+    return ('x' == t ? e : (3 & e) | 8).toString(16);
+  });
+}
 
 export function cLog (string, isError = false) {
   if (isError) {
@@ -17,7 +25,7 @@ export function cLog (string, isError = false) {
 }
 
 const hiprintFun = async ({ code, params, data, isCustom, returnHtml }) => {
-  if (hiprint.hiwebSocket && hiprint.hiwebSocket.opened) {
+  if (electronBrowserAPI && electronBrowserAPI.print) {
     clientPrintHandler(code, params, data);
   } else {
     let height = document.documentElement.clientHeight;
@@ -120,15 +128,8 @@ const clientPrintHandler = async (code, params, data) => {
 
     loading.setText("正在连接打印客户端");
 
-    // 检查客户端是否连接
-    if (!hiprint.hiwebSocket.opened) {
-      loading?.close();
-      ElMessageBox.alert("打印客户端未连接", '提示');
-      return false;
-    }
-
     // 获取打印机列表
-    let printerList = hiprint.hiwebSocket.getPrinterList();
+    let printerList = await electronBrowserAPI.getPrinterList();
     if (!printerList || printerList.length === 0) {
       loading?.close();
       ElMessageBox.alert("未获取到打印机列表", '提示');
@@ -162,6 +163,10 @@ const showPrinterSelectionDialog = (printerList, templateJson, templateData, tem
       json = JSON.parse(templateJson);
     } catch (error) {
       console.error('客户端打印解析模板失败：', error);
+      ElMessageBox.alert('客户端打印解析模板失败', '提示');
+      document.body.removeChild(mountPoint);
+      resolve(false);
+      return;
     }
     // 创建挂载点
     const mountPoint = document.createElement('div');
@@ -200,41 +205,73 @@ const showPrinterSelectionDialog = (printerList, templateJson, templateData, tem
             let hiprintTemplate = new hiprint.PrintTemplate({ template: json });
 
             loading.setText("正在发送打印任务");
-
-            // 发送到客户端打印
-            hiprintTemplate.print2(data || templateData, {
+            const newGuid = guid();
+            const printOption = {
               printer: this.selectedPrinter,
               title: templateName,
+              imgToBase64: true,
+              id: newGuid,
+              templateId: newGuid,
               pageSize: {
                 width: (json?.panels[0]?.width || 210) * 1000,
                 height: (json?.panels[0]?.height || 297) * 1000
               }
-            });
+            };
+            const pCss = `<style rel="stylesheet" type="text/css">${printCss}</style>`;
+            const html = hiprintTemplate.getHtml(data || templateData, printOption)[0].outerHTML;
+
+            printOption.html = `${pCss}${html}`;
 
             // 监听打印结果
-            const printSuccessHandler = (result) => {
-              loading.close();
-              ElMessageBox.alert("打印任务已发送到打印机", '提示');
-              cleanup();
-              this.handleClose(true);
+            const handlePrintResult = (event) => {
+              if (event.data && event.data.type) {
+                switch (event.data.type) {
+                  case 'PRINT_SUCCESS':
+                    loading.close();
+                    this.handleClose(true);
+                    ElMessage.success("打印任务已发送到打印机");
+                    // 移除事件监听器
+                    window.removeEventListener('message', handlePrintResult);
+                    clearTimeout(timeoutId);
+                    break;
+                  case 'PRINT_ERROR':
+                    loading.close();
+                    const error = event.data.data;
+                    ElMessageBox.alert("打印失败: " + (error.msg || "未知错误"), '提示');
+                    this.handleClose(false);
+                    // 移除事件监听器
+                    window.removeEventListener('message', handlePrintResult);
+                    clearTimeout(timeoutId);
+                    break;
+                  default:
+                    break;
+                }
+              }
             };
 
-            const printErrorHandler = (error) => {
+            // 添加事件监听器
+            window.addEventListener('message', handlePrintResult);
+            
+            // 添加超时机制，防止监听器泄漏
+            const timeoutId = setTimeout(() => {
+              window.removeEventListener('message', handlePrintResult);
               loading.close();
-              ElMessageBox.alert("打印失败: " + (error.msg || "未知错误"), '提示');
-              cleanup();
+              ElMessageBox.alert("打印超时", '提示');
               this.handleClose(false);
-            };
-
-            // 注册事件监听器
-            hiprint.hiwebSocket.socket.on('success', printSuccessHandler);
-            hiprint.hiwebSocket.socket.on('error', printErrorHandler);
+            }, 60*1000); // 30秒超时
+            
+            // 发送到客户端打印
+            try {
+              electronBrowserAPI.print(printOption);
+            } catch (error) {
+              console.error('客户端打印发送失败：', error);
+              loading.close();
+              window.removeEventListener('message', handlePrintResult);
+              clearTimeout(timeoutId);
+              ElMessageBox.alert("客户端打印发送失败: " + error.message, '提示');
+              this.handleClose(false);
+            }
 
-            // 清理函数
-            const cleanup = () => {
-              hiprint.hiwebSocket.socket.off('success', printSuccessHandler);
-              hiprint.hiwebSocket.socket.off('error', printErrorHandler);
-            };
 
           } catch (error) {
             if (loading) {
@@ -247,12 +284,10 @@ const showPrinterSelectionDialog = (printerList, templateJson, templateData, tem
         },
         handleClose: function (result = false) {
           this.visible = false;
-          // 延迟销毁，确保动画完成
-          setTimeout(() => {
-            app.unmount();
-            document.body.removeChild(mountPoint);
-            resolve(result);
-          }, 300);
+          // 移除固定延迟，直接执行卸载逻辑
+          app.unmount();
+          document.body.removeChild(mountPoint);
+          resolve(result);
         }
       },
       render () {
@@ -309,41 +344,10 @@ const showPrinterSelectionDialog = (printerList, templateJson, templateData, tem
 // window.silentHiprint = silentHiprint;
 
 export default {
-  install (app, { router, pinia, isAdmin, clientPrint = false, clientUrl = 'http://localhost:17521', clientApp = "https://gitee.com/CcSimple/electron-hiprint/releases", clinetTip = false }) {
+  install (app, { router, pinia, isAdmin, clientPrint = false }) {
     app.provide('$hiprint', hiprintFun);
     app.provide('$silentHiprint', silentHiprint);
 
-    // 如果启用了客户端打印，初始化连接
-    if (clientPrint) {
-      // 确保DOM加载完成后再启动连接
-      const initializeClientPrint = () => {
-        if (hiprint.hiwebSocket && !hiprint.hiwebSocket.opened) {
-          window.hiwebSocket.host = clientUrl;
-          hiprint.hiwebSocket.start();
-          if (clinetTip) {
-            // 添加连接状态检查和提示逻辑
-            setTimeout(() => {
-              if (!hiprint.hiwebSocket.opened) {
-                ElMessageBox.alert(
-                  `连接【${clientUrl}】失败！<br>请确保已<a href="${clientApp}" target="_blank">下载</a>并<a href="hiprint://" target="_blank">运行</a>打印客户端！`,
-                  '客户端未连接',
-                  {
-                    dangerouslyUseHTMLString: true,
-                    confirmButtonText: '确定'
-                  }
-                );
-              }
-            }, 3000);
-          }
-        }
-      };
-
-      if (document.readyState === 'loading') {
-        document.addEventListener('DOMContentLoaded', initializeClientPrint);
-      } else {
-        initializeClientPrint();
-      }
-    }
 
     if (router) {
       router.addRoute('Index', {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yh-hiprint",
-  "version": "2.6.5",
+  "version": "2.6.6",
   "description": "Hiprint for Vue3 by NoahLiu in ForceCon in Hunan Changesha",
   "main": "index.js",
   "types": "index.d.ts",
@@ -10,21 +10,11 @@
     "pub:npm": "npm publish --registry https://registry.npmjs.org/ --no-git-checks"
   },
   "dependencies": {
-    "@babel/core": "7.28.4",
-    "@babel/generator": "7.28.3",
-    "@babel/parser": "7.28.4",
-    "@babel/plugin-transform-arrow-functions": "^7.27.1",
-    "@babel/plugin-transform-block-scoping": "^7.28.4",
-    "@babel/plugin-transform-computed-properties": "^7.27.1",
-    "@babel/plugin-transform-shorthand-properties": "^7.27.1",
-    "@babel/plugin-transform-template-literals": "^7.27.1",
-    "@babel/traverse": "7.28.4",
     "@nuintun/qrcode": "^5.0.1",
     "canvg": "4.0.1",
     "html2canvas": "1.4.1",
     "jspdf": "2.5.1",
-    "nzh": "1.0.9",
-    "socket.io-client": "^4.8.1"
+    "nzh": "1.0.9"
   },
   "peerDependencies": {
     "vue": "^3.0.0"