From 6a655267fc420c60a81dba6f34a2216a856467d7 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: Mon, 13 Jan 2025 23:09:33 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B0=B0=EC=B9=98=EB=A9=B4=20=EC=B4=88?= =?UTF-8?q?=EA=B8=B0=20=EC=84=A4=EC=A0=95=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/floor-plan/CanvasMenu.jsx | 5 +++-- .../modal/placementShape/PlacementShapeSetting.jsx | 4 +--- src/hooks/option/useCanvasSetting.js | 5 +---- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/components/floor-plan/CanvasMenu.jsx b/src/components/floor-plan/CanvasMenu.jsx index 0e9055ab..fc68f5e4 100644 --- a/src/components/floor-plan/CanvasMenu.jsx +++ b/src/components/floor-plan/CanvasMenu.jsx @@ -296,7 +296,9 @@ export default function CanvasMenu(props) { }, [type, globalLocale]) useEffect(() => { - if (Object.keys(basicSetting).length === 0) return + console.log('🚀 ~ useEffect ~ basicSetting:', basicSetting) + if (Object.keys(basicSetting).length === 0 || !basicSetting.roofSizeSet) return + // setMenuNumber(1) // if ([2, 3].some((num) => num === canvasSetting?.roofSizeSet)) { // setMenuNumber(3) @@ -308,7 +310,6 @@ export default function CanvasMenu(props) { // setCurrentMenu(MENU.ROOF_COVERING.EXTERIOR_WALL_LINE) // } }, [basicSetting]) - const checkMenuState = (menu) => { return (['2', '3'].includes(canvasSetting?.roofSizeSet) && menu.index === 2) || (menuNumber === 4 && menu.index === 2) } diff --git a/src/components/floor-plan/modal/placementShape/PlacementShapeSetting.jsx b/src/components/floor-plan/modal/placementShape/PlacementShapeSetting.jsx index 866c6dea..3821821a 100644 --- a/src/components/floor-plan/modal/placementShape/PlacementShapeSetting.jsx +++ b/src/components/floor-plan/modal/placementShape/PlacementShapeSetting.jsx @@ -46,12 +46,10 @@ export default function PlacementShapeSetting({ id, pos = { x: 50, y: 180 }, set if (!basicSetting || !currentRoof || Object.keys(currentRoof).length === 0 || Object.keys(basicSetting).length === 0) return const raftCodeList = findCommonCode('203800') setRaftCodes(raftCodeList) - // setCurrentRoof({ ...currentRoof, roofSizeSet: basicSetting.roofMaterials.roofSizeSet, roofAngleSet: basicSetting.roofMaterials.roofAngleSet }) + setCurrentRoof({ ...currentRoof, roofSizeSet: basicSetting.roofMaterials.roofSizeSet, roofAngleSet: basicSetting.roofMaterials.roofAngleSet }) }, []) useEffect(() => { - if (!currentRoof || Object.keys(currentRoof).length === 0) return - console.log(basicSetting) setBasicSettings({ ...basicSetting, roofSizeSet: String(currentRoof.roofSizeSet), diff --git a/src/hooks/option/useCanvasSetting.js b/src/hooks/option/useCanvasSetting.js index d793e4f3..0c15c308 100644 --- a/src/hooks/option/useCanvasSetting.js +++ b/src/hooks/option/useCanvasSetting.js @@ -402,16 +402,13 @@ export function useCanvasSetting() { ], } - console.log('basicSettingSave patternData ', patternData) await post({ url: `/api/canvas-management/canvas-basic-settings`, data: patternData }).then((res) => { - console.log('basicSettingSave res ', res) swalFire({ text: getMessage(res.returnMessage) }) }) //Recoil 설정 - //setCanvasSetting({ ...basicSetting })\ - console.log(basicSetting) + setCanvasSetting({ ...basicSetting }) fetchBasicSettings() if (['2', '3'].includes(basicSetting?.roofSizeSet)) { setMenuNumber(3)