From 75bc0ac8a27adc316e57dce70599c27b00417e31 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: Sat, 8 Feb 2025 15:07:31 +0900
Subject: [PATCH] =?UTF-8?q?-=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/floor-plan/FloorPlan.jsx                  | 9 ++++++++-
 .../floor-plan/modal/panelBatch/PanelBatchStatistics.jsx | 4 +---
 src/hooks/useCirCuitTrestle.js                           | 3 ++-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/components/floor-plan/FloorPlan.jsx b/src/components/floor-plan/FloorPlan.jsx
index 6c29dd57..6adae9a8 100644
--- a/src/components/floor-plan/FloorPlan.jsx
+++ b/src/components/floor-plan/FloorPlan.jsx
@@ -7,8 +7,9 @@ import { useCanvasSetting } from '@/hooks/option/useCanvasSetting'
 import { usePopup } from '@/hooks/usePopup'
 import '@/styles/contents.scss'
 import { notFound, useSearchParams } from 'next/navigation'
-import { useRecoilState } from 'recoil'
+import { useRecoilState, useResetRecoilState } from 'recoil'
 import { correntObjectNoState } from '@/store/settingAtom'
+import { currentMenuState } from '@/store/canvasAtom'
 
 export default function FloorPlan({ children }) {
   const [correntObjectNo, setCurrentObjectNo] = useRecoilState(correntObjectNoState)
@@ -19,6 +20,12 @@ export default function FloorPlan({ children }) {
   const { closeAll } = usePopup()
   const { menuNumber, setMenuNumber } = useCanvasMenu()
   const { fetchSettings, fetchBasicSettings } = useCanvasSetting()
+  const resetCurrentMenu = useResetRecoilState(currentMenuState)
+  useEffect(() => {
+    return () => {
+      resetCurrentMenu()
+    }
+  }, [])
 
   // URL 파라미터에서 objectNo 설정
   useEffect(() => {
diff --git a/src/components/floor-plan/modal/panelBatch/PanelBatchStatistics.jsx b/src/components/floor-plan/modal/panelBatch/PanelBatchStatistics.jsx
index bb23102e..af66b672 100644
--- a/src/components/floor-plan/modal/panelBatch/PanelBatchStatistics.jsx
+++ b/src/components/floor-plan/modal/panelBatch/PanelBatchStatistics.jsx
@@ -50,9 +50,7 @@ export default function PanelBatchStatistics() {
               {rows.map((row, index) => (
                 <tr key={`statistic-row-${index}`}>
                   {header.map((item, i) => (
-                    <td key={`statistic-col-${i}`}>
-                      {typeof row[item.prop] === 'number' ? row[item.prop].toLocaleString('ko-KR', { maximumFractionDigits: 4 }) : row[item.prop]}
-                    </td>
+                    <td key={`statistic-col-${i}`}>{row[item.prop] ?? 0}</td>
                   ))}
                 </tr>
               ))}
diff --git a/src/hooks/useCirCuitTrestle.js b/src/hooks/useCirCuitTrestle.js
index 3c072af6..3b37d226 100644
--- a/src/hooks/useCirCuitTrestle.js
+++ b/src/hooks/useCirCuitTrestle.js
@@ -188,7 +188,8 @@ export function useCircuitTrestle() {
     roofSurfaceList.forEach((surface) => {
       surface.modules = modules.filter((module) => module.surfaceId === surface.id)
     })
-    if (!moduleSelectionData.module || moduleSelectionData.module?.itemList?.length === 0) return
+    // console.log(moduleSelectionData)
+    if (!moduleSelectionData || !moduleSelectionData.module || moduleSelectionData.module?.itemList?.length === 0) return
     const tempHeader = [
       { name: getMessage('simulator.table.sub1'), prop: 'name' },
       { name: getMessage('modal.circuit.trestle.setting.circuit.allocation.passivity.circuit'), prop: 'circuit' },