diff --git a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx index 0df59150..fbff17b2 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 } = useTrestle() + const { apply, setViewCircuitNumberTexts, getEstimateData } = useTrestle() const { swalFire } = useSwal() const { saveEstimate } = useEstimate() const canvas = useRecoilValue(canvasState) @@ -344,7 +344,10 @@ export default function CircuitTrestleSetting({ id }) { handleCanvasToPng(1) //회로할당 저장 클릭 시 - const result = await apply() + // 가대 및 지지금구 설치 + apply() + + const result = await getEstimateData() //회로할당 저장 시 result=null인 경우에도 회로번호 텍스트 표시 유지 처리 setViewCircuitNumberTexts(true) diff --git a/src/hooks/module/useTrestle.js b/src/hooks/module/useTrestle.js index 3f52f0ca..d4f54339 100644 --- a/src/hooks/module/useTrestle.js +++ b/src/hooks/module/useTrestle.js @@ -598,7 +598,6 @@ export const useTrestle = () => { surface.set({ quotationParam, isComplete: true }) }) - return setEstimateData() } catch (e) { // 에러 발생시 가대 초기화 console.error(e) @@ -624,7 +623,7 @@ export const useTrestle = () => { } // itemList 조회 후 estimateParam에 저장 - const setEstimateData = async () => { + const getEstimateData = async () => { const surfaces = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE_SETUP_SURFACE) //surfaces.pcses들을 배열로 묶는다 const pcses = surfaces[0].pcses.filter((pcs) => pcs !== null && pcs !== undefined) @@ -653,17 +652,18 @@ export const useTrestle = () => { //견적서 itemList 조회 const { data, data2, result } = await getQuotationItem(params) - let itemList - if (!data) { - return - } - itemList = data if (result.resultCode === 'E') { swalFire({ text: result.resultMsg, icon: 'error' }) - return null + return } + let itemList + if (!data || data.length === 0) { + return + } + itemList = data + //northArrangement 북면 설치 여부 const northArrangement = getNorthArrangement() // circuitItemList의 경우는 moduleList에서 circuitId만 groupBy한다. @@ -2698,5 +2698,5 @@ export const useTrestle = () => { canvas.renderAll() } - return { apply, getTrestleParams, clear, setViewCircuitNumberTexts } + return { apply, getTrestleParams, clear, setViewCircuitNumberTexts, getEstimateData } }