From 809673125e616e3a52af715e7850a83dbf26444f Mon Sep 17 00:00:00 2001 From: "hyojun.choi" Date: Thu, 6 Mar 2025 10:17:31 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EA=B0=80=EB=8C=80=20=EC=84=A4=EC=B9=98=20?= =?UTF-8?q?=EC=99=84=EB=A3=8C=20=EC=A0=84=20=ED=9B=84=20=EC=B2=98=EB=A6=AC?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80=20-=20surface=20isComplete=20=EC=86=8D?= =?UTF-8?q?=EC=84=B1=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modal/circuitTrestle/CircuitTrestleSetting.jsx | 6 +++++- src/hooks/common/useMenu.js | 3 ++- src/hooks/module/useTrestle.js | 12 ++++++++++-- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx index e0d32bbc..9eaeee89 100644 --- a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx +++ b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx @@ -33,7 +33,7 @@ const ALLOCATION_TYPE = { export default function CircuitTrestleSetting({ id }) { const { getMessage } = useMessage() const { closePopup } = usePopup() - const { apply, setViewCircuitNumberTexts, getEstimateData, clear: clearTrestle } = useTrestle() + const { apply, setViewCircuitNumberTexts, getEstimateData, clear: clearTrestle, setAllModuleSurfaceIsComplete } = useTrestle() const { swalFire } = useSwal() const { saveEstimate } = useEstimate() const canvas = useRecoilValue(canvasState) @@ -330,6 +330,8 @@ export default function CircuitTrestleSetting({ id }) { // 회로할당(승압설정) 저장 버튼 클릭 시 const onApply = async () => { + setAllSurfaceIsComplete(false) + setIsGlobalLoading(true) canvas .getObjects() @@ -363,9 +365,11 @@ export default function CircuitTrestleSetting({ id }) { await saveCanvas(false) // 견적서 저장 await saveEstimate(result) + setAllSurfaceIsComplete(true) } else { setIsGlobalLoading(false) } + // removeNotAllocationModules() } diff --git a/src/hooks/common/useMenu.js b/src/hooks/common/useMenu.js index d65611b5..7fdd6a31 100644 --- a/src/hooks/common/useMenu.js +++ b/src/hooks/common/useMenu.js @@ -34,7 +34,7 @@ export default function useMenu() { const [popupId, setPopupId] = useState(uuidv4()) const { addPopup } = usePopup() const { deleteAllSurfacesAndObjects } = useSurfaceShapeBatch({}) - const { clear: trestleClear } = useTrestle() + const { clear: trestleClear, setAllModuleSurfaceIsComplete } = useTrestle() const { nextStep } = useOrientation() const handleMenu = (type) => { if (type === 'outline') { @@ -90,6 +90,7 @@ export default function useMenu() { switch (currentMenu) { case MENU.MODULE_CIRCUIT_SETTING.BASIC_SETTING: trestleClear() + setAllModuleSurfaceIsComplete(false) addPopup(popupId, 1, ) break case MENU.MODULE_CIRCUIT_SETTING.CIRCUIT_TRESTLE_SETTING: diff --git a/src/hooks/module/useTrestle.js b/src/hooks/module/useTrestle.js index b122a19e..0240f519 100644 --- a/src/hooks/module/useTrestle.js +++ b/src/hooks/module/useTrestle.js @@ -602,7 +602,7 @@ export const useTrestle = () => { const quotationParam = getTrestleParams(surface, exposedBottomModules) - surface.set({ quotationParam, isComplete: true }) + surface.set({ quotationParam }) }) return true @@ -2789,5 +2789,13 @@ export const useTrestle = () => { canvas.renderAll() } - return { apply, getTrestleParams, clear, setViewCircuitNumberTexts, getEstimateData } + // 가대 설치 완료 전,후 모든 surface의 isComplete를 변경 + const setAllModuleSurfaceIsComplete = (bool) => { + const surfaces = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE_SETUP_SURFACE) + surfaces.forEach((surface) => { + surface.isComplete = bool + }) + } + + return { apply, getTrestleParams, clear, setViewCircuitNumberTexts, getEstimateData, setAllModuleSurfaceIsComplete } } From 85e2d5b2f0bbd5daa63c6fdf9d66a6d8daee712f Mon Sep 17 00:00:00 2001 From: "hyojun.choi" Date: Thu, 6 Mar 2025 10:23:54 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=ED=95=A8=EC=88=98=EB=AA=85=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx index 9eaeee89..cf238166 100644 --- a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx +++ b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx @@ -330,7 +330,7 @@ export default function CircuitTrestleSetting({ id }) { // 회로할당(승압설정) 저장 버튼 클릭 시 const onApply = async () => { - setAllSurfaceIsComplete(false) + setAllModuleSurfaceIsComplete(false) setIsGlobalLoading(true) canvas @@ -365,7 +365,7 @@ export default function CircuitTrestleSetting({ id }) { await saveCanvas(false) // 견적서 저장 await saveEstimate(result) - setAllSurfaceIsComplete(true) + setAllModuleSurfaceIsComplete(true) } else { setIsGlobalLoading(false) }