😁更新依赖至最新版本

Web/package.json

@@ -11,45 +11,45 @@
 	},
 	"dependencies": {
 		"@element-plus/icons-vue": "^2.1.0",
-		"@microsoft/signalr": "^6.0.10",
+		"@microsoft/signalr": "^7.0.7",
 		"@wangeditor/editor": "^5.1.23",
 		"@wangeditor/editor-for-vue": "^5.1.12",
 		"animate.css": "^4.1.1",
-		"axios": "^1.3.5",
-		"countup.js": "^2.6.0",
+		"axios": "^1.4.0",
+		"countup.js": "^2.6.2",
 		"cropperjs": "^1.5.13",
 		"echarts": "^5.4.2",
 		"echarts-gl": "^2.0.9",
 		"echarts-wordcloud": "^2.1.0",
-		"element-plus": "^2.3.3",
-		"js-cookie": "^3.0.1",
-		"js-table2excel": "^1.0.3",
+		"element-plus": "^2.3.7",
+		"js-cookie": "^3.0.5",
+		"js-table2excel": "^1.1.2",
 		"jsplumb": "^2.15.6",
 		"lodash-es": "^4.17.21",
 		"mitt": "^3.0.0",
-		"monaco-editor": "^0.38.0",
+		"monaco-editor": "^0.39.0",
 		"nprogress": "^0.2.0",
-		"pinia": "^2.0.34",
+		"pinia": "^2.1.4",
 		"print-js": "^1.6.0",
 		"qrcodejs2-fixes": "^0.0.2",
-		"qs": "^6.11.1",
+		"qs": "^6.11.2",
 		"screenfull": "^6.0.2",
 		"sortablejs": "^1.15.0",
 		"splitpanes": "^3.1.5",
-		"vform3-builds": "^3.0.8",
-		"vue": "^3.2.47",
+		"vform3-builds": "^3.0.10",
+		"vue": "^3.3.4",
 		"vue-clipboard3": "^2.0.0",
-		"vue-demi": "^0.13.11",
+		"vue-demi": "^0.14.5",
 		"vue-grid-layout": "^3.0.0-beta1",
 		"vue-i18n": "^9.2.2",
-		"vue-json-pretty": "^2.2.3",
-		"vue-router": "^4.1.6",
+		"vue-json-pretty": "^2.2.4",
+		"vue-router": "^4.2.2",
 		"vue-signature-pad": "^3.0.2",
-		"vue3-tree-org": "^4.1.1",
+		"vue3-tree-org": "^4.2.2",
 		"xlsx-js-style": "^1.2.0",
-		"sv-print": "^0.1.8",
-		"@sv-print/vue3": "^0.1.8",
-		"@sv-print/hiprint": "^0.1.8",
+		"sv-print": "^0.1.12",
+		"@sv-print/vue3": "^0.1.12",
+		"@sv-print/hiprint": "^0.1.15",
 		"@vitejs/plugin-vue-jsx": "^3.0.1"
 	},
 	"devDependencies": {

Web/public/print-lock.css

@@ -31,6 +31,13 @@
   overflow-x: hidden;
   overflow: hidden;
 }
+.hiprint-printPaper .hiprint-printPaper-background {
+  position: absolute;
+  pointer-events: none;
+  z-index: 0;
+  left: 0;
+  top: 0;
+}
 .hiprint-printPaper .hiprint-printPaper-content {
   position: relative;
 }
