yh-hiprint 2.6.8 → 2.6.11

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

@@ -1,13 +1,12 @@
 import './libs/jquery';
-import { ElDialog, ElSelect, ElOption, ElButton, ElMessageBox,ElLoading } from 'element-plus';
-import { createApp,createVNode } from 'vue';
+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 printCss from 'yh-hiprint/libs/css/print-lock.css?inline';
 
 export function guid () {
   return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (t) {
@@ -25,7 +24,7 @@ export function cLog (string, isError = false) {
 }
 
 const hiprintFun = async ({ code, params, data, isCustom, returnHtml }) => {
-  if (electronBrowserAPI && electronBrowserAPI.print) {
+  if (window.electronBrowserAPI && window.electronBrowserAPI.print) {
     clientPrintHandler(code, params, data);
   } else {
     let height = document.documentElement.clientHeight;
@@ -251,15 +250,15 @@ const showPrinterSelectionDialog = (printerList, templateJson, templateData, tem
 
             // 添加事件监听器
             window.addEventListener('message', handlePrintResult);
-            
+
             // 添加超时机制，防止监听器泄漏
             const timeoutId = setTimeout(() => {
               window.removeEventListener('message', handlePrintResult);
               loading.close();
               ElMessageBox.alert("打印超时", '提示');
               this.handleClose(false);
-            }, 60*1000); // 30秒超时
-            
+            }, 60 * 1000); // 30秒超时
+
             // 发送到客户端打印
             try {
               electronBrowserAPI.print(printOption);

package/libs/hiprint.bundle.js

@@ -1,4 +1,3 @@
-/* eslint-disable */
 /**
  * jQuery Hiprint 2.5.4
  *
@@ -34,7 +33,6 @@ import Nzh from 'nzh/dist/nzh.min.js';
 import { Canvg } from 'canvg';
 // 默认自定义拖拽列表
 import defaultTypeProvider from './etypes/default-etyps-provider';
-import printCss from './css/print-lock.css?inline';
 
 function _instanceof (left, right) {
   if (right != null && typeof Symbol !== 'undefined' && right[Symbol.hasInstance]) {
@@ -57,6 +55,8 @@ function _typeof (obj) {
   return _typeof(obj);
 }
 
+window.autoConnect = false;
+
 var hiprint = (function (t) {
   var e = {};
 
@@ -2035,7 +2035,7 @@ var hiprint = (function (t) {
                   })
                   .forEach(function (t) {
                     var n = hiprintJQuery('<td></td>');
-                    t.id && n.attr('id', t.id), t.columnId && n.attr('column-id', t.columnId), (t.align || t.halign) && n.css('text-align', t.halign || t.align), t.vAlign && n.css('vertical-align', t.vAlign), t.colspan > 1 && n.attr('colspan', t.colspan), t.rowspan > 1 && n.attr('rowspan', t.rowspan), n.html(t.title), o[t.id] ? ((t.hasWidth = !0), (t.targetWidth = o[t.id]), n.attr('haswidth', 'haswidth'), n.css('width', o[t.id] + 'pt')) : (t.hasWidth = !1);
+                    t.id && n.attr('id', t.id), t.columnId && n.attr('column-id', t.columnId), (t.align || t.halign) && n.css('text-align', t.halign || t.align), t.colspan > 1 && n.attr('colspan', t.colspan), t.rowspan > 1 && n.attr('rowspan', t.rowspan), n.html(t.title), o[t.id] ? ((t.hasWidth = !0), (t.targetWidth = o[t.id]), n.attr('haswidth', 'haswidth'), n.css('width', o[t.id] + 'pt')) : (t.hasWidth = !1);
                     var s = TableExcelHelper.getHeaderStyler(t);
                     if (s) {
                       var l = s(t);
@@ -2062,7 +2062,7 @@ var hiprint = (function (t) {
             var a = hiprintJQuery('<tfoot></tfoot>'),
               p = this.getFooterFormatter(n, i);
             var tst = this.tableSummaryTitle;
-            let tSumData = n.tableFooterRepeat == 'last' ? e : r;
+            let tSumData = n.tableFooterScope == 'all' ? e : r;
             let idx = n.columns.length - 1;
             var rowColumns = this.rowColumns || n.columns[idx].columns;
             if (
@@ -5529,7 +5529,7 @@ var hiprint = (function (t) {
 
         return (
           (t.prototype.createTarget = function () {
-            return (this.target = hiprintJQuery(' <div class="hiprint-option-item">\n        <div class="hiprint-option-item-label">\n        单元格上下对齐\n        </div>\n        <div class="hiprint-option-item-field">\n        <select class="auto-submit">\n        <option value="" >默认</option>\n        <option value="top" >上</option>\n        <option value="middle" >中</option>\n        <option value="bottom" >居右</option>\n        \n        </select>\n        </div>\n    </div>')), this.target;
+            return (this.target = hiprintJQuery(' <div class="hiprint-option-item">\n        <div class="hiprint-option-item-label">\n        单元格上下对齐\n        </div>\n        <div class="hiprint-option-item-field">\n        <select class="auto-submit">\n        <option value="" >默认</option>\n        <option value="top" >上</option>\n        <option value="middle" >中</option>\n        <option value="bottom" >下</option>\n        \n        </select>\n        </div>\n    </div>')), this.target;
           }),
           (t.prototype.getValue = function () {
             var t = this.target.find('select').val();
@@ -5718,6 +5718,28 @@ var hiprint = (function (t) {
           }),
           t
         );
+      })(),
+      tableFooterScope = (function () {
+        function t () {
+          this.name = 'tableFooterScope';
+        }
+
+        return (
+          (t.prototype.createTarget = function () {
+            return (this.target = hiprintJQuery(' <div class="hiprint-option-item">\n        <div class="hiprint-option-item-label">\n        聚合数据范围\n        </div>\n        <div class="hiprint-option-item-field">\n        <select class="auto-submit">\n        <option value="page" >当前页</option>\n        <option value="all" >全部数据</option>\n        </select>\n        </div>\n    </div>')), this.target;
+          }),
+          (t.prototype.getValue = function () {
+            var t = this.target.find('select').val();
+            return t ? t.toString() : 'page';
+          }),
+          (t.prototype.setValue = function (t) {
+            this.target.find('select').val(t);
+          }),
+          (t.prototype.destroy = function () {
+            this.target.remove();
+          }),
+          t
+        );
       })();
 
     n.d(e, 'a', function () {
@@ -5742,8 +5764,9 @@ var hiprint = (function (t) {
         (t.getItem = function (e) {
           return t.init(), t.printElementOptionItems[e];
         }),
-        (t._printElementOptionItems = [new fontFamily(), new r(), new a(), new p(), new i(), new s(), new l(), new pt(), new u(), new d(), new c(), new h(), new f(), new g(), new m(), new d2(), new c2(), new v(), new y(), new b(), new E(), new qrCodeLevel(), new T(), new P(), new _(), new w(), new x(), new coordinate(), new widthHeight(), new C(), new imageFit(), new O(), new H(), new D(), new paperNumberContinue(), new watermarkOptions(), new I(), new R(), new pageBreak(), new M(), new M2(), new S(), new B(), new F(), new L(), new A(), new z(), new k(), new st(), new N(), new V(), new W(), new j(), new U(), new zIndex(), new K(), new G(), new q(), new X(), new Y(), new Q(), new J(), new Z(), new tt(), new et(), new nt(), new it(), new ot(), new textWrap(), new at(), new lt(), new ut(), new ith(), new dt(), new ct(), new ht(), new ft(), new gt(), new mt(), new rowcolumns(), new rowsColumnsMergeClean(), new groupFieldsFormatter(), new groupFormatter(), new groupFooterFormatter(), new vt(), new yt(), new bt(), new Tt(), new Et(), new Pt(), new stylerHeader(), new renderFormatter(), new _t(), new wt(), new maxRows(), new xt(), new tableColumnH(), new tableE(), new tableQRCodeLevel(), new tablept(), new tableSummaryTitle(), new tableSummaryText(), new tableSummaryColspan(), new tableSummary(), new tableSummaryAlign(), new tableSummaryNumFormat(), new upperCase()]),
-        t
+        (t._printElementOptionItems = [new fontFamily(), new r(), new a(), new p(), new i(), new s(), new l(), new pt(), new u(), new d(), new c(), new h(), new f(), new g(), new m(), new d2(), new c2(), new v(), new y(), new b(), new E(), new qrCodeLevel(), new T(), new P(), new _(), new w(), new x(), new coordinate(), new widthHeight(), new C(), new imageFit(), new O(), new H(), new D(), new paperNumberContinue(), new watermarkOptions(), new I(), new R(), new pageBreak(), new M(), new M2(), new S(), new B(), new F(), new L(), new A(), new z(), new k(), new st(), new N(), new V(), new W(), new j(), new U(), new zIndex(), new K(), new G(), new q(), new X(), new Y(), new Q(), new J(), new Z(), new tt(), new et(), new nt(), new it(), new ot(), new textWrap(), new at(), new lt(), new ut(), new ith(), new dt(), new ct(), new ht(), new ft(), new gt(), new mt(), new rowcolumns(), new rowsColumnsMergeClean(), new groupFieldsFormatter(), new groupFormatter(), new groupFooterFormatter(), new vt(), new yt(), new bt(), new Tt(), new Et(), new Pt(), new stylerHeader(), new renderFormatter(), new _t(), new wt(), new maxRows(), new xt(), new tableColumnH(), new tableE(), new tableQRCodeLevel(), new tablept(), new tableSummaryTitle(), new tableSummaryText(), new tableSummaryColspan(), new tableSummary(), new tableSummaryAlign(), new tableSummaryNumFormat(), new upperCase(), new tableFooterScope()],
+          t
+        )
       );
     })();
   },

package/libs/hiprint.config.js

@@ -855,6 +855,10 @@
               name: 'tableFooterRepeat',
               hidden: false
             },
+            {
+              name: 'tableFooterScope',
+              hidden: false
+            },
             {
               name: 'autoCompletion',
               hidden: false
@@ -1119,6 +1123,10 @@
           name: 'tableFooterRepeat',
           hidden: false
         },
+        {
+          name: 'tableFooterScope',
+          hidden: false
+        },
         {
           name: 'footerFormatter',
           hidden: false

package/package.json

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