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

Merge remote-tracking branch 'origin/qcast-pub' into feature/yj-layoutSetup

Browse Source 
# Conflicts:
#	src/hooks/module/useModuleTrestle.js
This commit is contained in:
김민식 2025-04-10 13:55:13 +09:00
commit a742fc1f9c
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -247,7 +247,7 @@ const Trestle = forwardRef((props, ref) => {
roofIndex: selectedRoof.index,
trestle: {
hajebichi: hajebichi,
lengthBase: lengthBase,
length: lengthBase,
...selectedRaftBase,
...selectedTrestle,
...selectedConstMthd,
@ -274,12 +274,13 @@ const Trestle = forwardRef((props, ref) => {
if (i === selectedRoof?.index) {
return {
...selectedRoof,
length: lengthBase,
eavesMargin,
ridgeMargin,
kerabaMargin,
roofIndex: roof.index,
trestle: {
lengthBase: lengthBase,
length: lengthBase,
hajebichi: hajebichi,
...selectedRaftBase,
...selectedTrestle,
@ -310,7 +311,7 @@ const Trestle = forwardRef((props, ref) => {
if (!roof.construction?.constTp) result = false
if (roof.lenAuth === 'C') {
if (!roof.trestle?.lengthBase) result = false
if (!roof.trestle?.length) result = false
}
if (['C', 'R'].includes(roof.raftAuth)) {
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)
setRidgeMargin(selectedRoof?.ridgeMargin ?? 0)
setKerabaMargin(selectedRoof?.kerabaMargin ?? 0)
setLengthBase(Math.round(selectedRoof?.lenBase ?? 0))
setLengthBase(Math.round(selectedRoof?.length ?? 0))
setCvrYn(selectedRoof?.construction?.cvrYn ?? 'N')
setCvrChecked(selectedRoof?.construction?.cvrChecked ?? false)
setSnowGdPossYn(selectedRoof?.construction?.snowGdPossYn ?? 'N')