From fed817c6d0f7e13e0f7e3657922e6af13c6b67da Mon Sep 17 00:00:00 2001 From: "hyojun.choi" Date: Wed, 11 Jun 2025 11:13:18 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EC=84=A4=EC=B9=98=EB=A9=B4=EC=97=90=20modu?= =?UTF-8?q?le=EC=9D=B4=20=EC=97=86=EB=8A=94=20=EA=B2=BD=EC=9A=B0=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hooks/module/useTrestle.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/hooks/module/useTrestle.js b/src/hooks/module/useTrestle.js index 643b8e03..b0ec3a31 100644 --- a/src/hooks/module/useTrestle.js +++ b/src/hooks/module/useTrestle.js @@ -2568,6 +2568,10 @@ export const useTrestle = () => { const getSameLineModules = (surface) => { const { direction, modules, isChidory } = surface + if (!modules || modules.length === 0) { + return + } + // 같은 단에 있는 모듈들의 리스트 let sameLineModuleList = [] From b74f847f76df7f937a264e596e76263983fa8318 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: Wed, 11 Jun 2025 18:18:12 +0900 Subject: [PATCH 2/3] =?UTF-8?q?[1105]=20:=20[=E3=80=90HANASYS=20DESIGN?= =?UTF-8?q?=E3=80=91=E6=B7=B7=E5=90=88=E3=83=A2=E3=82=B8=E3=83=A5=E3=83=BC?= =?UTF-8?q?=E3=83=AB=E3=81=A7=E3=81=AE=E5=9B=9E=E8=B7=AF=E6=A7=8B=E6=88=90?= =?UTF-8?q?=E3=81=AB=E3=81=A4=E3=81=84=E3=81=A6]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [작업내용] : sub module 일 경우 0.66으로 계산하게 수정 --- .../circuitTrestle/CircuitTrestleSetting.jsx | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx index 1c72c105..e8e26913 100644 --- a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx +++ b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx @@ -16,7 +16,7 @@ import { useSwal } from '@/hooks/useSwal' import { canvasState, canvasZoomState } from '@/store/canvasAtom' import { useTrestle } from '@/hooks/module/useTrestle' -import { selectedModuleState } from '@/store/selectedModuleOptions' +import { moduleSelectionDataState, selectedModuleState } from '@/store/selectedModuleOptions' import { v4 as uuidv4 } from 'uuid' import { useEstimate } from '@/hooks/useEstimate' @@ -60,7 +60,7 @@ export default function CircuitTrestleSetting({ id }) { const [seletedSubOption, setSeletedSubOption] = useState(null) const { setModuleStatisticsData } = useCircuitTrestle() const { handleCanvasToPng } = useImgLoader() - + const moduleSelectionData = useRecoilValue(moduleSelectionDataState) const passivityCircuitAllocationRef = useRef() const { setIsGlobalLoading } = useContext(QcastContext) @@ -340,8 +340,15 @@ export default function CircuitTrestleSetting({ id }) { const target = pcsCheck.max ? moduleMaxQty : moduleStdQty const placementModules = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE) + let moduleAmount = placementModules.reduce((acc, module) => { + if (moduleSelectionData.module.itemList.length === 1 || module.moduleInfo.itemId === moduleSelectionData.module.itemList[0].itemId) { + return acc + 1 + } else { + return acc + 0.66 + } + }, 0) - if (placementModules.length > target) { + if (moduleAmount > target) { swalFire({ title: getMessage('modal.circuit.trestle.setting.circuit.allocation.passivity.all.power.conditional.validation.error01'), type: 'alert', @@ -371,6 +378,7 @@ export default function CircuitTrestleSetting({ id }) { // 회로할당(승압설정) 저장 버튼 클릭 시 const onApply = async () => { + beforeCapture() setAllModuleSurfaceIsComplete(false) setIsGlobalLoading(true) @@ -380,9 +388,8 @@ export default function CircuitTrestleSetting({ id }) { .map((obj) => { obj.pcses = getStepUpListData() }) - beforeCapture() + handleCanvasToPng(1) - afterCapture() //회로할당 저장 시 result=null인 경우에도 회로번호 텍스트 표시 유지 처리 @@ -399,7 +406,6 @@ export default function CircuitTrestleSetting({ id }) { const result = await getEstimateData() if (result) { - beforeCapture() handleCanvasToPng(2) afterCapture() // 견적서 저장 From aafa5f59486a002a77a440b5ca93b9753d0076cd 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: Wed, 11 Jun 2025 18:29:54 +0900 Subject: [PATCH 3/3] =?UTF-8?q?merge=20=ED=95=98=EB=A9=B4=EC=84=9C=20?= =?UTF-8?q?=EB=B9=A0=EC=A7=84=20=EB=B6=80=EB=B6=84=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modal/circuitTrestle/CircuitTrestleSetting.jsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx index e8e26913..803ea4d9 100644 --- a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx +++ b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx @@ -378,7 +378,6 @@ export default function CircuitTrestleSetting({ id }) { // 회로할당(승압설정) 저장 버튼 클릭 시 const onApply = async () => { - beforeCapture() setAllModuleSurfaceIsComplete(false) setIsGlobalLoading(true) @@ -388,8 +387,9 @@ export default function CircuitTrestleSetting({ id }) { .map((obj) => { obj.pcses = getStepUpListData() }) - + beforeCapture() handleCanvasToPng(1) + afterCapture() //회로할당 저장 시 result=null인 경우에도 회로번호 텍스트 표시 유지 처리 @@ -406,6 +406,7 @@ export default function CircuitTrestleSetting({ id }) { const result = await getEstimateData() if (result) { + beforeCapture() handleCanvasToPng(2) afterCapture() // 견적서 저장