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

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

@@ -124,7 +124,6 @@ const Trestle = forwardRef((props, ref) => {
 
   useEffect(() => {
     if (constructionList.length > 0) {
-      console.log(constructionList)
       setSelectedConstruction(constructionList.find((construction) => construction.constTp === trestleState?.construction?.constTp) ?? null)
     } else {
       setSelectedConstruction(null)
@@ -144,6 +143,19 @@ const Trestle = forwardRef((props, ref) => {
     return 'no-click'
   }
 
+  const onChangeLength = (e) => {
+    setLengthBase(e)
+    dispatch({
+      type: 'SET_LENGTH',
+      roof: {
+        length: e,
+        moduleTpCd: selectedModules.itemTp ?? '',
+        roofMatlCd: selectedRoof?.roofMatlCd ?? '',
+        raftBaseCd: selectedRaftBase?.clCode,
+      },
+    })
+  }
+
   const onChangeRaftBase = (e) => {
     setSelectedRaftBase(e)
     dispatch({
@@ -225,7 +237,8 @@ const Trestle = forwardRef((props, ref) => {
           snowGdPossYn: constructionList[index].snowGdPossYn,
           cvrYn: constructionList[index].cvrYn,
           mixMatlNo: selectedModules.mixMatlNo,
-          workingWidth: selectedRoof?.length?.toString() ?? '',
+          // workingWidth: selectedRoof?.length?.toString() ?? '',
+          workingWidth: lengthBase,
         },
       })
 
@@ -242,7 +255,7 @@ const Trestle = forwardRef((props, ref) => {
         return {
           ...selectedRoof,
           hajebichi,
-          lenBase: lengthBase,
+          length: lengthBase,
           eavesMargin,
           ridgeMargin,
           kerabaMargin,
@@ -518,7 +531,7 @@ const Trestle = forwardRef((props, ref) => {
                             type="text"
                             className="input-origin block"
                             value={lengthBase}
-                            onChange={(e) => setLengthBase(e.target.value)}
+                            onChange={(e) => onChangeLength(e.target.value)}
                             disabled={selectedRoof.lenAuth === 'R'}
                           />
                         </div>

src/hooks/module/useModuleTrestle.js

@@ -10,6 +10,7 @@ const RAFT_BASE_CODE = '203800'
 
 const trestleReducer = (state, action) => {
   switch (action.type) {
+    case 'SET_LENGTH':
     case 'SET_RAFT_BASE':
     case 'SET_TRESTLE_MAKER':
     case 'SET_CONST_MTHD':
@@ -96,11 +97,15 @@ export function useModuleTrestle(props) {
   useEffect(() => {
     if (trestleState) {
       handleSetTrestleList()
+
       if (!trestleState?.trestleMkrCd) {
         setConstMthdList([])
         setRoofBaseList([])
         setConstructionList([])
         setTrestleDetail(null)
+        setEavesMargin(0)
+        setRidgeMargin(0)
+        setKerabaMargin(0)
         return
       }
 
@@ -109,6 +114,9 @@ export function useModuleTrestle(props) {
         setRoofBaseList([])
         setConstructionList([])
         setTrestleDetail(null)
+        setEavesMargin(0)
+        setRidgeMargin(0)
+        setKerabaMargin(0)
         return
       }
 
@@ -116,12 +124,18 @@ export function useModuleTrestle(props) {
       if (!trestleState?.roofBaseCd) {
         setConstructionList([])
         setTrestleDetail(null)
+        setEavesMargin(0)
+        setRidgeMargin(0)
+        setKerabaMargin(0)
         return
       }
 
       handleSetConstructionList()
       if (!trestleState?.constTp) {
         setTrestleDetail(null)
+        setEavesMargin(0)
+        setRidgeMargin(0)
+        setKerabaMargin(0)
         return
       }
 
@@ -224,7 +238,8 @@ export function useModuleTrestle(props) {
         constTp: trestleState.constTp ?? '',
         mixMatlNo: trestleState.mixMatlNo ?? '',
         roofPitch: trestleState.roofPitch ?? '',
-        workingWidth: trestleState.workingWidth ?? '',
+        // workingWidth: trestleState.length ?? '',
+        workingWidth: lengthBase ?? '',
       },
     ])
       .then((res) => {