From 8390d79e5f1ed508556623f86da4ef14b1a4cb6d Mon Sep 17 00:00:00 2001 From: lzp Date: Fri, 20 Mar 2026 13:59:53 +0800 Subject: [PATCH] 111 --- .../Canvas/DepthCanvas/manager/CanvasManager.ts | 12 +----------- .../Canvas/DepthCanvas/manager/LayerManager.ts | 10 +++++----- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/src/components/Canvas/DepthCanvas/manager/CanvasManager.ts b/src/components/Canvas/DepthCanvas/manager/CanvasManager.ts index 4a89cad..5541422 100644 --- a/src/components/Canvas/DepthCanvas/manager/CanvasManager.ts +++ b/src/components/Canvas/DepthCanvas/manager/CanvasManager.ts @@ -29,17 +29,6 @@ fabric.Object.prototype.toObject = function () { return object } -fabric.Image.fromURL = (function (originalFromURL) { - return function (url, callback, imgOptions) { - // 为所有图片请求添加 crossOrigin - const options = { - crossOrigin: 'anonymous', // 关键设置 - ...imgOptions - }; - return originalFromURL.call(this, url, callback, options); - }; -})(fabric.Image.fromURL); - interface CanvasInitOptions { canvasRef: any canvasViewWidth?: number @@ -317,6 +306,7 @@ export class CanvasManager { } if (object.src) { object.src = create(object.src) + object.crossOrigin = 'anonymous' } if (object.fill?.source) { object.fill.source = create(object.fill.source) diff --git a/src/components/Canvas/DepthCanvas/manager/LayerManager.ts b/src/components/Canvas/DepthCanvas/manager/LayerManager.ts index cbf24a4..aabe849 100644 --- a/src/components/Canvas/DepthCanvas/manager/LayerManager.ts +++ b/src/components/Canvas/DepthCanvas/manager/LayerManager.ts @@ -156,10 +156,10 @@ export class LayerManager { const child = options?.child || [] delete options.child const groupObject = new fabric.Group(child, { - subTargetCheck: true, // 关键:检测子对象 - interactive: true, // 启用交互 - hasControls: true, - hasBorders: true, + // subTargetCheck: true, // 关键:检测子对象 + // interactive: true, // 启用交互 + // hasControls: true, + // hasBorders: true, // // 子对象样式 // cornerColor: 'blue', @@ -368,7 +368,7 @@ export class LayerManager { } }) resolve(img) - }) + }, { crossOrigin: 'anonymous' }) }) // console.log(mergedImage) const index = this.canvasManager.getObjects().indexOf(targetLayer);