yh-hiprint 2.6.2 → 2.6.4

package/HiprintDesigner.vue

@@ -989,6 +989,8 @@ onMounted(async () => {
 });
 </script>
 <style lang="scss">
+@use './libs/css/hiprint.css';
+@use './libs//css/print-lock.css';
 .hiprint-designer {
   width: calc(100% + 32px);
   height: calc(100% - 30px);
@@ -1079,6 +1081,9 @@ onMounted(async () => {
       overflow: hidden;
       .el-scrollbar__view {
         padding: 20px 10px 40px 20px;
+        #hiprint-printTemplate {
+          position: relative;
+        }
       }
     }
     &_right {

package/hiprintPreview.vue

@@ -192,4 +192,7 @@ async function getData(query) {
   }
 }
 </script>
-<style lang="scss"></style>
+<style lang="scss">
+@use './libs/css/hiprint.css';
+@use './libs//css/print-lock.css';
+</style>

package/index.js

@@ -105,7 +105,12 @@ const clientPrintHandler = async (code, params, data) => {
     loading = ElLoading.service({
       text: "正在获取打印模板"
     });
-    let reqParams = params ? JSON.parse(params) : [];
+    let reqParams = [];
+    try {
+      reqParams = params ? JSON.parse(params) : [];
+    } catch (error) {
+      console.error(error);
+    }
     // 获取打印模板
     let res = await getPrintTemplate(code, reqParams);
     if (res.status !== 200 || !res.data || !res.data.json) {
@@ -151,6 +156,13 @@ const showPrinterSelectionDialog = (printerList, templateJson, templateData, tem
   return new Promise((resolve) => {
     // 获取上次选择的打印机
     const lastSelectedPrinter = localStorage.getItem('lastSelectedPrinter') || '';
+
+    let json = {};
+    try {
+      json = JSON.parse(templateJson);
+    } catch (error) {
+      console.error('客户端打印解析模板失败：', error);
+    }
     // 创建挂载点
     const mountPoint = document.createElement('div');
     document.body.appendChild(mountPoint);
@@ -185,7 +197,7 @@ const showPrinterSelectionDialog = (printerList, templateJson, templateData, tem
 
           try {
             // 创建打印模板实例
-            let hiprintTemplate = new hiprint.PrintTemplate({ template: JSON.parse(templateJson) });
+            let hiprintTemplate = new hiprint.PrintTemplate({ template: json });
 
             loading.setText("正在发送打印任务");
 
@@ -194,8 +206,8 @@ const showPrinterSelectionDialog = (printerList, templateJson, templateData, tem
               printer: this.selectedPrinter,
               title: templateName,
               pageSize: {
-                width: (templateJson.width || 210) * 1000,
-                height: (templateJson.height || 297) * 1000
+                width: (json?.panels[0]?.width || 210) * 1000,
+                height: (json?.panels[0]?.height || 297) * 1000
               }
             });
 
@@ -316,7 +328,7 @@ export default {
                 `连接【${clientUrl}】失败！<br>请确保已<a href="${clientApp}" target="_blank">下载</a>并<a href="hiprint://" target="_blank">运行</a>打印客户端！`,
                 '客户端未连接',
                 {
-                  dangerouslyUseHtmlString: true,
+                  dangerouslyUseHTMLString: true,
                   confirmButtonText: '确定'
                 }
               );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yh-hiprint",
-  "version": "2.6.2",
+  "version": "2.6.4",
   "description": "Hiprint for Vue3 by NoahLiu in ForceCon in Hunan Changesha",
   "main": "index.js",
   "types": "index.d.ts",