From c54d096d44efc7dc984c166076d97ee84a5c81ad 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: Mon, 17 Feb 2025 17:30:03 +0900 Subject: [PATCH 1/2] =?UTF-8?q?debugger=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/modal/module/PanelEdit.jsx | 1 - src/hooks/module/useModule.js | 1 - 2 files changed, 2 deletions(-) diff --git a/src/components/floor-plan/modal/module/PanelEdit.jsx b/src/components/floor-plan/modal/module/PanelEdit.jsx index bf03dae6..4d3c5a22 100644 --- a/src/components/floor-plan/modal/module/PanelEdit.jsx +++ b/src/components/floor-plan/modal/module/PanelEdit.jsx @@ -52,7 +52,6 @@ export default function PanelEdit(props) { }) return } - debugger const completeSurfaces = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE_SETUP_SURFACE && obj.isComplete) if (completeSurfaces.length > 0) { diff --git a/src/hooks/module/useModule.js b/src/hooks/module/useModule.js index bd462b5e..c7f13dc0 100644 --- a/src/hooks/module/useModule.js +++ b/src/hooks/module/useModule.js @@ -47,7 +47,6 @@ export function useModule() { canvas.discardActiveObject() //선택해제 - debugger const isSetupModules = getOtherModules(selectedObj) const selectedModules = canvas.getObjects().filter((obj) => selectedIds.includes(obj.id) && obj.name === 'module') //선택했던 객체들만 가져옴 const setupSurface = canvas From 8a0be28ac81d16bff92dc6bcf654126430148b2f 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: Mon, 17 Feb 2025 17:30:29 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EB=8B=A4=EA=B5=AD=EC=96=B4=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20=EB=B0=8F=20PCS=20=EC=8B=9C=EB=A6=AC=EC=A6=88=20?= =?UTF-8?q?=EC=84=A0=ED=83=9D=20=EB=A1=9C=EC=A7=81=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../step/PowerConditionalSelect.jsx | 23 +++++++++++++++---- src/locales/ja.json | 1 + src/locales/ko.json | 1 + 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/components/floor-plan/modal/circuitTrestle/step/PowerConditionalSelect.jsx b/src/components/floor-plan/modal/circuitTrestle/step/PowerConditionalSelect.jsx index 5957103c..df6d15b1 100644 --- a/src/components/floor-plan/modal/circuitTrestle/step/PowerConditionalSelect.jsx +++ b/src/components/floor-plan/modal/circuitTrestle/step/PowerConditionalSelect.jsx @@ -13,6 +13,12 @@ import { useRecoilState } from 'recoil' import { useRecoilValue } from 'recoil' import { v4 as uuidv4 } from 'uuid' +const PCS_MKR_MULTI_TYPE = { + MULTI: 'MULTI', + SINGLE_P: 'SINGLE-P', + SINGLE_N: 'SINGLE-N', +} + export default function PowerConditionalSelect(props) { let { tabNum, @@ -75,18 +81,26 @@ export default function PowerConditionalSelect(props) { const onCheckSeries = (data) => { let copySeries = [] - if (data.pcsMkrMultiType === 'MULTI') { + if (data.pcsMkrMultiType === PCS_MKR_MULTI_TYPE.MULTI) { copySeries = series.map((s) => { return { ...s, selected: s.pcsSerCd === data.pcsSerCd ? !s.selected : s.selected, } }) - } else if (data.pcsMkrMultiType === 'SINGLE-P') { + } else if (data.pcsMkrMultiType === PCS_MKR_MULTI_TYPE.SINGLE_P) { + if (series.filter((s) => s.selected).length === 0 && data.pcsSerParallelYn === 'Y') { + swalFire({ + title: getMessage('modal.module.pcs.error1'), + icon: 'warning', + }) + + return + } copySeries = series.map((s) => { return { ...s, - selected: s.pcsSerCd === data.pcsSerCd ? !s.selected : s.pcsMkrMultiType === 'MULTI' ? s.selected : false, + selected: s.pcsSerCd === data.pcsSerCd ? !s.selected : data.pcsSerParallelYn === 'Y' ? s.selected : false, } }) } else { @@ -107,7 +121,6 @@ export default function PowerConditionalSelect(props) { setSelectedModels([]) return } - console.log('moduleSelectionData', moduleSelectionData) const pcsMkrCd = selectedSeries[0]?.pcsMkrCd const pcsSerList = selectedSeries.map((series) => { return { pcsSerCd: series.pcsSerCd } @@ -147,7 +160,7 @@ export default function PowerConditionalSelect(props) { return } - if (selectedMaker.pcsMkrMultiType === 'MULTI') { + if (selectedMaker.pcsMkrMultiType === PCS_MKR_MULTI_TYPE.MULTI) { setSelectedModels([...selectedModels, { ...selectedRow, id: uuidv4(), isUsed: false }]) } else if (!selectedModels.find((m) => m.itemId === selectedRow.itemId)) { setSelectedModels([...selectedModels, { ...selectedRow, id: uuidv4(), isUsed: false }]) diff --git a/src/locales/ja.json b/src/locales/ja.json index fd2626b4..1255e72b 100644 --- a/src/locales/ja.json +++ b/src/locales/ja.json @@ -421,6 +421,7 @@ "modal.module.circuit.number.edit": "モジュール一括回路番号の変更", "modal.module.circuit.number.edit.info": "回路番号を入力してください。", "modal.module.circuit.number": "回路番号", + "modal.module.pcs.error1": "병설용 PCS는 단독으로 선택할 수 없습니다.(JA)", "modal.module.can.not.edit": "회로 구성을 완료한 모듈은 변경할 수 없습니다.(JA)", "modal.line.property.change": "変更する属性を選択してください。", "modal.line.property.change.unselect": "変更するラインを選択してください。", diff --git a/src/locales/ko.json b/src/locales/ko.json index d0bead71..5ea7765f 100644 --- a/src/locales/ko.json +++ b/src/locales/ko.json @@ -421,6 +421,7 @@ "modal.module.circuit.number.edit": "모듈 일괄 회로 번호 변경", "modal.module.circuit.number.edit.info": "회로 번호를 입력해주세요.", "modal.module.circuit.number": "회로 번호", + "modal.module.pcs.error1": "병설용 PCS는 단독으로 선택할 수 없습니다.", "modal.module.can.not.edit": "회로 구성을 완료한 모듈은 변경할 수 없습니다.", "modal.line.property.change": "변경할 속성을 선택해 주세요.", "modal.line.property.change.unselect": "변경할 라인을 선택해 주세요.",