From 4c8ac9fbe4f1f5166f534cccc3046d3f707d391c 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, 25 Feb 2025 11:20:49 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EC=88=98=EB=8F=99=20=ED=9A=8C=EB=A1=9C=20?= =?UTF-8?q?=ED=95=A0=EB=8B=B9=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 --- .../step/type/PassivityCircuitAllocation.jsx | 33 ++++++++++--------- 1 file changed, 18 insertions(+), 15 deletions(-) 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 eaf41524..03045429 100644 --- a/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx +++ b/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx @@ -210,23 +210,26 @@ export default function PassivityCircuitAllocation(props) { result[firstPart].count += 1 } } + console.log('🚀 ~ handleCircuitNumberFix ~ result:', result) const usedPcses = pcsList.filter((model) => model.isUsed) const pcsItemList = usedPcses.map((model, index) => { - return { - pcsMkrCd: model.pcsMkrCd, - pcsSerCd: model.pcsSerCd, - itemId: model.itemId, - itemNm: model.itemNm, - goodsNo: model.goodsNo, - serQtyList: [ - { - serQty: result[(index + 1).toString()].maxValue, - paralQty: result[(index + 1).toString()].count, - rmdYn: 'Y', - usePossYn: 'Y', - roofSurfaceList: roofSurfaceList, - }, - ], + if (result[(index + 1).toString()]) { + return { + pcsMkrCd: model.pcsMkrCd, + pcsSerCd: model.pcsSerCd, + itemId: model.itemId, + itemNm: model.itemNm, + goodsNo: model.goodsNo, + serQtyList: [ + { + serQty: result[(index + 1).toString()].maxValue, + paralQty: result[(index + 1).toString()].count, + rmdYn: 'Y', + usePossYn: 'Y', + roofSurfaceList: roofSurfaceList, + }, + ], + } } }) From 8614e3ff7ad268dd605cd62e03ec9e9cecf7d8d8 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, 25 Feb 2025 11:21:22 +0900 Subject: [PATCH 2/3] =?UTF-8?q?menu.index=20=EC=97=86=EC=95=A0=EB=A9=B4?= =?UTF-8?q?=EC=84=9C=20=EC=83=9D=EA=B8=B4=20=EB=B2=84=EA=B7=B8=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/floor-plan/CanvasMenu.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/floor-plan/CanvasMenu.jsx b/src/components/floor-plan/CanvasMenu.jsx index e9e8ebdc..54a83677 100644 --- a/src/components/floor-plan/CanvasMenu.jsx +++ b/src/components/floor-plan/CanvasMenu.jsx @@ -183,7 +183,7 @@ export default function CanvasMenu(props) { await reloadCanvasStatus(objectNo, pid) break case 'surface': - if (selectedMenu > menu.index) { + if (['module', 'estimate', 'simulation'].some((menu) => menu === selectedMenu)) { const modules = canvas.getObjects().filter((module) => module.name === POLYGON_TYPE.MODULE) if (modules.length > 0) { @@ -223,7 +223,7 @@ export default function CanvasMenu(props) { await reloadCanvasStatus(objectNo, pid) break case 'module': - if (selectedMenu < menu.index) { + if (['placement', 'outline', 'surface'].some((menu) => menu === selectedMenu)) { if (!checkMenuAndCanvasState()) { swalFire({ text: getMessage('menu.validation.canvas.roof') }) return From 93728dabef19c6bd6ce0d82c3aa5cac8e6bf82c2 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, 25 Feb 2025 11:21:42 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=EC=9A=A9=20useE?= =?UTF-8?q?ffect=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/floor-plan/MenuDepth01.jsx | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/components/floor-plan/MenuDepth01.jsx b/src/components/floor-plan/MenuDepth01.jsx index 693ccc9d..ae35a3a3 100644 --- a/src/components/floor-plan/MenuDepth01.jsx +++ b/src/components/floor-plan/MenuDepth01.jsx @@ -25,10 +25,6 @@ export default function MenuDepth01() { } } - useEffect(() => { - console.log(subMenus[selectedMenu]) - }, [selectedMenu]) - useEffect(() => { handleMenu(selectedMenu) canvas?.discardActiveObject()