From 79316a29b1a595403ecf03313d1bcbb8ff08267b Mon Sep 17 00:00:00 2001
From: ysCha <yscha@interplug.co.kr>
Date: Fri, 10 Jul 2026 11:10:05 +0900
Subject: [PATCH 1/2] =?UTF-8?q?[=EC=8B=9C=3D>=EA=B2=AC]=20canvas=20null=20?=
 =?UTF-8?q?=EA=B0=80=EB=93=9C=20=E2=80=94=20isAllComplete=20/=20setAllModu?=
 =?UTF-8?q?leSurfaceIsComplete?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/module/useTrestle.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/hooks/module/useTrestle.js b/src/hooks/module/useTrestle.js
index 71ee6123..b652492b 100644
--- a/src/hooks/module/useTrestle.js
+++ b/src/hooks/module/useTrestle.js
@@ -3291,6 +3291,7 @@ export const useTrestle = () => {
 
   // 가대 설치 완료 전,후 모든 surface의 isComplete를 변경
   const setAllModuleSurfaceIsComplete = (bool) => {
+    if (!canvas) return
     const surfaces = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE_SETUP_SURFACE)
     surfaces.forEach((surface) => {
       surface.isComplete = bool
@@ -3299,6 +3300,7 @@ export const useTrestle = () => {
 
   // 배치면 전체에 가대 설치 여부
   const isAllComplete = () => {
+    if (!canvas) return false
     const surfaces = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE_SETUP_SURFACE)
     if (surfaces.length === 0) {
       return false

From 91875b3b7169b6dd3e2560d666d0106ba21933fa Mon Sep 17 00:00:00 2001
From: ysCha <yscha@interplug.co.kr>
Date: Fri, 10 Jul 2026 12:18:46 +0900
Subject: [PATCH 2/2] =?UTF-8?q?[2203]=20=EC=8B=9C=EB=AE=AC=EB=A0=88?=
 =?UTF-8?q?=EC=9D=B4=ED=84=B0=20=EC=97=B0=EA=B0=84=EC=98=88=EC=B8=A1?=
 =?UTF-8?q?=EB=B0=9C=EC=A0=84=EB=9F=89=20kWh=20=EB=8B=A8=EC=9C=84=20?=
 =?UTF-8?q?=ED=91=9C=EC=8B=9C=20+=20null=20=EA=B0=80=EB=93=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/simulator/Simulator.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/simulator/Simulator.jsx b/src/components/simulator/Simulator.jsx
index d873049f..283bdbc8 100644
--- a/src/components/simulator/Simulator.jsx
+++ b/src/components/simulator/Simulator.jsx
@@ -226,7 +226,7 @@ export default function Simulator() {
               {/* 연간예측발전량 */}
               <div className="estimate-box">
                 <div className="estimate-tit">{getMessage('simulator.title.sub4')}</div>
-                <div className="estimate-name">{chartData[chartData.length - 1]}</div>
+                <div className="estimate-name">{chartData[chartData.length - 1] != null ? `${chartData[chartData.length - 1]} kWh` : ''}</div>
               </div>
             </div>
             <div className="estimate-list-wrap">