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

View File

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