diff --git a/src/components/floor-plan/modal/basic/step/Orientation.jsx b/src/components/floor-plan/modal/basic/step/Orientation.jsx index a6b54bd0..8eee35d3 100644 --- a/src/components/floor-plan/modal/basic/step/Orientation.jsx +++ b/src/components/floor-plan/modal/basic/step/Orientation.jsx @@ -125,7 +125,7 @@ export const Orientation = forwardRef((props, ref) => { setVerticalSnowCover(inputVerticalSnowCover) setSelectedSurfaceType(inputRoughness) setStandardWindSpeed(inputStandardWindSpeed) - nextStep() + nextStep(inputCompasDeg) setManagementState({ ...managementState, installHeight: inputInstallHeight, diff --git a/src/components/floor-plan/modal/basic/step/Trestle.jsx b/src/components/floor-plan/modal/basic/step/Trestle.jsx index 4c883512..6060d8c8 100644 --- a/src/components/floor-plan/modal/basic/step/Trestle.jsx +++ b/src/components/floor-plan/modal/basic/step/Trestle.jsx @@ -369,8 +369,6 @@ const Trestle = forwardRef((props, ref) => { // ...constructionList.find((construction) => newAddedRoofs[index].construction.constTp === construction.constTp), ...roof.construction, roofIndex: roof.index, - setupCover: roof.construction.cvrChecked, - setupSnowCover: roof.construction.snowGdChecked, selectedIndex: roof.index, }, trestleDetail: roof.trestleDetail, diff --git a/src/hooks/module/useModuleBasicSetting.js b/src/hooks/module/useModuleBasicSetting.js index 1a71c671..1871e34a 100644 --- a/src/hooks/module/useModuleBasicSetting.js +++ b/src/hooks/module/useModuleBasicSetting.js @@ -409,7 +409,7 @@ export function useModuleBasicSetting(tabNum) { useEffect(() => { if (canvasSetting.roofSizeSet != '3') { - if (isObjectNotEmpty(moduleSelectionData) && moduleSelectionData.common.saleStoreNorthFlg === '1') { + if (isObjectNotEmpty(moduleSelectionData) && moduleSelectionData?.common?.saleStoreNorthFlg === '1') { setSaleStoreNorthFlg(true) } } diff --git a/src/hooks/module/useOrientation.js b/src/hooks/module/useOrientation.js index 649d8f79..cf15390e 100644 --- a/src/hooks/module/useOrientation.js +++ b/src/hooks/module/useOrientation.js @@ -22,8 +22,8 @@ export function useOrientation() { }) }, [])*/ - const nextStep = () => { - if (isNaN(compasDeg)) { + const nextStep = (compas = compasDeg) => { + if (isNaN(compas)) { setCompasDeg(0) } const roofs = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.ROOF) @@ -36,7 +36,7 @@ export function useOrientation() { roofs.forEach((roof) => { roof.set({ - moduleCompass: isNaN(compasDeg) ? 0 : compasDeg, + moduleCompass: isNaN(compas) ? 0 : compas, }) drawDirectionArrow(roof) })