diff --git a/src/hooks/common/useMenu.js b/src/hooks/common/useMenu.js index 5eadcf18..84c8cef7 100644 --- a/src/hooks/common/useMenu.js +++ b/src/hooks/common/useMenu.js @@ -17,17 +17,21 @@ import { useState } from 'react' import { v4 as uuidv4 } from 'uuid' import { useSurfaceShapeBatch } from '@/hooks/surface/useSurfaceShapeBatch' import { useRecoilValue } from 'recoil' -import { currentMenuState } from '@/store/canvasAtom' +import { canvasState, currentMenuState } from '@/store/canvasAtom' import { MENU } from '@/common/common' import { useTrestle } from '@/hooks/module/useTrestle' +import { usePolygon } from '@/hooks/usePolygon' +import { useOrientation } from '@/hooks/module/useOrientation' export default function useMenu() { const menus = [] const currentMenu = useRecoilValue(currentMenuState) + const canvas = useRecoilValue(canvasState) const [popupId, setPopupId] = useState(uuidv4()) const { addPopup } = usePopup() const { deleteAllSurfacesAndObjects } = useSurfaceShapeBatch({}) const { clear: trestleClear } = useTrestle() + const { nextStep } = useOrientation() const handleMenu = (type) => { if (type === 'outline') { switch (currentMenu) { @@ -85,6 +89,10 @@ export default function useMenu() { addPopup(popupId, 1, ) break case MENU.MODULE_CIRCUIT_SETTING.CIRCUIT_TRESTLE_SETTING: + const hasModules = canvas.getObjects().some((obj) => obj.name === 'module') + if (hasModules) { + nextStep() + } addPopup(popupId, 1, ) break } diff --git a/src/hooks/module/useTrestle.js b/src/hooks/module/useTrestle.js index 7c8412db..3e6adaab 100644 --- a/src/hooks/module/useTrestle.js +++ b/src/hooks/module/useTrestle.js @@ -646,7 +646,12 @@ export const useTrestle = () => { const params = { trestles, pcses, modules } //견적서 itemList 조회 - const { data: itemList, data2, result } = await getQuotationItem(params) + const { data, data2, result } = await getQuotationItem(params) + let itemList + if (!data) { + return + } + itemList = data if (result.resultCode === 'E') { swalFire({ text: result.resultMsg, icon: 'error' })