解决合并冲突

2025-09-25 15:36:35 +08:00
parent 0f25730307
commit 2d63a48526
2 changed files with 13 additions and 5 deletions
--- a/src/component/Canvas/CanvasEditor/index.vue
+++ b/src/component/Canvas/CanvasEditor/index.vue
@@ -541,10 +541,6 @@ function handleWindowResize() {
 function resetZoom() {
  canvasManager.resetZoom();
 }
-function setZoom(zoom) {
-	setTimeout(()=>{
-  if (!canvasManager) return;
-  const newZoom = Math.max(zoom, 0.1); // 最小0.1倍

 function setZoom(zoom) {
 	setTimeout(()=>{
@@ -555,7 +551,6 @@ function setZoom(zoom) {
    x: canvasManager.canvas.width / 2,
    y: canvasManager.canvas.height / 2,
  };
-
  canvasManager.animateZoom(centerPoint, newZoom);
 	})
 }