diff --git a/src/components/floor-plan/modal/placementShape/PlacementShapeSetting.jsx b/src/components/floor-plan/modal/placementShape/PlacementShapeSetting.jsx index 0ac134ef..91332f43 100644 --- a/src/components/floor-plan/modal/placementShape/PlacementShapeSetting.jsx +++ b/src/components/floor-plan/modal/placementShape/PlacementShapeSetting.jsx @@ -227,7 +227,7 @@ export default function PlacementShapeSetting({ id, pos = { x: 50, y: 180 }, pla console.log('save Info', { ...basicSetting, selectedRoofMaterial: { - roofInfo, + ...newAddedRoofs[0], }, }) @@ -240,7 +240,7 @@ export default function PlacementShapeSetting({ id, pos = { x: 50, y: 180 }, pla * 선택된 지붕재 정보 */ selectedRoofMaterial: { - roofInfo, + ...newAddedRoofs[0], }, }) diff --git a/src/hooks/option/useCanvasSetting.js b/src/hooks/option/useCanvasSetting.js index 1c7c0e39..6d0d5acf 100644 --- a/src/hooks/option/useCanvasSetting.js +++ b/src/hooks/option/useCanvasSetting.js @@ -498,11 +498,26 @@ export function useCanvasSetting(executeEffect = true) { roofSeq: 0, roofMatlCd: params.roofsData.roofMatlCd === null || params.roofsData.roofMatlCd === undefined ? 'ROOF_ID_WA_53A' : params.roofsData.roofMatlCd, - roofWidth: params.roofsData.roofWidth === null || params.roofsData.roofWidth === undefined ? 0 : params.roofsData.roofWidth, - roofHeight: params.roofsData.roofHeight === null || params.roofsData.roofHeight === undefined ? 0 : params.roofsData.roofHeight, + roofWidth: + params.selectedRoofMaterial.width === null || params.selectedRoofMaterial.width === undefined + ? !params.selectedRoofMaterial.widBase + ? 0 + : params.roofsData.widBase + : params.selectedRoofMaterial.width, + roofHeight: + params.selectedRoofMaterial.height === null || params.selectedRoofMaterial.height === undefined + ? !params.selectedRoofMaterial.lenBase + ? 0 + : params.selectedRoofMaterial.lenBase + : params.roofsData.roofHeight, roofHajebichi: - params.roofsData.roofHajebichi === null || params.roofsData.roofHajebichi === undefined ? 0 : params.roofsData.roofHajebichi, - roofGap: params.roofsData.roofGap === null || params.roofsData.roofGap === undefined ? 'HEI_455' : params.roofsData.roofGap, + params.selectedRoofMaterial.hajebichi === null || params.selectedRoofMaterial.hajebichi === undefined + ? 0 + : params.selectedRoofMaterial.hajebichi, + roofGap: + params.selectedRoofMaterial.raft === null || params.selectedRoofMaterial.raft === undefined + ? params.selectedRoofMaterial.raftBaseCd + : params.roofsData.raft, roofLayout: params.roofsData.roofLayout === null || params.roofsData.roofLayout === undefined ? 'P' : params.roofsData.roofLayout, roofPitch: params.roofsData.roofPitch === null || params.roofsData.roofPitch === undefined ? 0 : params.roofsData.roofPitch, roofAngle: params.roofsData.roofAngle === null || params.roofsData.roofAngle === undefined ? 0 : params.roofsData.roofAngle,