From 7cdeb8a0dd10974ef91f14bba53fb0a275dfad3c 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: Fri, 7 Feb 2025 14:33:31 +0900 Subject: [PATCH] =?UTF-8?q?-=20=ED=9A=8C=EB=A1=9C=20=EB=B2=88=ED=98=B8=20?= =?UTF-8?q?=EC=B4=88=EA=B8=B0=ED=99=94=EC=8B=9C=20=ED=95=B4=EB=8B=B9=20?= =?UTF-8?q?=ED=9A=8C=EB=A1=9C=20=EB=B2=88=ED=98=B8=EC=9D=98=20=EC=B5=9C?= =?UTF-8?q?=EC=86=8C=20=EB=B2=88=ED=98=B8=EB=A1=9C=20=ED=9A=8C=EB=A1=9C?= =?UTF-8?q?=EB=B2=88=ED=98=B8=20=EC=B4=88=EA=B8=B0=ED=99=94=20-=20?= =?UTF-8?q?=EB=AA=A8=EB=93=88=EC=97=90=20pcsCode=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../step/type/PassivityCircuitAllocation.jsx | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx b/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx index e632882b..c3474865 100644 --- a/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx +++ b/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx @@ -148,6 +148,7 @@ export default function PassivityCircuitAllocation(props) { strokeWidth: 0.3, }) obj.pcsItemId = selectedPcs.itemId + obj.pcsItemCode = selectedPcs.id obj.circuit = moduleCircuitText obj.circuitNumber = getCircuitNumber() tempSelectedPcs.used = true @@ -207,7 +208,7 @@ export default function PassivityCircuitAllocation(props) { } getPcsManualConfChk(params).then((res) => { - if (res.resultCode === 'E') { + if (res?.resultCode === 'E') { swalFire({ text: res.resultMsg, type: 'alert', @@ -254,11 +255,18 @@ export default function PassivityCircuitAllocation(props) { icon: 'warning', confirmFn: () => { const circuitModules = canvas.getObjects().filter((obj) => obj.name === 'module' && obj.circuit?.circuitInfo?.id === selectedPcs.id) + const circuitNumbers = circuitModules.map((obj) => { + const circuitNumber = obj.circuitNumber.replace(/[()]/g, '').split('-') + return parseInt(circuitNumber[circuitNumber.length - 1]) + }) + const minCircuitNumber = Math.min(...circuitNumbers) + console.log(circuitNumbers, minCircuitNumber) canvas.remove(...circuitModules.map((module) => module.circuit)) circuitModules.forEach((obj) => { obj.circuit = null obj.pcsItemId = null }) + setCircuitNumber(minCircuitNumber) setTargetModules([]) canvas.renderAll()