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

feature/ysCha #23

Closed
ysCha wants to merge 259 commits from feature/ysCha into main
pull from: feature/ysCha
merge into: qcast3:main
Conversation 0 Commits 259 Files Changed 73 +5 -4
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a742fc1f9c - Show all commits

7
src/components/floor-plan/modal/basic/step/Trestle.jsx
View File

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

2
src/hooks/module/useModuleTrestle.js
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?.lenBase ?? 0)) setLengthBase(Math.round(selectedRoof?.length ?? 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')