From f3fb6c863d8dd70286ce2bf766eef35dfe38593b Mon Sep 17 00:00:00 2001
From: changkyu choi <okoookoo@naver.com>
Date: Sun, 9 Feb 2025 20:58:21 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B0=B0=EC=B9=98=EB=A9=B4=EC=B4=88=EA=B8=B0?=
 =?UTF-8?q?=EC=84=A4=EC=A0=95=20=EC=9C=A1=EC=A7=80=EB=B6=95=20=EC=84=A0?=
 =?UTF-8?q?=ED=83=9D=20=ED=9B=84=20=EC=83=88=EB=A1=9C=EA=B3=A0=EC=B9=A8=20?=
 =?UTF-8?q?=EC=8B=9C=20=EB=AA=A8=EB=93=88/=EA=B0=80=EB=8C=80=EC=84=A4?=
 =?UTF-8?q?=EC=A0=95=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../floor-plan/modal/basic/BasicSetting.jsx   | 20 +++++++++----------
 .../modal/basic/step/pitch/PitchPlacement.jsx |  2 ++
 src/hooks/option/useCanvasSetting.js          |  1 -
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/components/floor-plan/modal/basic/BasicSetting.jsx b/src/components/floor-plan/modal/basic/BasicSetting.jsx
index 68c1e617..3baa57e2 100644
--- a/src/components/floor-plan/modal/basic/BasicSetting.jsx
+++ b/src/components/floor-plan/modal/basic/BasicSetting.jsx
@@ -12,7 +12,7 @@ import { Orientation } from '@/components/floor-plan/modal/basic/step/Orientatio
 import { useModuleBasicSetting } from '@/hooks/module/useModuleBasicSetting'
 import { useEvent } from '@/hooks/useEvent'
 import { moduleSelectionDataState } from '@/store/selectedModuleOptions'
-import { addedRoofsState, corridorDimensionSelector } from '@/store/settingAtom'
+import { addedRoofsState, corridorDimensionSelector, basicSettingState } from '@/store/settingAtom'
 import { isObjectNotEmpty } from '@/util/common-utils'
 import Swal from 'sweetalert2'
 import { useCanvasPopupStatusController } from '@/hooks/common/useCanvasPopupStatusController'
