yh-hiprint 2.6.3 → 2.6.5

package/HiprintDesigner.vue

@@ -37,13 +37,13 @@
                 v-model="paperWidth"
                 type="number">
                 <template #prepend>宽</template>
-                <template #append>px</template>
+                <template #append>mm</template>
               </el-input>
               <el-input
                 v-model="paperHeight"
                 type="number">
                 <template #prepend>高</template>
-                <template #append>px</template>
+                <template #append>mm</template>
               </el-input>
               <el-button
                 type="primary"
@@ -766,7 +766,6 @@ function tableColumnCancel() {
 function init() {
   try {
     hiprint.init({
-      host: 'http://localhost:17521',
       providers: [new defaultElementTypeProvider()],
     });
     hiprint.setConfig();
@@ -917,7 +916,7 @@ async function updateTemplate(code) {
       let {width, height} = jsonObj.panels[0];
       paperWidth.value = width;
       paperHeight.value = height;
-      hiprintTemplate.value?.setPaper(width, height);
+      setPaperHandler('other');
       scaleValue.value = 1;
     } else {
       hiprintTemplate.value?.update({
@@ -938,11 +937,22 @@ async function updateTemplate(code) {
       });
       paperWidth.value = 210;
       paperHeight.value = 297;
-      hiprintTemplate.value?.setPaper(210, 297);
+      setPaperHandler('other');
       scaleValue.value = 1;
     }
   } else {
     await getDetail(code);
+    if (detailData.value && detailData.value.json) {
+      let jsonObj = JSON.parse(detailData.value.json);
+      let {width, height} = jsonObj.panels[0];
+      paperWidth.value = width;
+      paperHeight.value = height;
+      setPaperHandler('other');
+    } else {
+      paperWidth.value = 210;
+      paperHeight.value = 297;
+      setPaperHandler('other');
+    }
     init();
   }
   updateing = false;
@@ -989,6 +999,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 +1091,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

@@ -309,7 +309,7 @@ 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" }) {
+  install (app, { router, pinia, isAdmin, clientPrint = false, clientUrl = 'http://localhost:17521', clientApp = "https://gitee.com/CcSimple/electron-hiprint/releases", clinetTip = false }) {
     app.provide('$hiprint', hiprintFun);
     app.provide('$silentHiprint', silentHiprint);
 
@@ -320,20 +320,21 @@ export default {
         if (hiprint.hiwebSocket && !hiprint.hiwebSocket.opened) {
           window.hiwebSocket.host = clientUrl;
           hiprint.hiwebSocket.start();
-
-          // 添加连接状态检查和提示逻辑
-          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 (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);
+          }
         }
       };
 

package/package.json

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