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

Merge remote-tracking branch 'origin/dev' into feature/ysCha

Browse Source 
# Conflicts:
#	src/components/floor-plan/modal/basic/step/Trestle.jsx
This commit is contained in:
ysCha 2025-09-25 11:13:47 +09:00
commit e94b703e6c
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,6 +21,7 @@ const Trestle = forwardRef((props, ref) => {
const [isAutoSelecting, setIsAutoSelecting] = useState(false) // 자동 선택 중인지 상태 const [isAutoSelecting, setIsAutoSelecting] = useState(false) // 자동 선택 중인지 상태
const [autoSelectTimeout, setAutoSelectTimeout] = useState(null) // 타임아웃 참조 const [autoSelectTimeout, setAutoSelectTimeout] = useState(null) // 타임아웃 참조
const autoSelectTimeoutRef = useRef(null) const autoSelectTimeoutRef = useRef(null)
// 공통 타임아웃 설정 (밀리초) // 공통 타임아웃 설정 (밀리초)
const AUTO_SELECT_TIMEOUT = 700 // API 호출 완료 대기 시간 const AUTO_SELECT_TIMEOUT = 700 // API 호출 완료 대기 시간
const { const {
@ -466,7 +467,8 @@ const Trestle = forwardRef((props, ref) => {
...selectedConstMthd, ...selectedConstMthd,
...selectedRoofBase, ...selectedRoofBase,
}, },
construction: {//data.constTp === trestleState.constTp construction: {
//...constructionList.find((data) => newAddedRoofs[index].construction.constTp === data.constTp),
...constructionList.find((data) => trestleState.constTp === data.constTp), ...constructionList.find((data) => trestleState.constTp === data.constTp),
cvrYn, cvrYn,
snowGdPossYn, snowGdPossYn,