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

src/components/floor-plan/modal/basic/BasicSetting.jsx

@@ -91,14 +91,14 @@ export default function BasicSetting({ id, pos = { x: 50, y: 230 } }) {
   useEffect(() => {
     if (roofsStore && addedRoofs) {
       console.log('🚀 ~ useEffect ~ roofsStore, addedRoofs:', roofsStore, addedRoofs)
-      // setRoofs(
+      setRoofs(
-      //   addedRoofs.map((roof, index) => {
+        addedRoofs.map((roof, index) => {
-      //     return {
+          return {
-      //       ...roof,
+            ...roof,
-      //       ...roofsStore[index]?.addRoof,
+            ...roofsStore[index]?.addRoof,
-      //     }
+          }
-      //   }),
+        }),
-      // )
+      )
 
       setModuleSelectionData({
         ...moduleSelectionData,

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

@@ -5,15 +5,17 @@ import { getDegreeInOrientation } from '@/util/canvas-util'
 import { numberCheck } from '@/util/common-utils'
 import { useCanvasPopupStatusController } from '@/hooks/common/useCanvasPopupStatusController'
 import { addedRoofsState, basicSettingState } from '@/store/settingAtom'
-import { useRecoilState, useRecoilValue } from 'recoil'
+import { useRecoilState, useRecoilValue, useSetRecoilState } from 'recoil'
 import QSelectBox from '@/components/common/select/QSelectBox'
 import { moduleSelectionDataState } from '@/store/selectedModuleOptions'
+import { roofsState } from '@/store/roofAtom'
 
 export const Orientation = forwardRef((props, ref) => {
   const { getMessage } = useMessage()
   const [hasAnglePassivity, setHasAnglePassivity] = useState(false)
   const basicSetting = useRecoilValue(basicSettingState)
   const [addedRoofs, setAddedRoofs] = useRecoilState(addedRoofsState) //지붕재 선택
+  const setRoofsStore = useSetRecoilState(roofsState)
   const [roofTab, setRoofTab] = useState(0) //지붕재 탭
   const {
     roofs,
@@ -224,7 +226,9 @@ export const Orientation = forwardRef((props, ref) => {
         snowGdChecked: false,
       }
     })
-    setRoofs(newRoofs)
+    // setRoofs(newRoofs)
+    // setAddedRoofs(newRoofs)
+    setRoofsStore(newRoofs)
   }
 
   return (

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

@@ -124,7 +124,7 @@ const Trestle = forwardRef((props, ref) => {
       roof: {
         moduleTpCd: selectedModules.itemTp ?? '',
         roofMatlCd: selectedRoof?.roofMatlCd ?? '',
-        raftBaseCd: trestleState.raftBaseCd ?? '',
+        raftBaseCd: selectedRaftBase.clCode,
         trestleMkrCd: e.trestleMkrCd,
       },
     })
@@ -137,8 +137,8 @@ const Trestle = forwardRef((props, ref) => {
       roof: {
         moduleTpCd: selectedModules.itemTp ?? '',
         roofMatlCd: selectedRoof?.roofMatlCd ?? '',
-        raftBaseCd: trestleState.raftBaseCd ?? '',
+        raftBaseCd: selectedRaftBase.clCode,
-        trestleMkrCd: trestleState.trestleMkrCd,
+        trestleMkrCd: selectedTrestle.trestleMkrCd,
         constMthdCd: e.constMthdCd,
       },
     })
@@ -151,9 +151,9 @@ const Trestle = forwardRef((props, ref) => {
       roof: {
         moduleTpCd: selectedModules.itemTp ?? '',
         roofMatlCd: selectedRoof?.roofMatlCd ?? '',
-        raftBaseCd: trestleState.raftBaseCd ?? '',
+        raftBaseCd: selectedRaftBase.clCode,
-        trestleMkrCd: trestleState.trestleMkrCd,
+        trestleMkrCd: selectedTrestle.trestleMkrCd,
-        constMthdCd: trestleState.constMthdCd,
+        constMthdCd: selectedConstMthd.constMthdCd,
         roofBaseCd: e.roofBaseCd,
         illuminationTp: managementState?.surfaceTypeValue ?? '',
         instHt: managementState?.installHeight ?? '',
@@ -192,10 +192,10 @@ const Trestle = forwardRef((props, ref) => {
         roof: {
           moduleTpCd: selectedModules.itemTp ?? '',
           roofMatlCd: selectedRoof?.roofMatlCd ?? '',
-          raftBaseCd: trestleState.raftBaseCd ?? '',
+          raftBaseCd: selectedRaftBase.clCode,
-          trestleMkrCd: trestleState.trestleMkrCd,
+          trestleMkrCd: selectedTrestle.trestleMkrCd,
-          constMthdCd: trestleState.constMthdCd,
+          constMthdCd: selectedConstMthd.constMthdCd,
-          roofBaseCd: trestleState.roofBaseCd,
+          roofBaseCd: selectedRoofBase.roofBaseCd,
           illuminationTp: managementState?.surfaceTypeValue ?? '',
           instHt: managementState?.installHeight ?? '',
           stdWindSpeed: managementState?.standardWindSpeedId ?? '',
@@ -222,7 +222,7 @@ const Trestle = forwardRef((props, ref) => {
       if (i === selectedRoof?.index) {
         return {
           ...selectedRoof,
-          ...trestleState,
+          trestle: trestleState,
           eavesMargin,
           ridgeMargin,
           kerabaMargin,
@@ -272,8 +272,8 @@ const Trestle = forwardRef((props, ref) => {
               ...roof.addRoof,
             },
             trestle: {
-              ...roof.trestle,
               ...moduleSelectionData.roofConstructions[index]?.trestle,
+              ...roof.trestle,
             },
             construction: {
               ...roof.construction,