Merge branch 'feature/yj-layoutSetup' of https://git.hanasys.jp/qcast3/qcast-front into feature/yj-layoutSetup

# Conflicts:
#	src/components/floor-plan/modal/basic/BasicSetting.jsx
#	src/components/floor-plan/modal/basic/step/Trestle.jsx

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

@@ -18,6 +18,7 @@ const Trestle = forwardRef((props, ref) => {
   const [selectedRoof, setSelectedRoof] = useState()
   const {
     trestleState,
+    trestleDetail,
     dispatch,
     raftBaseList,
     trestleList,
@@ -224,6 +225,7 @@ const Trestle = forwardRef((props, ref) => {
           snowGdPossYn,
           cvrChecked,
           snowGdChecked,
+          trestleDetail,
         }
       }
       return { ...roof }
@@ -272,6 +274,9 @@ const Trestle = forwardRef((props, ref) => {
               ...roof.construction,
               ...moduleSelectionData.roofConstructions[index].construction,
             },
+            trestleDetail: {
+              ...roof.trestleDetail,
+            },
           }
         }),
       })

src/hooks/module/useModuleTrestle.js

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