diff --git a/src/App.vue b/src/App.vue index f8776848..6923d861 100644 --- a/src/App.vue +++ b/src/App.vue @@ -18,6 +18,8 @@ -moz-user-select:none; -ms-user-select: none; user-select:none; + + touch-action: pan-x pan-y; /* 允许单指平移(滚动)但禁用捏合缩放 */ input,textarea{ -webkit-touch-callout:default; -khtml-user-select:auto; diff --git a/src/component/Canvas/CanvasEditor/managers/brushes/brushManager.js b/src/component/Canvas/CanvasEditor/managers/brushes/brushManager.js index 5a8afd16..051659ab 100644 --- a/src/component/Canvas/CanvasEditor/managers/brushes/brushManager.js +++ b/src/component/Canvas/CanvasEditor/managers/brushes/brushManager.js @@ -188,6 +188,7 @@ export class BrushManager { // } // ); // 注册橡皮擦笔刷 + const outerThis = this; brushRegistry.register( "eraser", class EraserBrush extends PencilBrush { @@ -195,6 +196,7 @@ export class BrushManager { super(canvas, { id: "eraser", name: "橡皮擦", + t:outerThis.t, description: "擦除已绘制的内容", category: "工具", ...options, diff --git a/src/component/Canvas/CanvasEditor/managers/brushes/types/PencilBrush.js b/src/component/Canvas/CanvasEditor/managers/brushes/types/PencilBrush.js index d691fc4d..3fe768e4 100644 --- a/src/component/Canvas/CanvasEditor/managers/brushes/types/PencilBrush.js +++ b/src/component/Canvas/CanvasEditor/managers/brushes/types/PencilBrush.js @@ -11,12 +11,14 @@ export class PencilBrush extends BaseBrush { * @param {Object} options 配置选项 */ constructor(canvas, options = {}) { + // console.log(options,'=-===========================') super(canvas, { id: "pencil", name: "铅笔", description: "基础铅笔工具,适合精细线条绘制", category: "基础笔刷", icon: "pencil", + t: options.t, ...options, }); @@ -249,7 +251,6 @@ export class PencilBrush extends BaseBrush { getConfigurableProperties() { // 获取基础属性 const baseProperties = super.getConfigurableProperties(); - // 定义铅笔笔刷特有属性 const pencilProperties = [ // { diff --git a/src/component/HomePage/scaleImage.vue b/src/component/HomePage/scaleImage.vue index 69d305d8..c00a2a02 100644 --- a/src/component/HomePage/scaleImage.vue +++ b/src/component/HomePage/scaleImage.vue @@ -25,7 +25,7 @@