From 5ac8d7af20156c243dbb723c310ff4e5a3998b7f Mon Sep 17 00:00:00 2001 From: lelalela Date: Tue, 14 Jan 2025 16:22:57 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B0=80=EB=8C=80=20=EC=83=81=EC=84=B8=20api?= =?UTF-8?q?=20=ED=98=B8=EC=B6=9C=20=EC=9E=91=EC=97=85=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../floor-plan/modal/basic/step/Module.jsx | 4 +-- .../modal/basic/step/ModuleTabContents.jsx | 16 ---------- src/hooks/module/useModulePlace.js | 32 ++++++++++++++++--- src/hooks/module/useModuleSelection.js | 5 +-- 4 files changed, 33 insertions(+), 24 deletions(-) diff --git a/src/components/floor-plan/modal/basic/step/Module.jsx b/src/components/floor-plan/modal/basic/step/Module.jsx index 577bb909..55bc6fa6 100644 --- a/src/components/floor-plan/modal/basic/step/Module.jsx +++ b/src/components/floor-plan/modal/basic/step/Module.jsx @@ -92,8 +92,8 @@ export default function Module({ setTabNum }) { diff --git a/src/components/floor-plan/modal/basic/step/ModuleTabContents.jsx b/src/components/floor-plan/modal/basic/step/ModuleTabContents.jsx index cb9219ac..9eefd131 100644 --- a/src/components/floor-plan/modal/basic/step/ModuleTabContents.jsx +++ b/src/components/floor-plan/modal/basic/step/ModuleTabContents.jsx @@ -286,22 +286,6 @@ export default function ModuleTabContents({ {globalPitchText})
-
-
マンドンピッチ
-
-
- -
-
-
{roofMaterial && ['C'].includes(roofMaterial.lenAuth) && ( <> diff --git a/src/hooks/module/useModulePlace.js b/src/hooks/module/useModulePlace.js index 16b69bb0..39522007 100644 --- a/src/hooks/module/useModulePlace.js +++ b/src/hooks/module/useModulePlace.js @@ -2,8 +2,10 @@ import { useEffect, useState } from 'react' import { useRecoilState, useRecoilValue } from 'recoil' import { moduleSelectionDataState, selectedModuleState } from '@/store/selectedModuleOptions' import { useMasterController } from '@/hooks/common/useMasterController' +import { canvasState } from '@/store/canvasAtom' export function useModulePlace() { + const canvas = useRecoilValue(canvasState) const moduleSelectionData = useRecoilValue(moduleSelectionDataState) //다음으로 넘어가는 최종 데이터 const [trestleDetailParams, setTrestleDetailParams] = useState([]) const [trestleDetailList, setTrestleDetailList] = useState([]) @@ -26,22 +28,44 @@ export function useModulePlace() { mixMatlNo: selectedModules.mixMatlNo, roofPitch: selectedModules.roofPchBase ? selectedModules.roofPchBase : null, inclCd: String(item.addRoof.pitch), - roofIndex: item.addRoof.roofIndex, + roofIndex: item.addRoof.index, } }) setTrestleDetailParams(listParams) }, [moduleSelectionData]) + const getTrestleDetailListData = async () => { + const trestleDetailList = await getTrestleDetailList(trestleDetailParams) + setTrestleDetailList(trestleDetailList) + } + useEffect(() => { if (trestleDetailParams.length > 0) { - const trestleDetailList = getTrestleDetailList(trestleDetailParams) - setTrestleDetailList(trestleDetailList) + getTrestleDetailListData(trestleDetailParams) } }, [trestleDetailParams]) useEffect(() => { - //todo 결과값을 가지고 roofs를 돌아서 + console.log('🚀 ~ useModulePlace ~ trestleDetailList:', trestleDetailList) + + //지붕을 가져옴 + canvas + .getObjects() + .filter((roof) => roof.name === 'roof') + .forEach((roof) => { + const roofIndex = roof.roofMaterial.index //지붕의 지붕재의 순번 + trestleDetailList.forEach((detail) => { + console.log('detail', detail) + console.log('roofIndex', roofIndex) + console.log('detail.data.roofIndex', detail.data.roofIndex) + if (Number(detail.data.roofIndex) === roofIndex) { + roof.set({ trestleDetail: detail.data }) + } + }) + + console.log('roof', roof) + }) }, [trestleDetailList]) return { diff --git a/src/hooks/module/useModuleSelection.js b/src/hooks/module/useModuleSelection.js index 11cc289f..b28e3d97 100644 --- a/src/hooks/module/useModuleSelection.js +++ b/src/hooks/module/useModuleSelection.js @@ -92,6 +92,7 @@ export function useModuleSelection(props) { setModuleSelectionInitParams({ ...moduleSelectionInitParams, moduleTpCd: option.itemTp, + moduleItemId: option.itemId, }) } @@ -128,11 +129,11 @@ export function useModuleSelection(props) { } useEffect(() => { - console.log('installHeight', installHeight) + // console.log('installHeight', installHeight) }, [installHeight]) useEffect(() => { - console.log('verticalSnowCover', verticalSnowCover) + // console.log('verticalSnowCover', verticalSnowCover) }, [verticalSnowCover]) //TODO: 설치높이, 기준적설량 debounce 적용해서 추가해야됨