Compare commits

..

No commits in common. "a742fc1f9ccf767b2ed88762d9a184eb4cf2ad58" and "e2b8bc19b10e9cfb6f07384073dfcb68f97efda6" have entirely different histories.

2 changed files with 4 additions and 5 deletions

View File

@ -247,7 +247,7 @@ const Trestle = forwardRef((props, ref) => {
roofIndex: selectedRoof.index,
trestle: {
hajebichi: hajebichi,
length: lengthBase,
lengthBase: lengthBase,
...selectedRaftBase,
...selectedTrestle,
...selectedConstMthd,
@ -274,13 +274,12 @@ const Trestle = forwardRef((props, ref) => {
if (i === selectedRoof?.index) {
return {
...selectedRoof,
length: lengthBase,
eavesMargin,
ridgeMargin,
kerabaMargin,
roofIndex: roof.index,
trestle: {
length: lengthBase,
lengthBase: lengthBase,
hajebichi: hajebichi,
...selectedRaftBase,
...selectedTrestle,
@ -311,7 +310,7 @@ const Trestle = forwardRef((props, ref) => {
if (!roof.construction?.constTp) result = false
if (roof.lenAuth === 'C') {
if (!roof.trestle?.length) result = false
if (!roof.trestle?.lengthBase) result = false
}
if (['C', 'R'].includes(roof.raftAuth)) {
if (!roof?.raftBaseCd) result = false

View File

@ -85,7 +85,7 @@ export function useModuleTrestle(props) {
setEavesMargin(selectedRoof?.eavesMargin ?? 0)
setRidgeMargin(selectedRoof?.ridgeMargin ?? 0)
setKerabaMargin(selectedRoof?.kerabaMargin ?? 0)
setLengthBase(Math.round(selectedRoof?.length ?? 0))
setLengthBase(Math.round(selectedRoof?.lenBase ?? 0))
setCvrYn(selectedRoof?.construction?.cvrYn ?? 'N')
setCvrChecked(selectedRoof?.construction?.cvrChecked ?? false)
setSnowGdPossYn(selectedRoof?.construction?.snowGdPossYn ?? 'N')