From 6819196d20890e9d703a036cad9a8408fd42fcc9 Mon Sep 17 00:00:00 2001 From: "hyojun.choi" Date: Fri, 8 Aug 2025 15:05:17 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EB=B3=B4=EC=A1=B0=EC=84=A0=20=ED=99=95?= =?UTF-8?q?=EC=A0=95=EC=8B=9C=20=EC=9E=90=EB=A5=B4=EA=B8=B0=20=EC=A0=9C?= =?UTF-8?q?=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hooks/roofcover/useAuxiliaryDrawing.js | 2 +- src/hooks/usePolygon.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/hooks/roofcover/useAuxiliaryDrawing.js b/src/hooks/roofcover/useAuxiliaryDrawing.js index df76adeb..ed16ae58 100644 --- a/src/hooks/roofcover/useAuxiliaryDrawing.js +++ b/src/hooks/roofcover/useAuxiliaryDrawing.js @@ -883,7 +883,7 @@ export function useAuxiliaryDrawing(id, isUseEffect = true) { return } - cutAuxiliary() + // cutAuxiliary() const roofBases = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.ROOF) diff --git a/src/hooks/usePolygon.js b/src/hooks/usePolygon.js index feea596b..6765e13a 100644 --- a/src/hooks/usePolygon.js +++ b/src/hooks/usePolygon.js @@ -845,12 +845,13 @@ export const usePolygon = () => { polygonLines.forEach((polygonLine) => { if (checkLineOverlap(innerLine, polygonLine)) { // innerLine의 type을 polygonLine의 type으로 변경 - if (polygonLine.attributes?.type && innerLine.attributes) { + if (innerLine.attributes && polygonLine.attributes.type) { // polygonLine.need = false innerLine.attributes.planeSize = innerLine.attributes.planeSize ?? polygonLine.attributes.planeSize innerLine.attributes.actualSize = innerLine.attributes.actualSize ?? polygonLine.attributes.actualSize innerLine.direction = polygonLine.direction innerLine.attributes.isStart = true + innerLine.parentLine = polygonLine } } }) From bdef68189837f5b1fa334512beecde5c7f3dbd2f Mon Sep 17 00:00:00 2001 From: "hyojun.choi" Date: Fri, 8 Aug 2025 15:56:17 +0900 Subject: [PATCH 2/2] =?UTF-8?q?type=20=EC=9C=A0=EC=A7=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hooks/usePolygon.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/hooks/usePolygon.js b/src/hooks/usePolygon.js index 6765e13a..86c9a2b9 100644 --- a/src/hooks/usePolygon.js +++ b/src/hooks/usePolygon.js @@ -849,6 +849,7 @@ export const usePolygon = () => { // polygonLine.need = false innerLine.attributes.planeSize = innerLine.attributes.planeSize ?? polygonLine.attributes.planeSize innerLine.attributes.actualSize = innerLine.attributes.actualSize ?? polygonLine.attributes.actualSize + innerLine.attributes.type = polygonLine.attributes.type innerLine.direction = polygonLine.direction innerLine.attributes.isStart = true innerLine.parentLine = polygonLine