From 93c49292b9a3a9bc050ff8b51411094ed321f986 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BF=97=E9=B9=8F?= <2916022834@qq.com>
Date: Sat, 27 Sep 2025 13:56:13 +0800
Subject: [PATCH] fix

---
 components.d.ts                                  |  6 ------
 src/component/Canvas/CanvasEditor/index.vue      |  1 -
 .../CanvasEditor/managers/BrushIndicator.js      | 16 ++++++----------
 .../Canvas/CanvasEditor/managers/ToolManager.js  |  3 +++
 4 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/components.d.ts b/components.d.ts
index fb059677..08f545eb 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -9,10 +9,8 @@ export {}
 declare module 'vue' {
   export interface GlobalComponents {
     ABadge: typeof import('ant-design-vue/es')['Badge']
-    ABreadcrumb: typeof import('ant-design-vue/es')['Breadcrumb']
     ACheckbox: typeof import('ant-design-vue/es')['Checkbox']
     AConfigProvider: typeof import('ant-design-vue/es')['ConfigProvider']
-    ADatePicker: typeof import('ant-design-vue/es')['DatePicker']
     ADrawer: typeof import('ant-design-vue/es')['Drawer']
     ADropdown: typeof import('ant-design-vue/es')['Dropdown']
     AImage: typeof import('ant-design-vue/es')['Image']
@@ -20,21 +18,17 @@ declare module 'vue' {
     AMenu: typeof import('ant-design-vue/es')['Menu']
     AMenuItem: typeof import('ant-design-vue/es')['MenuItem']
     AModal: typeof import('ant-design-vue/es')['Modal']
-    APagination: typeof import('ant-design-vue/es')['Pagination']
     APopover: typeof import('ant-design-vue/es')['Popover']
     ARangePicker: typeof import('ant-design-vue/es')['RangePicker']
     ASelect: typeof import('ant-design-vue/es')['Select']
     ASelectOption: typeof import('ant-design-vue/es')['SelectOption']
     ASlider: typeof import('ant-design-vue/es')['Slider']
-    ASpace: typeof import('ant-design-vue/es')['Space']
     ASpin: typeof import('ant-design-vue/es')['Spin']
-    ASubMenu: typeof import('ant-design-vue/es')['SubMenu']
     ASwitch: typeof import('ant-design-vue/es')['Switch']
     ATable: typeof import('ant-design-vue/es')['Table']
     ATabPane: typeof import('ant-design-vue/es')['TabPane']
     ATabs: typeof import('ant-design-vue/es')['Tabs']
     AUpload: typeof import('ant-design-vue/es')['Upload']
-    ElCascader: typeof import('element-plus/es')['ElCascader']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
   }
diff --git a/src/component/Canvas/CanvasEditor/index.vue b/src/component/Canvas/CanvasEditor/index.vue
index 39a2d0d1..6fe4851e 100644
--- a/src/component/Canvas/CanvasEditor/index.vue
+++ b/src/component/Canvas/CanvasEditor/index.vue
@@ -581,7 +581,6 @@ function zoomOut() {
     x: canvasManager.canvas.width / 2,
     y: canvasManager.canvas.height / 2,
   };
-
   canvasManager.animateZoom(centerPoint, newZoom);
 }
 
diff --git a/src/component/Canvas/CanvasEditor/managers/BrushIndicator.js b/src/component/Canvas/CanvasEditor/managers/BrushIndicator.js
index a04e3751..dac4c65b 100644
--- a/src/component/Canvas/CanvasEditor/managers/BrushIndicator.js
+++ b/src/component/Canvas/CanvasEditor/managers/BrushIndicator.js
@@ -1,5 +1,4 @@
 import { fabric } from "fabric-with-all";
-import {  OperationType } from "../utils/layerHelper";
 
 /**
  * 笔刷指示器
@@ -95,7 +94,6 @@ export class BrushIndicator {
    * @private
    */
   _syncCanvasProperties() {
-		console.log("==========","笔刷同步大小")
     if (!this.staticCanvas || !this.canvas) return;
 
     // 检查是否为笔刷或橡皮擦模式，非相关模式直接返回
@@ -105,8 +103,10 @@ export class BrushIndicator {
       this.canvas.isDrawingMode &&
       this.canvas.freeDrawingBrush &&
       this.canvas.freeDrawingBrush.type === "eraser";
-		const isLiquifyMode = this.canvas.toolId === OperationType.LIQUIFY;// 检查是否在液化模式
-    if ([isBrushMode,isEraserMode,isLiquifyMode].every(v => !v)) return;
+
+    if (!isBrushMode && !isEraserMode) {
+      return;
+    }
 
     let hasChanges = false;
 
@@ -471,12 +471,8 @@ export class BrushIndicator {
    * @returns {Boolean} 是否显示
    */
   _shouldShowIndicator() {
-		const isDrawingMode = this.canvas.isDrawingMode;// 检查画布是否在绘图模式
-		const isLiquifyMode = this.canvas.toolId === OperationType.LIQUIFY;// 检查是否在液化模式
-
-		// console.log(`笔刷指示器\n绘图模式:${isDrawingMode}\n液化模式:${isLiquifyMode}`)
-    // 检查画布是否在绘图模式OR液化模式
-		if ([isDrawingMode, isLiquifyMode].every(v => !v)) return false;
+    // 检查画布是否在绘图模式
+    if (!this.canvas.isDrawingMode) return false;
 
     // 检查是否有笔刷
     if (!this.canvas.freeDrawingBrush) return false;
diff --git a/src/component/Canvas/CanvasEditor/managers/ToolManager.js b/src/component/Canvas/CanvasEditor/managers/ToolManager.js
index 4ecd5861..4cd13926 100644
--- a/src/component/Canvas/CanvasEditor/managers/ToolManager.js
+++ b/src/component/Canvas/CanvasEditor/managers/ToolManager.js
@@ -1192,6 +1192,7 @@ export class ToolManager {
     if (this.brushIndicator) {
       this.brushIndicator.dispose();
       this.brushIndicator = null;
+			console.log("笔刷指示器已清理");
     }
 
     // 移除文本编辑相关事件监听器
@@ -1385,6 +1386,7 @@ export class ToolManager {
     if (!this.brushIndicator) return;
 
     this.brushIndicator.updateSize(size);
+    console.log(`笔刷指示器大小已更新为: ${size}`);
   }
 
   /**
@@ -1395,6 +1397,7 @@ export class ToolManager {
     if (!this.brushIndicator) return;
 
     this.brushIndicator.updateColor(color);
+		console.log(`笔刷指示器颜色已更新为: ${color}`);
   }
 
   /**