diff --git a/src/components/floor-plan/modal/basic/step/Module.jsx b/src/components/floor-plan/modal/basic/step/Module.jsx index a574fb65..8ab6f394 100644 --- a/src/components/floor-plan/modal/basic/step/Module.jsx +++ b/src/components/floor-plan/modal/basic/step/Module.jsx @@ -56,12 +56,14 @@ export default function Module({ setTabNum }) { }, [installHeight, verticalSnowCover]) useEffect(() => { - if (tempModuleSelectionData.roofConstructions.length > 0) { - if (tempModuleSelectionData.common.moduleItemId && isObjectNotEmpty(tempModuleSelectionData.module)) { - //저장된 temp데이터가 지붕재(addedRoofs) 개수와 같으면 모듈 선택 저장 - setModuleSelectionData(tempModuleSelectionData) - if (tempModuleSelectionData.roofConstructions.length === addedRoofs.length) { - moduleSelectedDataTrigger(tempModuleSelectionData) + if (isObjectNotEmpty(tempModuleSelectionData)) { + if (tempModuleSelectionData.roofConstructions.length > 0) { + if (tempModuleSelectionData.common.moduleItemId && isObjectNotEmpty(tempModuleSelectionData.module)) { + //저장된 temp데이터가 지붕재(addedRoofs) 개수와 같으면 모듈 선택 저장 + setModuleSelectionData(tempModuleSelectionData) + if (tempModuleSelectionData.roofConstructions.length === addedRoofs.length) { + moduleSelectedDataTrigger(tempModuleSelectionData) + } } } } diff --git a/src/hooks/module/useModuleBasicSetting.js b/src/hooks/module/useModuleBasicSetting.js index 96f10738..2cb64313 100644 --- a/src/hooks/module/useModuleBasicSetting.js +++ b/src/hooks/module/useModuleBasicSetting.js @@ -360,7 +360,7 @@ export function useModuleBasicSetting(tabNum) { useEffect(() => { if (canvasSetting.roofSizeSet !== '3') { - if (moduleSelectionData.common.saleStoreNorthFlg === '1') { + if (isObjectNotEmpty(moduleSelectionData) && moduleSelectionData.common.saleStoreNorthFlg === '1') { setSaleStoreNorthFlg(true) } } diff --git a/src/hooks/module/useModuleTabContents.js b/src/hooks/module/useModuleTabContents.js index 0c5092da..1f79efb3 100644 --- a/src/hooks/module/useModuleTabContents.js +++ b/src/hooks/module/useModuleTabContents.js @@ -287,7 +287,7 @@ export function useModuleTabContents({ tabIndex, addRoof, setAddedRoofs, roofTab construction: selectedConstruction, } - const index = tempModuleSelectionData.roofConstructions.findIndex((obj) => obj.roofIndex === tabIndex) + const index = moduleSelectionData.roofConstructions.findIndex((obj) => obj.roofIndex === tabIndex) if (index > -1) { const newArray = [ diff --git a/src/hooks/option/useCanvasSetting.js b/src/hooks/option/useCanvasSetting.js index e195b8d9..c5ce450c 100644 --- a/src/hooks/option/useCanvasSetting.js +++ b/src/hooks/option/useCanvasSetting.js @@ -476,7 +476,7 @@ export function useCanvasSetting() { //모듈 선택 데이터 초기화 resetModuleSelectionData() - moduleSelectedDataTrigger('') + moduleSelectedDataTrigger({ common: {}, module: {}, roofConstructions: [] }) const isModuleExist = canvas.getObjects().some((obj) => obj.name === POLYGON_TYPE.MODULE) if (!isModuleExist) { diff --git a/src/hooks/useCirCuitTrestle.js b/src/hooks/useCirCuitTrestle.js index 3b37d226..059bbc0d 100644 --- a/src/hooks/useCirCuitTrestle.js +++ b/src/hooks/useCirCuitTrestle.js @@ -193,12 +193,12 @@ export function useCircuitTrestle() { const tempHeader = [ { name: getMessage('simulator.table.sub1'), prop: 'name' }, { name: getMessage('modal.circuit.trestle.setting.circuit.allocation.passivity.circuit'), prop: 'circuit' }, - ...moduleSelectionData.module?.itemList?.map((module) => { - return { - name: module.itemNm, - prop: module.itemId, - } - }), + // ...moduleSelectionData.module?.itemList?.map((module) => { + // return { + // name: module.itemNm, + // prop: module.itemId, + // } + // }), { name: `${getMessage('modal.panel.batch.statistic.power.generation.amount')}(kW)`, prop: 'wpOut' }, ] const surfaceObjects = {}