From f173f090bbfa64102d0e634a5e971493e16b84a9 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Mon, 14 Oct 2024 17:53:06 +0800
Subject: [PATCH] fix

---
 src/component/modules/generalMiniCanvas.vue | 24 +++++++++++----------
 src/views/HomeMain.vue                      |  4 ++--
 src/views/HomeView/HomeView.vue             |  1 +
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/component/modules/generalMiniCanvas.vue b/src/component/modules/generalMiniCanvas.vue
index 02d05b64..d87b5d14 100644
--- a/src/component/modules/generalMiniCanvas.vue
+++ b/src/component/modules/generalMiniCanvas.vue
@@ -2,7 +2,7 @@
     <div class="generalMiniCanvas">
 		<div class="addDetails_canvasCenter">
 			<div class="generalMiniCanvas_input generalMiniCanvas_item" :class="{spread:spreadState}">
-				<div class="generalMiniCanvas_input_item" v-show="(canvasState != 'move' && canvasState != 'liquidation' && canvasState != 'movePosition')">
+				<div class="generalMiniCanvas_input_item" v-show="(canvasState != 'move' && canvasState != 'liquidation' && canvasState != 'movePosition' && canvasState != 'zoomIn' && canvasState != 'zoomOut')">
 					<span>{{ $t('exportModel.Size') }}</span>
 					<input type="range" @input="setPencilWidth" min="1" max="50" v-model="canvasPencilWidth[canvasState]">
 				</div>
@@ -303,8 +303,8 @@ export default defineComponent({
 		let setCanvasDown = (event)=>{
 			if(canvasBtn.canvasState == 'movePosition'){
 				isMovePostion = true;
-				lastPosX = event.e.clientX;
-				lastPosY = event.e.clientY;
+				lastPosX = event.pointer.x;
+				lastPosY = event.pointer.y;
 				return
 			}
 			if(canvasBtn.canvasState == 'zoomIn' || canvasBtn.canvasState == 'zoomOut'){
@@ -313,15 +313,15 @@ export default defineComponent({
 			}
 		}
 		let setCanvasPosition = (event)=>{
-			const e = event.e;
+			const e = event;
             const vpt = canvas.viewportTransform;
 
-            vpt[4] += e.clientX - lastPosX; // 更新水平偏移
-            vpt[5] += e.clientY - lastPosY; // 更新垂直偏移
+            vpt[4] += e.pointer.x - lastPosX; // 更新水平偏移
+            vpt[5] += e.pointer.y - lastPosY; // 更新垂直偏移
 
             canvas.requestRenderAll(); // 请求重绘画布
-            lastPosX = e.clientX;
-            lastPosY = e.clientY;
+            lastPosX = e.pointer.x;
+            lastPosY = e.pointer.y;
 		}
 		let setCanvasZoom = (opt)=>{
 			let zoom = canvas.getZoom() // 获取画布当前缩放值
@@ -333,8 +333,8 @@ export default defineComponent({
 			// console.log(zoom);
 			canvas.zoomToPoint(
 				{ // 关键点
-				x: opt.e.offsetX,
-				y: opt.e.offsetY
+				x: opt.pointer.x,
+				y: opt.pointer.y
 				},
 				zoom
 			)
@@ -456,7 +456,9 @@ export default defineComponent({
 			setPencilWidth()
 		}
 		let upDataPencilWidth = (zoom)=>{
-			canvas.freeDrawingBrush.width = Number(canvasBtn.canvasPencilWidth[canvasBtn.canvasState]) / zoom;
+			if(canvasBtn.canvasPencilWidth[canvasBtn?.canvasState]){
+				canvas.freeDrawingBrush.width = Number(canvasBtn.canvasPencilWidth[canvasBtn.canvasState]) / zoom;
+			}
 		}
 		let deleteObj = ()=> {
 			// if(!canvas.getActiveObjects()){
diff --git a/src/views/HomeMain.vue b/src/views/HomeMain.vue
index a0eb077e..938af75c 100644
--- a/src/views/HomeMain.vue
+++ b/src/views/HomeMain.vue
@@ -640,11 +640,11 @@ export default defineComponent({
 .homeMain_max{
 	position: relative;
 	display: flex;
-	height: 100vh;
+	height: 100%;
 	flex-direction: column;
 	.homeMain_content_body{
 		flex: 1;
-		height: calc(100vh - 7rem);
+		height: calc(100% - 7rem);
 	}
 }
 .homeMain_heade {
diff --git a/src/views/HomeView/HomeView.vue b/src/views/HomeView/HomeView.vue
index 3a99b789..37135e9b 100644
--- a/src/views/HomeView/HomeView.vue
+++ b/src/views/HomeView/HomeView.vue
@@ -1161,6 +1161,7 @@ export default defineComponent({
 				display: flex;
 				// padding-left: 0.7rem;
 				box-sizing: border-box;
+				overflow: hidden;calc(100vh - 7rem)
 
 				.home_page_left {
 					// width: 44.4rem;