From 8de6eda230acb11a4103465e7b93ea86ab3ef5b8 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: Thu, 6 Feb 2025 12:26:25 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=EB=AA=A8=EB=93=88=20=EC=82=AD=EC=A0=9C?=
=?UTF-8?q?=EC=8B=9C=20=EC=A7=91=EA=B3=84=ED=91=9C=20=EB=B0=98=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/hooks/module/useModule.js | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/src/hooks/module/useModule.js b/src/hooks/module/useModule.js
index 53d3b897..e468b6c7 100644
--- a/src/hooks/module/useModule.js
+++ b/src/hooks/module/useModule.js
@@ -311,7 +311,10 @@ export function useModule() {
canvas.renderAll()
},
})
+ } else {
+ moduleSetupSurface.set({ modules: [...moduleSetupSurface.modules, ...copyModules] })
}
+ setModuleStatisticsData()
}
const moduleMultiCopy = (type, length, direction) => {
@@ -385,6 +388,9 @@ export function useModule() {
canvas.renderAll()
},
})
+ } else {
+ moduleSetupSurface.set({ modules: [...moduleSetupSurface.modules, ...copyModules] })
+ setModuleStatisticsData()
}
}
@@ -500,6 +506,7 @@ export function useModule() {
},
})
}
+ setModuleStatisticsData()
}
const moduleRowRemove = (type) => {
@@ -615,6 +622,7 @@ export function useModule() {
},
})
}
+ setModuleStatisticsData()
}
const moduleColumnInsert = (type) => {
@@ -710,6 +718,7 @@ export function useModule() {
},
})
}
+ setModuleStatisticsData()
}
const muduleRowInsert = (type) => {
@@ -807,6 +816,7 @@ export function useModule() {
},
})
}
+ setModuleStatisticsData()
}
const alignModule = (type, surfaceArray) => {
@@ -879,6 +889,7 @@ export function useModule() {
surface.set({ modules: modules })
canvas.remove(activeModule)
canvas.renderAll()
+ setModuleStatisticsData()
}
const moduleRoofRemove = (surfaceArray) => {
@@ -961,10 +972,11 @@ export function useModule() {
}
const setModuleStatisticsData = () => {
+ if (selectedModules?.length === 0) return
const tempHeader = [
{ name: getMessage('simulator.table.sub1'), prop: 'name' },
{ name: getMessage('modal.circuit.trestle.setting.circuit.allocation.passivity.circuit'), prop: 'circuit' },
- ...selectedModules.itemList.map((module) => {
+ ...selectedModules?.itemList?.map((module) => {
return {
name: module.itemNm,
prop: module.itemId,
From 3c3f307a7c4b40894675fbafb35fef0f009fedfb 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: Thu, 6 Feb 2025 12:27:03 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=EB=B2=84=ED=8A=BC=20=EC=83=89=EC=83=81=20?=
=?UTF-8?q?=EB=B2=88=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../modal/circuitTrestle/CircuitTrestleSetting.jsx | 4 ++--
.../floor-plan/modal/panelBatch/PanelBatchStatistics.jsx | 9 ++++++++-
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx
index 62f6769e..31f3aaa4 100644
--- a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx
+++ b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx
@@ -604,7 +604,7 @@ export default function CircuitTrestleSetting({ id }) {
{tabNum === 2 &&