@@ -34,7 +34,7 @@ export default function BasicSetting({ id, pos = { x: 50, y: 230 } }) {
   const loginUserState = useRecoilValue(loginUserStore)
   const currentCanvasPlan = useRecoilValue(currentCanvasPlanState)
   const canvas = useRecoilValue(canvasState)
-
+  const [basicSetting, setBasicSettings] = useRecoilState(basicSettingState)
   const [isClosePopup, setIsClosePopup] = useState({ close: false, id: 0 })
 
   // const { initEvent } = useContext(EventContext)
@@ -44,7 +44,7 @@ export default function BasicSetting({ id, pos = { x: 50, y: 230 } }) {
     if (tabNum === 1) {
       orientationRef.current.handleNextStep()
     } else if (tabNum === 2) {
-      if (canvasSetting.roofSizeSet !== '3') {
+      if (basicSetting.roofSizeSet !== '3') {
         if (!isObjectNotEmpty(moduleSelectionData.module)) {
           Swal.fire({
             title: getMessage('module.not.found'),
@@ -124,7 +124,7 @@ export default function BasicSetting({ id, pos = { x: 50, y: 230 } }) {
   }
 
   useEffect(() => {
-    if (canvasSetting.roofSizeSet !== '3') {
+    if (basicSetting.roofSizeSet !== '3') {
       manualModuleSetup(placementRef)
     } else {
       manualFlatroofModuleSetup(placementFlatRef)
@@ -153,12 +153,12 @@ export default function BasicSetting({ id, pos = { x: 50, y: 230 } }) {
           </div>
           {tabNum === 1 && <Orientation ref={orientationRef} tabNum={tabNum} setTabNum={setTabNum} />}
           {/*배치면 초기설정 - 입력방법: 복시도 입력 || 실측값 입력*/}
-          {canvasSetting.roofSizeSet && canvasSetting.roofSizeSet != '3' && tabNum === 2 && <Module setTabNum={setTabNum} />}
-          {canvasSetting.roofSizeSet && canvasSetting.roofSizeSet != '3' && tabNum === 3 && <Placement setTabNum={setTabNum} ref={placementRef} />}
+          {basicSetting.roofSizeSet && basicSetting.roofSizeSet != '3' && tabNum === 2 && <Module setTabNum={setTabNum} />}
+          {basicSetting.roofSizeSet && basicSetting.roofSizeSet != '3' && tabNum === 3 && <Placement setTabNum={setTabNum} ref={placementRef} />}
 
           {/*배치면 초기설정 - 입력방법: 육지붕*/}
-          {canvasSetting.roofSizeSet && canvasSetting.roofSizeSet == '3' && tabNum === 2 && <PitchModule setTabNum={setTabNum} />}
-          {canvasSetting.roofSizeSet && canvasSetting.roofSizeSet == '3' && tabNum === 3 && (
+          {basicSetting.roofSizeSet && basicSetting.roofSizeSet == '3' && tabNum === 2 && <PitchModule setTabNum={setTabNum} />}
+          {basicSetting.roofSizeSet && basicSetting.roofSizeSet == '3' && tabNum === 3 && (
             <PitchPlacement setTabNum={setTabNum} ref={placementFlatRef} />
           )}
 
@@ -177,7 +177,7 @@ export default function BasicSetting({ id, pos = { x: 50, y: 230 } }) {
 
             {tabNum === 3 && (
               <>
-                {canvasSetting.roofSizeSet && canvasSetting.roofSizeSet != 3 && (
+                {basicSetting.roofSizeSet && basicSetting.roofSizeSet != '3' && (
                   <>
                     <button className={`btn-frame modal mr5 ${isManualModuleSetup ? 'act' : ''}`} onClick={handleManualModuleSetup}>
                       {getMessage('modal.module.basic.setting.passivity.placement')}
@@ -187,7 +187,7 @@ export default function BasicSetting({ id, pos = { x: 50, y: 230 } }) {
                     </button>
                   </>
                 )}
-                {canvasSetting.roofSizeSet && canvasSetting.roofSizeSet == 3 && (
+                {basicSetting.roofSizeSet && basicSetting.roofSizeSet == '3' && (
                   <>
                     <button className={`btn-frame modal mr5 ${isManualModuleSetup ? 'act' : ''}`} onClick={handleManualModuleSetup}>
                       {getMessage('modal.module.basic.setting.passivity.placement')}
diff --git a/src/components/floor-plan/modal/basic/step/pitch/PitchPlacement.jsx b/src/components/floor-plan/modal/basic/step/pitch/PitchPlacement.jsx
index 14d27df7..64d91881 100644
--- a/src/components/floor-plan/modal/basic/step/pitch/PitchPlacement.jsx
+++ b/src/components/floor-plan/modal/basic/step/pitch/PitchPlacement.jsx
@@ -44,6 +44,7 @@ const PitchPlacement = forwardRef((props, refs) => {
   //체크된 모듈 데이터
   useEffect(() => {
     const checkedModuleIds = Object.keys(selectedItems).filter((key) => selectedItems[key])
+    if (selectedModules.length < 1) return // null 오류 차단 로직 추가
     const moduleArray = selectedModules.itemList.filter((item) => {
       return checkedModuleIds.includes(item.itemId)
     })
@@ -88,6 +89,7 @@ const PitchPlacement = forwardRef((props, refs) => {
   }
 
   useEffect(() => {
+    if (!moduleSelectionData.flatModule) return // null 오류 차단 로직 추가
     if (moduleSelectionData && moduleSelectionData.flatModule.itemList.length > 0) {
       let initCheckedModule = {}
       moduleSelectionData.flatModule.itemList.forEach((obj, index) => {
diff --git a/src/hooks/option/useCanvasSetting.js b/src/hooks/option/useCanvasSetting.js
index c5ce450c..82e83abb 100644
--- a/src/hooks/option/useCanvasSetting.js
+++ b/src/hooks/option/useCanvasSetting.js
@@ -394,7 +394,6 @@ export function useCanvasSetting() {
                 layout: roofsArray[i].roofLayout,
                 roofSizeSet: roofsRow[i].roofSizeSet,
                 roofAngleSet: roofsRow[i].roofAngleSet,
-                roofDbData: roofsRow[i].roofDbData,
                 pitch: roofsArray[i].roofPitch,
                 angle: roofsArray[i].roofAngle,
               })