qcast3/qcast-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'dev' (#277) from dev into prd-deploy

Browse Source 
Reviewed-on: #277
This commit is contained in:
ysCha 2025-08-05 11:31:22 +09:00
commit 9b18a8a655
2 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/floor-plan/modal/roofAllocation/ContextRoofAllocationSetting.jsx
View File

@ -186,7 +186,7 @@ export default function ContextRoofAllocationSetting(props) {
<input
type="text"
className="input-origin block"
value={parseInt(roof.hajebichi)}
value={roof.hajebichi === '' ? '0' : roof.hajebichi}
readOnly={roof.roofPchAuth === 'R'}
onChange={(e) => handleChangeInput(e, 'hajebichi', index)}
/>
@ -205,8 +205,8 @@ export default function ContextRoofAllocationSetting(props) {
// handleChangeInput(e, currentAngleType === 'slope' ? 'pitch' : 'angle', index)
handleChangePitch(e, index)
}}
value={currentAngleType === 'slope' ? roof.pitch : roof.angle}
defaultValue={currentAngleType === 'slope' ? roof.pitch : roof.angle}
value={currentAngleType === 'slope' ? (roof.pitch || '0') : (roof.angle || '0')}
defaultValue={currentAngleType === 'slope' ? (roof.pitch || '0') : (roof.angle || '0')}
/>
</div>
<span className="absol">{pitchText}</span>

37
src/hooks/roofcover/useRoofAllocationSetting.js
View File

@ -127,21 +127,25 @@ export function useRoofAllocationSetting(id) {
}
})
} else {
roofsArray = [
{
planNo: planNo,
roofApply: true,
roofSeq: 0,
roofMatlCd: 'ROOF_ID_WA_53A',
roofWidth: 265,
roofHeight: 235,
roofHajebichi: 0,
roofGap: 'HEI_455',
roofLayout: 'P',
roofPitch: 4,
roofAngle: 21.8,
},
]
if(roofList.length > 0){
roofsArray = roofList
}else{
roofsArray = [
{
planNo: planNo,
roofApply: true,
roofSeq: 0,
roofMatlCd: 'ROOF_ID_WA_53A',
roofWidth: 265,
roofHeight: 235,
roofHajebichi: 0,
roofGap: 'HEI_455',
roofLayout: 'P',
roofPitch: 4,
roofAngle: 21.8,
},
]
}
}
/**
@ -182,6 +186,9 @@ export function useRoofAllocationSetting(id) {
roofSizeSet: '' + res[0].roofSizeSet,
roofAngleSet: '' + res[0].roofAngleSet,
})
//데이터 동기화
setCurrentRoofList(selectRoofs)
})
} catch (error) {
console.error('Data fetching error:', error)