From 40778513d9068c01079fdd5fe353bd96dccf8cb6 Mon Sep 17 00:00:00 2001
From: pipipi-pikachu <pipipi_pikachu@163.com>
Date: Sun, 17 Dec 2023 16:26:15 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=BD=A2=E7=8A=B6=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E7=BB=98=E5=88=B6=E7=BA=BF=E6=9D=A1?=
 =?UTF-8?q?=EF=BC=88#234=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |  1 +
 src/components/Message.vue                    |  2 +-
 src/configs/hotkey.ts                         |  1 +
 src/hooks/useCreateElement.ts                 |  3 +-
 src/types/edit.ts                             |  2 +
 src/views/Editor/Canvas/ShapeCreateCanvas.vue | 99 +++++++++++++------
 src/views/Editor/Canvas/index.vue             |  9 +-
 7 files changed, 83 insertions(+), 34 deletions(-)

diff --git a/README.md b/README.md
index f9418e14..cb8563ba 100644
--- a/README.md
+++ b/README.md
@@ -109,6 +109,7 @@ npm run serve
 - 设置为背景图
 #### 形状
 - 绘制任意多边形
+- 绘制任意线条（未封闭形状模拟）
 - 替换形状
 - 填充色
 - 边框
diff --git a/src/components/Message.vue b/src/components/Message.vue
index 18bc7400..878dacd7 100644
--- a/src/components/Message.vue
+++ b/src/components/Message.vue
@@ -92,7 +92,7 @@ defineExpose({
 
 <style lang="scss" scoped>
 .message {
-  max-width: 500px;
+  max-width: 600px;
 
   & + & {
     margin-top: 15px;
diff --git a/src/configs/hotkey.ts b/src/configs/hotkey.ts
index 410f7df0..016e25fe 100644
--- a/src/configs/hotkey.ts
+++ b/src/configs/hotkey.ts
@@ -86,6 +86,7 @@ export const HOTKEY_DOC = [
       { label: '创建水平 / 垂直线条', value: '按住 Ctrl 或 Shift' },
       { label: '切换焦点元素', value: 'Tab' },
       { label: '确认图片裁剪', value: 'Enter' },
+      { label: '完成自定义形状绘制', value: 'Enter' },
     ],
   },
   {
diff --git a/src/hooks/useCreateElement.ts b/src/hooks/useCreateElement.ts
index 99a5e225..195aed32 100644
--- a/src/hooks/useCreateElement.ts
+++ b/src/hooks/useCreateElement.ts
@@ -213,7 +213,7 @@ export default () => {
    * @param position 位置大小信息
    * @param data 形状路径信息
    */
-  const createShapeElement = (position: CommonElementPosition, data: ShapePoolItem) => {
+  const createShapeElement = (position: CommonElementPosition, data: ShapePoolItem, supplement: Partial<PPTShapeElement> = {}) => {
     const { left, top, width, height } = position
     const newElement: PPTShapeElement = {
       type: 'shape',
@@ -227,6 +227,7 @@ export default () => {
       fill: theme.value.themeColor,
       fixedRatio: false,
       rotate: 0,
+      ...supplement,
     }
     if (data.special) newElement.special = true
     if (data.pathFormula) {
diff --git a/src/types/edit.ts b/src/types/edit.ts
index 398add4a..d026f104 100644
--- a/src/types/edit.ts
+++ b/src/types/edit.ts
@@ -83,6 +83,8 @@ export interface CreateCustomShapeData {
   end: [number, number]
   path: string
   viewBox: [number, number]
+  fill?: string
+  outline?: PPTElementOutline
 }
 
 export interface CreatingTextElement {
diff --git a/src/views/Editor/Canvas/ShapeCreateCanvas.vue b/src/views/Editor/Canvas/ShapeCreateCanvas.vue
index d7d4e98a..cc34a43a 100644
--- a/src/views/Editor/Canvas/ShapeCreateCanvas.vue
+++ b/src/views/Editor/Canvas/ShapeCreateCanvas.vue
@@ -20,7 +20,7 @@
 <script lang="ts" setup>
 import { computed, onMounted, onUnmounted, ref } from 'vue'
 import { storeToRefs } from 'pinia'
-import { useKeyboardStore, useMainStore } from '@/store'
+import { useKeyboardStore, useMainStore, useSlidesStore } from '@/store'
 import type { CreateCustomShapeData } from '@/types/edit'
 import { KEYS } from '@/configs/hotkey'
 import message from '@/utils/message'
@@ -30,8 +30,10 @@ const emit = defineEmits<{
 }>()
 const mainStore = useMainStore()
 const { ctrlOrShiftKeyActive } = storeToRefs(useKeyboardStore())
+const { theme } = storeToRefs(useSlidesStore())
 
 const shapeCanvasRef = ref<HTMLElement>()
+const isMouseDown = ref(false)
 const offset = ref({
   x: 0,
   y: 0,
@@ -42,14 +44,16 @@ onMounted(() => {
   offset.value = { x, y }
 })
 
-const mousePosition = ref<[number, number]>()
+const mousePosition = ref<[number, number] | null>(null)
 const points = ref<[number, number][]>([])
 const closed = ref(false)
 
-const getPoint = (e: MouseEvent) => {
+const getPoint = (e: MouseEvent, custom = false) => {
   let pageX = e.pageX - offset.value.x
   let pageY = e.pageY - offset.value.y
 
+  if (custom) return { pageX, pageY }
+
   if (ctrlOrShiftKeyActive.value && points.value.length) {
     const [lastPointX, lastPointY] = points.value[points.value.length - 1]
     if (Math.abs(lastPointX - pageX) - Math.abs(lastPointY - pageY) > 0) {
@@ -61,6 +65,13 @@ const getPoint = (e: MouseEvent) => {
 }
 
 const updateMousePosition = (e: MouseEvent) => {
+  if (isMouseDown.value) {
+    const { pageX, pageY } = getPoint(e, true)
+    points.value.push([pageX, pageY])
+    mousePosition.value = null
+    return
+  }
+
   const { pageX, pageY } = getPoint(e)
   mousePosition.value = [pageX, pageY]
 
@@ -87,48 +98,76 @@ const path = computed(() => {
   return d
 })
 
+const getCreateData = (close = true) => {
+  const xList = points.value.map(item => item[0])
+  const yList = points.value.map(item => item[1])
+  const minX = Math.min(...xList)
+  const minY = Math.min(...yList)
+  const maxX = Math.max(...xList)
+  const maxY = Math.max(...yList)
+
+  const formatedPoints = points.value.map(point => {
+    return [point[0] - minX, point[1] - minY]
+  })
+
+  let path = ''
+  for (let i = 0; i < formatedPoints.length; i++) {
+    const point = formatedPoints[i]
+    if (i === 0) path += `M ${point[0]} ${point[1]} `
+    else path += `L ${point[0]} ${point[1]} `
+  }
+  if (close) path += 'Z'
+
+  const start: [number, number] = [minX + offset.value.x, minY + offset.value.y]
+  const end: [number, number] = [maxX + offset.value.x, maxY + offset.value.y]
+  const viewBox: [number, number] = [maxX - minX, maxY - minY]
+
+  return {
+    start,
+    end,
+    path,
+    viewBox,
+  }
+}
+
 const addPoint = (e: MouseEvent) => {
   const { pageX, pageY } = getPoint(e)
+  isMouseDown.value = true
 
-  if (closed.value) {
-    const xList = points.value.map(item => item[0])
-    const yList = points.value.map(item => item[1])
-    const minX = Math.min(...xList)
-    const minY = Math.min(...yList)
-    const maxX = Math.max(...xList)
-    const maxY = Math.max(...yList)
-
-    const formatedPoints = points.value.map(point => {
-      return [point[0] - minX, point[1] - minY]
-    })
-    let path = ''
-    for (let i = 0; i < formatedPoints.length; i++) {
-      const point = formatedPoints[i]
-      if (i === 0) path += `M ${point[0]} ${point[1]} `
-      else path += `L ${point[0]} ${point[1]} `
-    }
-    path += 'Z'
-    
-    emit('created', {
-      start: [minX + offset.value.x, minY + offset.value.y],
-      end: [maxX + offset.value.x, maxY + offset.value.y],
-      path,
-      viewBox: [maxX - minX, maxY - minY],
-    })
-  }
+  if (closed.value) emit('created', getCreateData())
   else points.value.push([pageX, pageY])
+
+  document.onmouseup = () => {
+    isMouseDown.value = false
+  }
 }
 
 const close = () => {
   mainStore.setCreatingCustomShapeState(false)
 }
 
+const create = () => {
+  emit('created', {
+    ...getCreateData(false),
+    fill: 'rgba(0, 0, 0, 0)',
+    outline: {
+      width: 2,
+      color: theme.value.themeColor,
+      style: 'solid',
+    },
+  })
+  close()
+}
+
 const keydownListener = (e: KeyboardEvent) => {
   const key = e.key.toUpperCase()
   if (key === KEYS.ESC) close()
+  if (key === KEYS.ENTER) create()
 }
 onMounted(() => {
-  message.success('点击开始绘制任意多边形，首尾闭合完成绘制，按 ESC 键或鼠标右键关闭')
+  message.success('点击绘制任意形状，首尾闭合完成绘制，按 ESC 键或鼠标右键取消，按 ENTER 键提前完成', {
+    duration: 5000,
+  })
   document.addEventListener('keydown', keydownListener)
 })
 onUnmounted(() => document.removeEventListener('keydown', keydownListener))
diff --git a/src/views/Editor/Canvas/index.vue b/src/views/Editor/Canvas/index.vue
index 430a226f..0f2a00bc 100644
--- a/src/views/Editor/Canvas/index.vue
+++ b/src/views/Editor/Canvas/index.vue
@@ -102,7 +102,7 @@ import { throttle } from 'lodash'
 import { storeToRefs } from 'pinia'
 import { useMainStore, useSlidesStore, useKeyboardStore } from '@/store'
 import type { ContextmenuItem } from '@/components/Contextmenu/types'
-import type { PPTElement } from '@/types/slides'
+import type { PPTElement, PPTShapeElement } from '@/types/slides'
 import type { AlignmentLineProps, CreateCustomShapeData } from '@/types/edit'
 import { injectKeySlideScale } from '@/types/injectKey'
 import { removeAllRanges } from '@/utils/selection'
@@ -277,7 +277,12 @@ const insertCustomShape = (data: CreateCustomShapeData) => {
     viewBox,
   } = data
   const position = formatCreateSelection({ start, end })
-  position && createShapeElement(position, { path, viewBox })
+  if (position) {
+    const supplement: Partial<PPTShapeElement> = {}
+    if (data.fill) supplement.fill = data.fill
+    if (data.outline) supplement.outline = data.outline
+    createShapeElement(position, { path, viewBox }, supplement)
+  }
 
   mainStore.setCreatingCustomShapeState(false)
 }