From c253cfe07ec43c10d9b4967779efa0013dcde50c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=8B=9D?=
 <43837214+Minsiki@users.noreply.github.com>
Date: Tue, 11 Feb 2025 10:02:33 +0900
Subject: [PATCH] =?UTF-8?q?=EC=BA=94=EB=B2=84=EC=8A=A4=20=EB=8D=B0?=
 =?UTF-8?q?=EC=9D=B4=ED=84=B0=20=EB=A1=9C=EB=93=9C=EC=8B=9C=20module=20dat?=
 =?UTF-8?q?a=20=EC=A0=80=EC=9E=A5=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/common/useCanvasPopupStatusController.js | 7 +++++--
 src/hooks/useCirCuitTrestle.js                     | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/hooks/common/useCanvasPopupStatusController.js b/src/hooks/common/useCanvasPopupStatusController.js
index 4757fbc0..d7845362 100644
--- a/src/hooks/common/useCanvasPopupStatusController.js
+++ b/src/hooks/common/useCanvasPopupStatusController.js
@@ -5,16 +5,18 @@ import useSWR from 'swr'
 import useSWRMutation from 'swr/mutation'
 import { useAxios } from '../useAxios'
 import { unescapeString } from '@/util/common-utils'
-import { moduleSelectionDataState, moduleSelectionTotalState } from '@/store/selectedModuleOptions'
+import { moduleSelectionDataState, moduleSelectionTotalState, selectedModuleOptionsState, selectedModuleState } from '@/store/selectedModuleOptions'
 import { compasDegAtom } from '@/store/orientationAtom'
 import { canvasState, currentCanvasPlanState } from '@/store/canvasAtom'
 import { POLYGON_TYPE } from '@/common/common'
+import { DateRangePickerField } from '@nextui-org/react'
 
 export function useCanvasPopupStatusController(param = 1) {
   const popupType = parseInt(param)
 
   const [compasDeg, setCompasDeg] = useRecoilState(compasDegAtom)
   const [moduleSelectionDataStore, setModuleSelectionDataStore] = useRecoilState(moduleSelectionDataState)
+  const [selectedModules, setSelectedModules] = useRecoilState(selectedModuleState)
   const { get, getFetcher, postFetcher } = useAxios()
   const canvas = useRecoilValue(canvasState)
   const currentCanvasPlan = useRecoilValue(currentCanvasPlanState)
@@ -50,12 +52,13 @@ export function useCanvasPopupStatusController(param = 1) {
     for (let i = 1; i < 3; i++) {
       const result = await getModuleSelection(i)
       // setModuleSelectionTotal((prev) => ({ ...prev, [i]: JSON.parse(unescapeString(result.popupStatus)) }))
-      if(!result) return
+      if (!result) return
       if (i === 1) {
         setCompasDeg(result.popupStatus)
       } else if (i === 2) {
         const data = JSON.parse(unescapeString(result.popupStatus))
         setModuleSelectionDataStore(data)
+        if (data.module) setSelectedModules(data.module)
 
         const roofSurfaceList = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE_SETUP_SURFACE)
         const modules = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE)
diff --git a/src/hooks/useCirCuitTrestle.js b/src/hooks/useCirCuitTrestle.js
index fd4cb180..8e4b9ade 100644
--- a/src/hooks/useCirCuitTrestle.js
+++ b/src/hooks/useCirCuitTrestle.js
@@ -61,6 +61,7 @@ export function useCircuitTrestle() {
 
   // 사용된 모듈아이템 목록
   const getUseModuleItemList = () => {
+    console.log('🚀 ~ getUseModuleItemList ~ selectedModules:', selectedModules)
     return selectedModules?.itemList?.map((m) => {
       return {
         itemId: m.itemId,