yh-hiprint 2.6.9 → 2.6.12

package/HiprintDesigner.vue

@@ -999,11 +999,9 @@ 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);
+  height: calc(100%);
   overflow: hidden;
   display: flex;
   flex-direction: column;
@@ -1141,13 +1139,20 @@ onMounted(async () => {
       }
       .hiprint-designer_title {
         padding: 0 10px;
+        margin: 0;
       }
       #PrintElementOptionSetting {
         flex: 1;
         overflow: hidden;
       }
       .el-form {
-        padding: 10px;
+        padding: 0 10px 10px;
+        .el-form-item--small {
+          margin-bottom: 5px;
+        }
+        .el-form-item__label {
+          margin-bottom: 0;
+        }
         .el-button {
           width: 100%;
         }

package/hiprintPreview.vue

@@ -135,47 +135,27 @@ async function getData(query) {
         }
       }
 
-      // 检查是否启用客户端打印
-      const useClientPrint = localStorage.getItem('useClientPrint') === 'true';
-
-      if (useClientPrint && hiprint.hiwebSocket.opened) {
-        // 使用客户端打印
-        loading.setText('正在连接打印客户端');
-
-        // 获取打印机列表
-        let printerList = hiprint.hiwebSocket.getPrinterList();
-        if (!printerList || printerList.length === 0) {
-          ElMessageBox.alert('未获取到打印机列表', '提示');
-          return;
-        }
-
-        loading.close();
-
-        // 显示打印机选择对话框
-        showPrinterSelectionDialog(printerList, hiprintTemplate, list);
+      // 默认浏览器打印
+      let html = hiprintTemplate.getHtml(list);
+      if (opener && returnHtml && html[0]) {
+        opener.postMessage({
+          type: 'sendPrintHTML',
+          data: html[0].innerHTML,
+        });
+        ElMessageBox.alert('渲染完成！确认后返回系统').then(() => {
+          window.close();
+        });
       } else {
-        // 默认浏览器打印
-        let html = hiprintTemplate.getHtml(list);
-        if (opener && returnHtml && html[0]) {
-          opener.postMessage({
-            type: 'sendPrintHTML',
-            data: html[0].innerHTML,
-          });
-          ElMessageBox.alert('渲染完成！确认后返回系统').then(() => {
+        document.body.innerHTML = '';
+        document.body.appendChild(html[0]);
+        if (hasData) {
+          setTimeout(() => {
+            window.print();
+          }, 1000);
+        } else {
+          ElMessageBox.alert('数据源没有数据，打印将取消').then(() => {
             window.close();
           });
-        } else {
-          document.body.innerHTML = '';
-          document.body.appendChild(html[0]);
-          if (hasData) {
-            setTimeout(() => {
-              window.print();
-            }, 1000);
-          } else {
-            ElMessageBox.alert('数据源没有数据，打印将取消').then(() => {
-              window.close();
-            });
-          }
         }
       }
       success.value = false;
@@ -192,7 +172,4 @@ async function getData(query) {
   }
 }
 </script>
-<style lang="scss">
-@use './libs/css/hiprint.css';
-@use './libs//css/print-lock.css';
-</style>
+<style lang="scss"></style>

package/hooks/useHiprint.js

@@ -1,16 +1,17 @@
-import {hiprint as h, defaultElementTypeProvider as p} from '../libs/hiprint.bundle.js';
+import { hiprint as h, defaultElementTypeProvider as p } from '../libs/hiprint.bundle.js';
 // 调用浏览器打印js
 import '../libs/plugins/jquery.hiwprint.js';
 // 默认配置
 import '../libs/hiprint.config.js';
 // 样式
-import '../libs/css/hiprint.css';
-import {ref, computed, watch, reactive, nextTick} from 'vue';
+import "../libs/css/hiprint.css";
+import "../libs/css/print-lock.css";
+import { ref, computed, watch, reactive, nextTick } from 'vue';
 
 export const hiprint = h;
 export const defaultElementTypeProvider = p;
 
-export function print(provider = defaultElementTypeProvider, template, ...args) {
+export function print (provider = defaultElementTypeProvider, template, ...args) {
   hiprint.init({
     providers: [new provider()],
   });
@@ -21,7 +22,7 @@ export function print(provider = defaultElementTypeProvider, template, ...args)
   return hiprintTemplate;
 }
 
-export function print2(provider = defaultElementTypeProvider, template, ...args) {
+export function print2 (provider = defaultElementTypeProvider, template, ...args) {
   hiprint.init({
     providers: [new provider()],
   });
@@ -32,7 +33,7 @@ export function print2(provider = defaultElementTypeProvider, template, ...args)
   return hiprintTemplate;
 }
 
-export function usePaper() {
+export function usePaper () {
   const paperType = ref('A4');
   const paperTypeName = computed(() => {
     const paperTypeObj = paperTypesObj.find((item) => item.value === paperType.value);
@@ -46,12 +47,12 @@ export function usePaper() {
   const paperHeight = ref(296.6);
 
   const paperTypesObj = reactive([
-    {label: 'A3', value: 'A3'},
-    {label: 'A4', value: 'A4'},
-    {label: 'A5', value: 'A5'},
-    {label: 'B3', value: 'B3'},
-    {label: 'B4', value: 'B4'},
-    {label: 'B5', value: 'B5'},
+    { label: 'A3', value: 'A3' },
+    { label: 'A4', value: 'A4' },
+    { label: 'A5', value: 'A5' },
+    { label: 'B3', value: 'B3' },
+    { label: 'B4', value: 'B4' },
+    { label: 'B5', value: 'B5' },
   ]);
 
   const paperTypes = {
@@ -81,9 +82,9 @@ export function usePaper() {
     },
   };
 
-  function setPaper(type, callback) {
+  function setPaper (type, callback) {
     if (type !== 'other') {
-      let {width, height} = paperTypes[type];
+      let { width, height } = paperTypes[type];
       paperWidth.value = width;
       paperHeight.value = height;
     }
@@ -120,7 +121,7 @@ export function usePaper() {
   };
 }
 
-export function useScale(callback) {
+export function useScale (callback) {
   const scaleValue = ref(1);
   const scalePercentage = computed(() => {
     return `${(scaleValue.value * 100).toFixed(0)}%`;
@@ -131,11 +132,11 @@ export function useScale(callback) {
   const canZoomOut = computed(() => {
     return scaleValue.value < 4;
   });
-  function zoomIn() {
+  function zoomIn () {
     scaleValue.value = scaleValue.value - 0.1;
     callback();
   }
-  function zoomOut() {
+  function zoomOut () {
     scaleValue.value = scaleValue.value + 0.1;
     callback();
   }
@@ -149,9 +150,9 @@ export function useScale(callback) {
   };
 }
 
-export function useDataSource(axios) {
+export function useDataSource (axios) {
   const detailData = ref();
-  function getDetail(id) {
+  function getDetail (id) {
     return axios
       .request({
         url: `/printTemplate/get/${id}`,
@@ -191,7 +192,7 @@ export function useDataSource(axios) {
   });
   const dataSourceForm = ref([]);
   const codeMapDataSource = ref({});
-  function getDataSourceList() {
+  function getDataSourceList () {
     return axios
       .request({
         url: '/printTemplate/getDsList',

package/index.js

@@ -7,7 +7,6 @@ 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 printCss from 'yh-hiprint/libs/css/print-lock.css?inline';
 
 export function guid () {
   return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (t) {