@@ -159,7 +166,7 @@ hiprint-printPanel {
 .hiprint-printElement-tableTarget tr,
 .hiprint-printElement-tableTarget td {
   border-color: rgb(0, 0, 0);
-  border-style: none;
+  /* border-style: none; */
   /*border: 1px solid rgb(0,0,0);*/
   font-weight: normal;
   direction: ltr;
@@ -176,6 +183,40 @@ hiprint-printPanel {
     font-size: 9pt;*/
 }
 
+.hiprint-printElement-tableTarget-border-all {
+  border: 1px solid;
+}
+.hiprint-printElement-tableTarget-border-none {
+  border: 0px solid;
+}
+.hiprint-printElement-tableTarget-border-lr {
+  border-left: 1px solid;
+  border-right: 1px solid;
+}
+.hiprint-printElement-tableTarget-border-left {
+  border-left: 1px solid;
+}
+.hiprint-printElement-tableTarget-border-right {
+  border-right: 1px solid;
+}
+.hiprint-printElement-tableTarget-border-tb {
+  border-top: 1px solid;
+  border-bottom: 1px solid;
+}
+.hiprint-printElement-tableTarget-border-top {
+  border-top: 1px solid;
+}
+.hiprint-printElement-tableTarget-border-bottom {
+  border-bottom: 1px solid;
+}
+
+.hiprint-printElement-tableTarget-border-td-none td {
+  border: 0px solid;
+}
+.hiprint-printElement-tableTarget-border-td-all td:not(:last-child) {
+  border-right: 1px solid;
+}
+
 /*.hiprint-printElement-tableTarget tr,*/
 .hiprint-printElement-tableTarget td {
   height: 18pt;
@@ -223,20 +264,37 @@ hiprint-printPanel {
 }
 
 .hiprint-text-content-middle {
-  display: table;
 }
-.hiprint-text-content-middle > div {
-  display: table-cell;
-  vertical-align: middle;
+.hiprint-text-content-middle > div:first-child {
+  display: grid;
+  align-items: center;
 }
 
 .hiprint-text-content-bottom {
-  display: table;
 }
 
-.hiprint-text-content-bottom > div {
-  display: table-cell;
-  vertical-align: bottom;
+.hiprint-text-content-bottom > div:first-child {
+  display: grid;
+  align-items: flex-end;
+}
+
+.hiprint-text-content-wrap {
+}
+
+.hiprint-text-content-wrap .hiprint-text-content-wrap-nowrap {
+  white-space: nowrap;
+}
+
+.hiprint-text-content-wrap .hiprint-text-content-wrap-clip {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: clip;
+}
+
+.hiprint-text-content-wrap .hiprint-text-content-wrap-ellipsis {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 
 /*hi-grid-row */

Web/src/layout/main/columns.vue

@@ -43,7 +43,7 @@ const initScrollBarHeight = () => {
 		setTimeout(() => {
 			updateScrollbar();
 			layoutScrollbarRef.value.wrapRef.scrollTop = 0;
-			layoutMainRef.value!.layoutMainScrollbarRef.wrapRef.scrollTop = 0;
+			if (layoutMainRef.value != undefined) layoutMainRef.value!.layoutMainScrollbarRef.wrapRef.scrollTop = 0;
 		}, 500);
 	});
 };

Web/src/views/system/print/component/editPrint.vue

@@ -2,9 +2,9 @@
 	<div class="sys-print-container">
 		<div class="printDialog">
 			<el-dialog v-model="state.isShowDialog" :show-close="false" :close-on-click-modal="false" fullscreen>
-				<Designer @onDesigned="onDesigned" :autoConnect="false" theme="bumblebee" style="margin: -20px -12px 0 -20px" />
+				<Designer @onDesigned="onDesigned" :autoConnect="false" theme="bumblebee" style="margin: -20px -19px -20px -19px; height: calc(100vh - 45px) !important" />
 				<template #footer>
-					<span class="dialog-footer">
+					<span class="dialog-footer" style="margin-top: 10px">
 						<el-button @click="cancel">取 消</el-button>
 						<el-button type="primary" @click="submit">保存模板</el-button>
 					</span>
@@ -60,7 +60,7 @@
 import { onMounted, reactive, ref } from 'vue';
 import 'sv-print/dist/style.css';
 import { Designer } from '@sv-print/vue3';
-// import { disAutoConnect } from '@sv-print/hiprint';
+import { disAutoConnect } from '@sv-print/hiprint';
 
 import { getAPI } from '/@/utils/axios-utils';
 import { SysPrintApi } from '/@/api-services/api';
@@ -79,7 +79,7 @@ const state = reactive({
 });
 
 onMounted(async () => {
-	// disAutoConnect();
+	disAutoConnect();
 });
 
 // 打开弹窗
@@ -105,7 +105,6 @@ const submit = async () => {
 // 打印模板页面初始化
 const onDesigned = (e: any) => {
 	svPrint.value = e.detail;
-	console.log(e);
 
 	loadTemplate();
 };
@@ -147,7 +146,7 @@ defineExpose({ openDialog });
 			display: none !important;
 		}
 		.el-dialog__body {
-			max-height: calc(100vh - 50px) !important;
+			max-height: calc(100vh - 45px) !important;
 		}
 	}
 }