From 12fbdcaac9957c6142ffe00c91c2d72f6064bbb0 Mon Sep 17 00:00:00 2001
From: pipipi-pikachu <pipipi_pikachu@163.com>
Date: Fri, 20 May 2022 23:07:34 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=BB=9A=E5=8A=A8=E9=BC=A0=E6=A0=87?=
 =?UTF-8?q?=E6=BB=9A=E8=BD=AE=EF=BC=8C=E8=B0=83=E6=95=B4=E7=94=BB=E7=AC=94?=
 =?UTF-8?q?=E7=AC=94=E8=A7=A6=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/WritingBoard.vue | 39 ++++++++++++++++++++++++---------
 src/configs/hotkey.ts           |  3 ++-
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/src/components/WritingBoard.vue b/src/components/WritingBoard.vue
index 4d7b8df8..5639dec8 100644
--- a/src/components/WritingBoard.vue
+++ b/src/components/WritingBoard.vue
@@ -15,6 +15,7 @@
       @touchend="handleMouseup(); mouseInCanvas = false"
       @mouseleave="handleMouseup(); mouseInCanvas = false"
       @mouseenter="mouseInCanvas = true"
+      @mousewheel="$event => mousewheelListener($event)"
     ></canvas>
 
     <template v-if="mouseInCanvas">
@@ -32,12 +33,12 @@
         class="pen"
         :style="{
           left: mouse.x - penSize / 2 + 'px',
-          top: mouse.y - 36 + penSize / 2 + 'px',
+          top: mouse.y - penSize * 6 + penSize / 2 + 'px',
           color: color,
         }"
         v-if="model === 'pen'"
       >
-        <IconWrite class="icon" size="36" v-if="model === 'pen'" />
+        <IconWrite class="icon" :size="penSize * 6" v-if="model === 'pen'" />
       </div>
       <div 
         class="pen"
@@ -48,7 +49,7 @@
         }"
         v-if="model === 'mark'"
       >
-        <IconHighLight class="icon" size="36" v-if="model === 'mark'" />
+        <IconHighLight class="icon" :size="markSize * 1.5" v-if="model === 'mark'" />
       </div>
     </template>
   </div>
@@ -56,10 +57,7 @@
 
 <script lang="ts">
 import { computed, defineComponent, onMounted, onUnmounted, PropType, ref, watch } from 'vue'
-
-const penSize = 6
-const rubberSize = 80
-const markSize = 25
+import { throttle } from 'lodash'
 
 export default defineComponent({
   name: 'writing-board',
@@ -82,6 +80,10 @@ export default defineComponent({
     const writingBoardRef = ref<HTMLElement>()
     const canvasRef = ref<HTMLCanvasElement>()
 
+    const penSize = ref(6)
+    const rubberSize = ref(80)
+    const markSize = ref(24)
+
     let lastPos = {
       x: 0,
       y: 0,
@@ -170,7 +172,7 @@ export default defineComponent({
       const lastPosX = lastPos.x
       const lastPosY = lastPos.y
 
-      const radius = rubberSize / 2
+      const radius = rubberSize.value / 2
 
       const sinRadius = radius * Math.sin(Math.atan((posY - lastPosY) / (posX - lastPosX)))
       const cosRadius = radius * Math.cos(Math.atan((posY - lastPosY) / (posX - lastPosX)))
@@ -209,7 +211,7 @@ export default defineComponent({
     const getLineWidth = (s: number, t: number) => {
       const maxV = 10
       const minV = 0.1
-      const maxWidth = penSize
+      const maxWidth = penSize.value
       const minWidth = 3
       const v = s / t
       let lineWidth
@@ -234,7 +236,7 @@ export default defineComponent({
         draw(x, y, lineWidth)
         lastLineWidth = lineWidth
       }
-      else if (props.model === 'mark') draw(x, y, markSize)
+      else if (props.model === 'mark') draw(x, y, markSize.value)
       else erase(x, y)
 
       lastPos = { x, y }
@@ -306,6 +308,22 @@ export default defineComponent({
       }
     }
 
+    // 滚动鼠标滚轮，调整笔触大小
+    const mousewheelListener = throttle(function(e: WheelEvent) {
+      if (props.model === 'eraser') {
+        if (e.deltaY < 0 && rubberSize.value < 200) rubberSize.value += 20
+        else if (e.deltaY > 0 && rubberSize.value > 20) rubberSize.value -= 20
+      }
+      if (props.model === 'pen') {
+        if (e.deltaY < 0 && penSize.value < 10) penSize.value += 2
+        else if (e.deltaY > 0 && penSize.value > 4) penSize.value -= 2
+      }
+      if (props.model === 'mark') {
+        if (e.deltaY < 0 && markSize.value < 40) markSize.value += 4
+        else if (e.deltaY > 0 && markSize.value > 16) markSize.value -= 4
+      }
+    }, 300, { leading: true, trailing: false })
+
     return {
       mouse,
       mouseInCanvas,
@@ -322,6 +340,7 @@ export default defineComponent({
       clearCanvas,
       getImageDataURL,
       setImageDataURL,
+      mousewheelListener,
     }
   },
 })
diff --git a/src/configs/hotkey.ts b/src/configs/hotkey.ts
index 4e12c43d..ebf14941 100644
--- a/src/configs/hotkey.ts
+++ b/src/configs/hotkey.ts
@@ -51,6 +51,7 @@ export const HOTKEY_DOC = [
       { label: '切换下一页', value: '↓ / → / PgDown' },
       { label: '切换下一页', value: 'Enter / Space' },
       { label: '退出放映', value: 'ESC' },
+      { label: '调整画笔笔触大小', value: '鼠标滚轮' },
     ],
   },
   {
@@ -58,7 +59,7 @@ export const HOTKEY_DOC = [
     children: [
       { label: '新建幻灯片', value: 'Enter' },
       { label: '移动画布', value: 'Space + 鼠标拖拽' },
-      { label: '缩放画布', value: 'Ctrl + 鼠标滚动' },
+      { label: '缩放画布', value: 'Ctrl + 鼠标滚轮' },
       { label: '放大画布', value: 'Ctrl + =' },
       { label: '缩小画布', value: 'Ctrl + -' },
       { label: '使画布适应当前屏幕', value: 'Ctrl + 0' },