diff --git a/src/components/floor-plan/modal/circuitTrestle/step/PowerConditionalSelect.jsx b/src/components/floor-plan/modal/circuitTrestle/step/PowerConditionalSelect.jsx index 715d3884..349c69dc 100644 --- a/src/components/floor-plan/modal/circuitTrestle/step/PowerConditionalSelect.jsx +++ b/src/components/floor-plan/modal/circuitTrestle/step/PowerConditionalSelect.jsx @@ -92,12 +92,29 @@ export default function PowerConditionalSelect(props) { } const onCheckSeries = (data) => { - const copySeries = series.map((s) => { - return { - ...s, - selected: s.pcsSerCd === data.pcsSerCd ? !s.selected : s.selected, - } - }) + let copySeries = [] + if (data.pcsMkrMultiType === 'MULTI') { + copySeries = series.map((s) => { + return { + ...s, + selected: s.pcsSerCd === data.pcsSerCd ? !s.selected : s.selected, + } + }) + } else if (data.pcsMkrMultiType === 'SINGLE-P') { + copySeries = series.map((s) => { + return { + ...s, + selected: s.pcsSerCd === data.pcsSerCd ? !s.selected : s.pcsMkrMultiType === 'MULTI' ? s.selected : false, + } + }) + } else { + copySeries = series.map((s) => { + return { + ...s, + selected: s.pcsSerCd === data.pcsSerCd ? !s.selected : false, + } + }) + } setSeries(copySeries) handleSetmodels(copySeries.filter((s) => s.selected)) } @@ -147,7 +164,11 @@ export default function PowerConditionalSelect(props) { return } - setSelectedModels([...selectedModels, { ...selectedRow, id: uuidv4(), isUsed: false }]) + if (selectedMaker.pcsMkrMultiType === 'MULTI') { + setSelectedModels([...selectedModels, { ...selectedRow, id: uuidv4(), isUsed: false }]) + } else if (!selectedModels.find((m) => m.itemId === selectedRow.itemId)) { + setSelectedModels([...selectedModels, { ...selectedRow, id: uuidv4(), isUsed: false }]) + } setSelectedRow(null) } @@ -160,8 +181,6 @@ export default function PowerConditionalSelect(props) { setModels([]) setSelectedModels([]) setSelectedMaker(option) - console.log('option', option) - getUseModuleItemList const param = { pcsMkrCd: option.pcsMkrCd, mixMatlNo: getUseModuleItemList()[0].mixMatlNo, diff --git a/src/util/common-utils.js b/src/util/common-utils.js index ee003ec3..842eace0 100644 --- a/src/util/common-utils.js +++ b/src/util/common-utils.js @@ -130,7 +130,7 @@ export const calculateFlowDirection = (canvasAngle) => { */ export const getQueryString = (o) => { const queryString = Object.keys(o) - .map((key) => `${key}=${o[key]}`) + .map((key) => `${key}=${o[key] ?? ''}`) .join('&') return `?${queryString}` }