From 2f53c6e22ec82d0eb1d93ea1a586af4c76507cf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=8B=9D?= <43837214+Minsiki@users.noreply.github.com> Date: Tue, 4 Mar 2025 16:52:58 +0900 Subject: [PATCH] =?UTF-8?q?surface=20=EC=9E=88=EB=8A=94=20=EC=83=81?= =?UTF-8?q?=ED=83=9C=EC=97=90=EC=84=9C=20=EB=B0=B0=EC=B9=98=EB=A9=B4?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EC=9D=B4=EB=8F=99=EC=8B=9C=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/floor-plan/CanvasMenu.jsx | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/components/floor-plan/CanvasMenu.jsx b/src/components/floor-plan/CanvasMenu.jsx index 63ecdef3..c97907c5 100644 --- a/src/components/floor-plan/CanvasMenu.jsx +++ b/src/components/floor-plan/CanvasMenu.jsx @@ -183,7 +183,10 @@ export default function CanvasMenu(props) { await reloadCanvasStatus(objectNo, pid) break case 'surface': - const modules = canvas.getObjects().filter((module) => module.name === POLYGON_TYPE.MODULE) + const modules = canvas + .getObjects() + .filter((obj) => [POLYGON_TYPE.MODULE_SETUP_SURFACE, POLYGON_TYPE.MODULE, POLYGON_TYPE.OBJECT_SURFACE].includes(obj.name)) + if (modules.length > 0) { swalFire({ text: getMessage('module.delete.confirm'), @@ -194,10 +197,7 @@ export default function CanvasMenu(props) { const moduleSurfacesArray = canvas .getObjects() - .filter( - (obj) => - obj.name === POLYGON_TYPE.MODULE_SETUP_SURFACE || obj.name === POLYGON_TYPE.MODULE || obj.name === POLYGON_TYPE.OBJECT_SURFACE, - ) + .filter((obj) => [POLYGON_TYPE.MODULE_SETUP_SURFACE, POLYGON_TYPE.MODULE, POLYGON_TYPE.OBJECT_SURFACE].includes(obj.name)) if (moduleSurfacesArray.length > 0) { // 모듈면 있을 경우 지붕면 할당 다시해야함 @@ -302,7 +302,6 @@ export default function CanvasMenu(props) { const settingsModalOptions = useRecoilState(settingModalFirstOptionsState) useEffect(() => { - console.log(selectedMenu) if (selectedMenu === 'placement') { onClickPlacementInitialMenu() }