From dda24a11257f08cf3ebe403ef793ed58f49211a0 Mon Sep 17 00:00:00 2001 From: "hyojun.choi" Date: Fri, 21 Feb 2025 11:34:08 +0900 Subject: [PATCH] =?UTF-8?q?=EB=AA=A8=EB=93=88=EB=A9=B4=20=EC=9E=88?= =?UTF-8?q?=EC=9D=84=20=EA=B2=BD=EC=9A=B0=EB=A7=8C=20=EC=A7=80=EB=B6=95?= =?UTF-8?q?=EB=A9=B4=20=ED=95=A0=EB=8B=B9=20=EB=8B=A4=EC=8B=9C=ED=95=B4?= =?UTF-8?q?=EC=95=BC=ED=95=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/floor-plan/CanvasMenu.jsx | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/components/floor-plan/CanvasMenu.jsx b/src/components/floor-plan/CanvasMenu.jsx index 8ccfff42..99499e88 100644 --- a/src/components/floor-plan/CanvasMenu.jsx +++ b/src/components/floor-plan/CanvasMenu.jsx @@ -177,16 +177,12 @@ export default function CanvasMenu(props) { case 3: if (menuNumber > menu.index) { const modules = canvas.getObjects().filter((module) => module.name === POLYGON_TYPE.MODULE) + const roofs = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.ROOF) - canvas - .getObjects() - .filter((obj) => obj.name === POLYGON_TYPE.ROOF) - .forEach((roof) => { - roof.set({ selectable: true }) - delete roof.moduleCompass - drawDirectionArrow(roof) - setSurfaceShapePattern(roof, null, false, roof.roofMaterial) - }) + roofs.forEach((roof) => { + delete roof.moduleCompass + drawDirectionArrow(roof) + }) if (modules.length > 0) { swalFire({ @@ -194,6 +190,7 @@ export default function CanvasMenu(props) { type: 'confirm', confirmFn: () => { //해당 메뉴 이동시 배치면 삭제 + const moduleSurfacesArray = canvas .getObjects() .filter( @@ -202,6 +199,11 @@ export default function CanvasMenu(props) { ) if (moduleSurfacesArray.length > 0) { + // 모듈면 있을 경우 지붕면 할당 다시해야함 + roofs.forEach((roof) => { + roof.set({ selectable: true }) + setSurfaceShapePattern(roof, null, false, roof.roofMaterial) + }) moduleSurfacesArray.forEach((moduleSurface) => { canvas.remove(moduleSurface) })