📌fix: 모듈 회로구성 메뉴 진입시 조건 수정

This commit is contained in:
yoosangwook 2025-02-06 12:25:20 +09:00
parent 87523731c8
commit d2c6373962
2 changed files with 17 additions and 5 deletions

View File

@ -172,12 +172,19 @@ export default function CanvasMenu(props) {
setType('surface') setType('surface')
break break
case 4: case 4:
if (!checkMenuAndCanvasState()) { console.log('🚀 ~ onClickNav ~ menu:', menu)
swalFire({ text: getMessage('menu.validation.canvas.roof') }) console.log('🚀 ~ onClickNav ~ menuNumber:', menuNumber)
return if (menuNumber < menu.index) {
if (!checkMenuAndCanvasState()) {
swalFire({ text: getMessage('menu.validation.canvas.roof') })
return
} else {
setType('module')
}
} else { } else {
setType('module') router.push(`/floor-plan?pid=${pid}&objectNo=${objectNo}`)
} }
break break
case 5: case 5:
// let pid = urlParams.get('pid') // let pid = urlParams.get('pid')
@ -364,6 +371,11 @@ export default function CanvasMenu(props) {
return (['2', '3'].includes(canvasSetting?.roofSizeSet) && menu.index === 2) || (menuNumber === 4 && [1, 2].includes(menu.index)) return (['2', '3'].includes(canvasSetting?.roofSizeSet) && menu.index === 2) || (menuNumber === 4 && [1, 2].includes(menu.index))
} }
/**
* 모듈, 회로 구성 이전 메뉴에서 메뉴 클릭으로 넘어올때
* 지붕면 할당이 끝난 지붕이 하나라도 있는지 체크
* @returns {boolean}
*/
const checkMenuAndCanvasState = () => { const checkMenuAndCanvasState = () => {
const roofs = canvas?.getObjects().filter((obj) => obj.name === POLYGON_TYPE.ROOF) const roofs = canvas?.getObjects().filter((obj) => obj.name === POLYGON_TYPE.ROOF)
// //

View File

@ -26,7 +26,7 @@ export default function MenuDepth01() {
useEffect(() => { useEffect(() => {
handleMenu(type) handleMenu(type)
canvas.discardActiveObject() canvas?.discardActiveObject()
}, [currentMenu]) }, [currentMenu])
return ( return (
<div className="canvas-depth2-inner"> <div className="canvas-depth2-inner">