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 +1 -17
2 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit bfc7b3fe32 - Show all commits

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

@ -18,7 +18,6 @@ const Trestle = forwardRef((props, ref) => {
const [selectedRoof, setSelectedRoof] = useState() const [selectedRoof, setSelectedRoof] = useState()
const { const {
trestleState, trestleState,
trestleDetail,
dispatch, dispatch,
raftBaseList, raftBaseList,
trestleList, trestleList,
@ -172,7 +171,6 @@ const Trestle = forwardRef((props, ref) => {
snowGdPossYn, snowGdPossYn,
cvrChecked, cvrChecked,
snowGdChecked, snowGdChecked,
trestleDetail,
} }
} }
return { ...roof } return { ...roof }
@ -226,7 +224,6 @@ const Trestle = forwardRef((props, ref) => {
snowGdPossYn, snowGdPossYn,
cvrChecked, cvrChecked,
snowGdChecked, snowGdChecked,
trestleDetail,
} }
} }
return { ...roof } return { ...roof }
@ -261,22 +258,16 @@ const Trestle = forwardRef((props, ref) => {
setRoofs(newAddedRoofs) setRoofs(newAddedRoofs)
setModuleSelectionData({ setModuleSelectionData({
...moduleSelectionData, ...moduleSelectionData,
roofConstructions: newAddedRoofs.map((roof, index) => { roofConstructions: newAddedRoofs.map((roof) => {
return { return {
addRoof: { addRoof: {
...roof.addRoof, ...roof.addRoof,
...moduleSelectionData.roofConstructions[index].addRoof,
}, },
trestle: { trestle: {
...roof.trestle, ...roof.trestle,
...moduleSelectionData.roofConstructions[index].trestle,
}, },
construction: { construction: {
...roof.construction, ...roof.construction,
...moduleSelectionData.roofConstructions[index].construction,
},
trestleDetail: {
...roof.trestleDetail,
}, },
} }
}), }),

7
src/hooks/module/useModuleTrestle.js
View File

@ -64,7 +64,6 @@ export function useModuleTrestle(props) {
const [ridgeMargin, setRidgeMargin] = useState(0) const [ridgeMargin, setRidgeMargin] = useState(0)
const [kerabaMargin, setKerabaMargin] = useState(0) const [kerabaMargin, setKerabaMargin] = useState(0)
const [trestleState, dispatch] = useReducer(trestleReducer, null) const [trestleState, dispatch] = useReducer(trestleReducer, null)
const [trestleDetail, setTrestleDetail] = useState(null)
useEffect(() => { useEffect(() => {
const raftCodeList = findCommonCode(RAFT_BASE_CODE) const raftCodeList = findCommonCode(RAFT_BASE_CODE)
@ -91,7 +90,6 @@ export function useModuleTrestle(props) {
setConstMthdList([]) setConstMthdList([])
setRoofBaseList([]) setRoofBaseList([])
setConstructionList([]) setConstructionList([])
setTrestleDetail(null)
return return
} }
@ -99,20 +97,17 @@ export function useModuleTrestle(props) {
if (!trestleState.constMthdCd) { if (!trestleState.constMthdCd) {
setRoofBaseList([]) setRoofBaseList([])
setConstructionList([]) setConstructionList([])
setTrestleDetail(null)
return return
} }
handleSetRoofBaseList() handleSetRoofBaseList()
if (!trestleState.roofBaseCd) { if (!trestleState.roofBaseCd) {
setConstructionList([]) setConstructionList([])
setTrestleDetail(null)
return return
} }
handleSetConstructionList() handleSetConstructionList()
if (!trestleState.constTp) { if (!trestleState.constTp) {
setTrestleDetail(null)
return return
} }
@ -198,7 +193,6 @@ export function useModuleTrestle(props) {
setEavesMargin(res[0].data.eaveIntvl) setEavesMargin(res[0].data.eaveIntvl)
setRidgeMargin(res[0].data.ridgeIntvl) setRidgeMargin(res[0].data.ridgeIntvl)
setKerabaMargin(res[0].data.kerabaIntvl) setKerabaMargin(res[0].data.kerabaIntvl)
setTrestleDetail(res[0].data)
// dispatch({ // dispatch({
// type: 'SET_TRESTLE_DETAIL', // type: 'SET_TRESTLE_DETAIL',
// roof: { // roof: {
@ -214,7 +208,6 @@ export function useModuleTrestle(props) {
return { return {
trestleState, trestleState,
trestleDetail,
dispatch, dispatch,
raftBaseList, raftBaseList,
trestleList, trestleList,