From 105362efac8befd69624a5f3a72f16c04e28c90e Mon Sep 17 00:00:00 2001
From: hdx <hdx@dcloud.io>
Date: Fri, 2 Aug 2024 14:44:33 +0800
Subject: [PATCH] =?UTF-8?q?doodle:=20=E7=AE=80=E5=8C=96=E7=A4=BA=E4=BE=8B?=
 =?UTF-8?q?=EF=BC=8C=E6=8A=BD=E5=8F=96=E5=85=AC=E5=85=B1=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/component/canvas/canvas/doodle.uvue | 139 +++++++++++-----------
 1 file changed, 69 insertions(+), 70 deletions(-)

diff --git a/pages/component/canvas/canvas/doodle.uvue b/pages/component/canvas/canvas/doodle.uvue
index 7a77f25e..90897fef 100644
--- a/pages/component/canvas/canvas/doodle.uvue
+++ b/pages/component/canvas/canvas/doodle.uvue
@@ -1,80 +1,79 @@
 <template>
-	<canvas class="drawing" id="tablet" @touchstart="touchStart" @touchmove="touchMove" @touchend="touchEnd"></canvas>
-	<button @click="doClear()">清空</button>
+  <canvas class="drawing" id="tablet" @touchstart="touchStart" @touchmove="touchMove" @touchend="touchEnd"></canvas>
+  <button @click="doClear()">清空</button>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				lastPointX : 0,
-				lastPointY : 0
-			}
-		},
-		onShow() {
-		},
+  type Point = {
+    x : number
+    y : number
+  };
 
-		onReady() {
-			let element = uni.getElementById('tablet') as UniCanvasElement
-			let ctx = element.getContext("2d")
-      if ( ctx != null) {
-          const dpr = uni.getDeviceInfo().devicePixelRatio ?? 1;
-          element.width = element.offsetWidth * dpr
-          element.height = element.offsetHeight * dpr
-          ctx.scale(dpr, dpr)
+  export default {
+    data() {
+      return {
+        lastPointX: 0,
+        lastPointY: 0,
+        canvasElement: null as UniCanvasElement | null,
+        renderingContext: null as CanvasRenderingContext2D | null,
       }
-		},
-		methods: {
-			touchStart(event: TouchEvent){
-				let element = uni.getElementById('tablet') as UniCanvasElement
-				const elRect = element.getBoundingClientRect();
-				const touch = event.touches[0];
-				const x = touch.clientX - elRect.left
-				const y = touch.clientY - elRect.top
-				this.lastPointX = x
-				this.lastPointY = y
-
-			},
-			touchMove(event: TouchEvent){
-				let element = uni.getElementById('tablet') as UniCanvasElement
-				const elRect = element.getBoundingClientRect();
-				const touch = event.touches[0];
-				const x = touch.clientX - elRect.left
-				const y = touch.clientY - elRect.top
-
-				let ctx = element.getContext("2d")
-        if ( null != ctx) {
-          ctx.lineWidth = 5;
-          ctx.lineCap = "round";
-          ctx.lineJoin = "square";
-          ctx.beginPath()
-          ctx.moveTo(this.lastPointX, this.lastPointY)
-          ctx.lineTo(x, y)
-          ctx.stroke()
-        }
-
-				this.lastPointX = x
-				this.lastPointY = y
-			},
-			touchEnd(event: TouchEvent){
-
-			},
-			doClear(){
-				let element = uni.getElementById('tablet') as UniCanvasElement
-				let ctx = element.getContext("2d")
-        if (null != ctx ) {
-          ctx.clearRect(0, 0, element.width, element.height)
-        }
-			}
-		}
-	}
+    },
+    onReady() {
+      this.canvasElement = uni.getElementById('tablet') as UniCanvasElement
+      this.renderingContext = this.canvasElement!.getContext("2d")!
+
+      const dpr = uni.getDeviceInfo().devicePixelRatio ?? 1;
+      this.canvasElement!.width = this.canvasElement!.offsetWidth * dpr
+      this.canvasElement!.height = this.canvasElement!.offsetHeight * dpr
+      this.renderingContext!.scale(dpr, dpr)
+    },
+    methods: {
+      touchStart(event : TouchEvent) {
+        const position = this.getPosition(event)
+        this.lastPointX = position.x
+        this.lastPointY = position.y
+      },
+      touchMove(event : TouchEvent) {
+        const position = this.getPosition(event)
+        const x = position.x
+        const y = position.y
+
+        const ctx = this.renderingContext!
+        ctx.lineWidth = 5
+        ctx.lineCap = "round"
+        ctx.lineJoin = "square"
+        ctx.beginPath()
+        ctx.moveTo(this.lastPointX, this.lastPointY)
+        ctx.lineTo(x, y)
+        ctx.stroke()
+
+        this.lastPointX = x
+        this.lastPointY = y
+      },
+      touchEnd(_ : TouchEvent) {
+      },
+      doClear() {
+        if (this.renderingContext != null) {
+          this.renderingContext!.clearRect(0, 0, this.canvasElement!.width, this.canvasElement!.height)
+        }
+      },
+      getPosition(event : TouchEvent) : Point {
+        const elRect = this.canvasElement!.getBoundingClientRect()
+        const touch = event.touches[0]
+        return {
+          x: touch.clientX - elRect.left,
+          y: touch.clientY - elRect.top
+        } as Point
+      }
+    }
+  }
 </script>
 
 <style>
-	.drawing {
-		width: 100%;
-		height: 500px;
-		background-color: lightgray;
-		margin-bottom: 15px;
-	}
+  .drawing {
+    width: 100%;
+    height: 500px;
+    background-color: lightgray;
+    margin-bottom: 15px;
+  }
 </style>
-- 
GitLab