From 24c254043606e97f9982e64a2c2e0aad65740ffa Mon Sep 17 00:00:00 2001
From: zdg <zdg@163.com>
Date: Thu, 1 Aug 2024 10:44:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=85=B7=E6=A0=8F-=E6=A9=A1=E7=9A=AE?=
 =?UTF-8?q?=E6=93=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/plugins/fabric/index.js      |  7 ++++-
 src/renderer/src/utils/tool.js                |  4 +--
 .../src/views/tool/components/board.vue       | 27 ++++++++++++++-----
 src/renderer/src/views/tool/sphere.vue        |  6 ++---
 4 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/src/renderer/src/plugins/fabric/index.js b/src/renderer/src/plugins/fabric/index.js
index 01cf1d7..c3cebb5 100644
--- a/src/renderer/src/plugins/fabric/index.js
+++ b/src/renderer/src/plugins/fabric/index.js
@@ -777,7 +777,8 @@ export class TYPES {
     DRAW: 'draw',     // 画笔模式
     ERASE: 'erase',   // 橡皮擦模式
     SELECT: 'select', // 选择模式
-    Board: 'board'    // 画板模式
+    Board: 'board',   // 画板模式
+    OTHER: 'other',   // 其他模式
   }
   // 画笔类型
   static DrawType = {
@@ -1612,6 +1613,10 @@ export class fabricVue {
         objectSet.hoverCursor = undefined
         this.canvas.selection = true
         break
+      case TYPES.ActionMode.OTHER: // 其他(工具选择)
+        this.canvas.isDrawingMode = false
+        this.canvas.freeDrawingCursor = 'default'
+        break
       default:
         break
     }
diff --git a/src/renderer/src/utils/tool.js b/src/renderer/src/utils/tool.js
index 96fcf18..4515f47 100644
--- a/src/renderer/src/utils/tool.js
+++ b/src/renderer/src/utils/tool.js
@@ -69,9 +69,9 @@ export const createWindow = async (type, data) => {
         // parent: mainWin, // 父窗口
         // autoClose: true,    // 关闭窗口后自动关闭
       }
+      data.isConsole = true // 是否开启控制台
       data.option = {...defOption, ...option}
       const win = await toolWindow(data)
-      win.setTitle('窗口标题: 我的自定义参数')
       win.type = type  // 唯一标识
       win.show()
       win.setFullScreen(true) // 设置窗口为全屏
@@ -110,7 +110,7 @@ export const createWindow = async (type, data) => {
  * @author: zdg
  * @date 2021-07-05 14:07:01
  */
-export function toolWindow({url, isFile, isConsole, option={}}) {
+export function toolWindow({url, isConsole, option={}}) {
   // width = window.screen.width
   let width = option?.width || 800
   let height = option?.height || 600
diff --git a/src/renderer/src/views/tool/components/board.vue b/src/renderer/src/views/tool/components/board.vue
index 435112f..895b396 100644
--- a/src/renderer/src/views/tool/components/board.vue
+++ b/src/renderer/src/views/tool/components/board.vue
@@ -4,24 +4,39 @@
 </template>
 <script setup>
 // 功能说明：画板
-import { ref, onMounted } from 'vue'
+import { ref, onMounted, watchEffect } from 'vue'
 import {FabricVue, TYPES} from '@/plugins/fabric'
-import { useBoardStore, useDrawStore } from '@/store/modules/draw'
-const canvasRef = ref(null)
+const canvasRef = ref(null) // 画布
+const isMouse = ref(true)  // 鼠标是否在画布上
 const props = defineProps({
   modelValue: String
 })
-
+// 画板初始化配置
 onMounted(async() => {
   if (canvasRef.value) {
-    // useBoardStore().backgroundColor = 'transparent'
-    // useDrawStore().drawColors = ['red']
     FabricVue.drawConfig.drawColors = ['red']
     FabricVue.boardConfig.backgroundColor = 'transparent'
     const option = { freeDrawingCursor: 'default' }
     await FabricVue.initCanvas(canvasRef.value, option)
   }
 })
+// 监听
+watchEffect(() => {
+  // console.log('board 画板: ', props.modelValue)
+  isMouse.value = false
+  switch(props.modelValue) {
+    case 'select':  // 选择模式
+      FabricVue.handleMode(TYPES.ActionMode.OTHER)
+      break
+    case 'brush':   // 画笔模式
+      FabricVue.handleMode(TYPES.ActionMode.DRAW)
+      FabricVue.canvas.freeDrawingCursor = 'default'
+      break
+    case 'eraser':  // 板擦模式
+      FabricVue.handleMode(TYPES.ActionMode.ERASE)
+      break
+  }
+})
 </script>
 <style lang="scss" scoped>
 </style>
\ No newline at end of file
diff --git a/src/renderer/src/views/tool/sphere.vue b/src/renderer/src/views/tool/sphere.vue
index 3117e88..6c9ad30 100644
--- a/src/renderer/src/views/tool/sphere.vue
+++ b/src/renderer/src/views/tool/sphere.vue
@@ -42,12 +42,10 @@ const btnList = [
 
 // ==== 方法 ===
 const tabChange = (val) => { // 切换tab-change
-  console.log('xxxx', val)
   switch (val) {
-    case 'brush':
+    case 'brush': // 画笔
       break
-    case 'eraser':
-
+    case 'eraser': // 板擦
       break
     case 'interact':
       break