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

# Conflicts:
#	src/hooks/module/useModuleTrestle.js

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

@@ -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

src/hooks/module/useModuleTrestle.js

@@ -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')