diff --git a/src/hooks/module/useTrestle.js b/src/hooks/module/useTrestle.js index ecb8ee55..af2e8e6a 100644 --- a/src/hooks/module/useTrestle.js +++ b/src/hooks/module/useTrestle.js @@ -370,25 +370,17 @@ export const useTrestle = () => { rack.value.moduleTpCd === leftRowsInfo.moduleTotalTp && rack.value.moduleRows === leftRowsInfo.rowsInfo.reduce((acc, row) => acc + row.count, 0) ) - } else if (leftRowsInfo.rowsInfo.length >= 2) { + } else { //C1C2C3인 경우 - if (rack.value.moduleTpCd.length === 6) { - // 변환 C1C2만 있는경우 C3 0개로 추가해준다. - let newLeftRowsInfo = normalizeModules(rack.value.moduleTpCd, leftRowsInfo) + let newLeftRowsInfo = normalizeModules(rack.value.moduleTpCd, leftRowsInfo) - return ( - rack.value.moduleTpCd === newLeftRowsInfo.moduleTotalTp && - rack.value.moduleRows === newLeftRowsInfo.rowsInfo.reduce((acc, row) => acc + row.count, 0) && - Number(rack.value.moduleTpRows1) === newLeftRowsInfo.rowsInfo[0].count && - Number(rack.value.moduleTpRows2) === newLeftRowsInfo.rowsInfo[1].count && - Number(rack.value.moduleTpRows3) === newLeftRowsInfo.rowsInfo[2].count - ) - } return ( - rack.value.moduleTpCd === leftRowsInfo.moduleTotalTp && - rack.value.moduleRows === leftRowsInfo.rowsInfo.reduce((acc, row) => acc + row.count, 0) && - Number(rack.value.moduleTpRows1) === leftRowsInfo.rowsInfo[0].count && - Number(rack.value.moduleTpRows2) === leftRowsInfo.rowsInfo[1].count + rack.value.moduleTpCd === newLeftRowsInfo.moduleTotalTp && + rack.value.moduleRows === newLeftRowsInfo.rowsInfo.reduce((acc, row) => acc + row.count, 0) && + newLeftRowsInfo.rowsInfo.every((row, index) => { + const rackRowCount = Number(rack.value[`moduleTpRows${index + 1}`]) // 동적으로 접근 + return rackRowCount === row.count + }) ) } })?.value.racks @@ -400,24 +392,16 @@ export const useTrestle = () => { rack.value.moduleTpCd === rightRowsInfo.moduleTotalTp && rack.value.moduleRows === rightRowsInfo.rowsInfo.reduce((acc, row) => acc + row.count, 0) ) - } else if (rightRowsInfo.rowsInfo.length === 2) { - if (rack.value.moduleTpCd.length === 6) { - // 변환 C1C2만 있는경우 C3 0개로 추가해준다. - let newRightRowsInfo = normalizeModules(rack.value.moduleTpCd, rightRowsInfo) + } else { + let newRightRowsInfo = normalizeModules(rack.value.moduleTpCd, rightRowsInfo) - return ( - rack.value.moduleTpCd === newRightRowsInfo.moduleTotalTp && - rack.value.moduleRows === newRightRowsInfo.rowsInfo.reduce((acc, row) => acc + row.count, 0) && - Number(rack.value.moduleTpRows1) === newRightRowsInfo.rowsInfo[0].count && - Number(rack.value.moduleTpRows2) === newRightRowsInfo.rowsInfo[1].count && - Number(rack.value.moduleTpRows3) === newRightRowsInfo.rowsInfo[2].count - ) - } return ( - rack.value.moduleTpCd === rightRowsInfo.moduleTotalTp && - rack.value.moduleRows === rightRowsInfo.rowsInfo.reduce((acc, row) => acc + row.count, 0) && - Number(rack.value.moduleTpRows1) === rightRowsInfo.rowsInfo[0].count && - Number(rack.value.moduleTpRows2) === rightRowsInfo.rowsInfo[1].count + rack.value.moduleTpCd === newRightRowsInfo.moduleTotalTp && + rack.value.moduleRows === newRightRowsInfo.rowsInfo.reduce((acc, row) => acc + row.count, 0) && + newRightRowsInfo.rowsInfo.every((row, index) => { + const rackRowCount = Number(rack.value[`moduleTpRows${index + 1}`]) // 동적으로 접근 + return rackRowCount === row.count + }) ) } })?.value.racks @@ -429,24 +413,16 @@ export const useTrestle = () => { rack.value.moduleTpCd === centerRowsInfo.moduleTotalTp && rack.value.moduleRows === centerRowsInfo.rowsInfo.reduce((acc, row) => acc + row.count, 0) ) - } else if (centerRowsInfo.rowsInfo.length === 2) { - if (rack.value.moduleTpCd.length === 6) { - // 변환 C1C2만 있는경우 C3 0개로 추가해준다. - let newCenterRowsInfo = normalizeModules(rack.value.moduleTpCd, centerRowsInfo) + } else { + let newCenterRowsInfo = normalizeModules(rack.value.moduleTpCd, centerRowsInfo) - return ( - rack.value.moduleTpCd === newCenterRowsInfo.moduleTotalTp && - rack.value.moduleRows === newCenterRowsInfo.rowsInfo.reduce((acc, row) => acc + row.count, 0) && - Number(rack.value.moduleTpRows1) === newCenterRowsInfo.rowsInfo[0].count && - Number(rack.value.moduleTpRows2) === newCenterRowsInfo.rowsInfo[1].count && - Number(rack.value.moduleTpRows3) === newCenterRowsInfo.rowsInfo[2].count - ) - } return ( - rack.value.moduleTpCd === centerRowsInfo.moduleTotalTp && - rack.value.moduleRows === centerRowsInfo.rowsInfo.reduce((acc, row) => acc + row.count, 0) && - Number(rack.value.moduleTpRows1) === centerRowsInfo.rowsInfo[0].count && - Number(rack.value.moduleTpRows2) === centerRowsInfo.rowsInfo[1].count + rack.value.moduleTpCd === newCenterRowsInfo.moduleTotalTp && + rack.value.moduleRows === newCenterRowsInfo.rowsInfo.reduce((acc, row) => acc + row.count, 0) && + newCenterRowsInfo.rowsInfo.every((row, index) => { + const rackRowCount = Number(rack.value[`moduleTpRows${index + 1}`]) // 동적으로 접근 + return rackRowCount === row.count + }) ) } })?.value.racks @@ -536,24 +512,16 @@ export const useTrestle = () => { rack.value.moduleTpCd === leftRowsInfo.moduleTotalTp && rack.value.moduleRows === leftRowsInfo.rowsInfo.reduce((acc, row) => acc + row.count, 0) ) - } else if (leftRowsInfo.rowsInfo.length === 2) { - if (rack.value.moduleTpCd.length === 6) { - // 변환 C1C2만 있는경우 C3 0개로 추가해준다. - let newLeftRowsInfo = normalizeModules(rack.value.moduleTpCd, leftRowsInfo) + } else { + let newLeftRowsInfo = normalizeModules(rack.value.moduleTpCd, leftRowsInfo) - return ( - rack.value.moduleTpCd === newLeftRowsInfo.moduleTotalTp && - rack.value.moduleRows === newLeftRowsInfo.rowsInfo.reduce((acc, row) => acc + row.count, 0) && - Number(rack.value.moduleTpRows1) === newLeftRowsInfo.rowsInfo[0].count && - Number(rack.value.moduleTpRows2) === newLeftRowsInfo.rowsInfo[1].count && - Number(rack.value.moduleTpRows3) === newLeftRowsInfo.rowsInfo[2].count - ) - } return ( - rack.value.moduleTpCd === leftRowsInfo.moduleTotalTp && - rack.value.moduleRows === leftRowsInfo.rowsInfo.reduce((acc, row) => acc + row.count, 0) && - Number(rack.value.moduleTpRows1) === leftRowsInfo.rowsInfo[0].count && - Number(rack.value.moduleTpRows2) === leftRowsInfo.rowsInfo[1].count + rack.value.moduleTpCd === newLeftRowsInfo.moduleTotalTp && + rack.value.moduleRows === newLeftRowsInfo.rowsInfo.reduce((acc, row) => acc + row.count, 0) && + newLeftRowsInfo.rowsInfo.every((row, index) => { + const rackRowCount = Number(rack.value[`moduleTpRows${index + 1}`]) // 동적으로 접근 + return rackRowCount === row.count + }) ) } })?.value.racks @@ -624,24 +592,17 @@ export const useTrestle = () => { rack.value.moduleTpCd === rightRowsInfo.moduleTotalTp && rack.value.moduleRows === rightRowsInfo.rowsInfo.reduce((acc, row) => acc + row.count, 0) ) - } else if (rightRowsInfo.rowsInfo.length === 2) { - if (rack.value.moduleTpCd.length === 6) { - // 변환 C1C2만 있는경우 C3 0개로 추가해준다. - let newRightRowsInfo = normalizeModules(rack.value.moduleTpCd, rightRowsInfo) + } else { + // 변환 C1C2만 있는경우 C3 0개로 추가해준다. + let newRightRowsInfo = normalizeModules(rack.value.moduleTpCd, rightRowsInfo) - return ( - rack.value.moduleTpCd === newRightRowsInfo.moduleTotalTp && - rack.value.moduleRows === newRightRowsInfo.rowsInfo.reduce((acc, row) => acc + row.count, 0) && - Number(rack.value.moduleTpRows1) === newRightRowsInfo.rowsInfo[0].count && - Number(rack.value.moduleTpRows2) === newRightRowsInfo.rowsInfo[1].count && - Number(rack.value.moduleTpRows3) === newRightRowsInfo.rowsInfo[2].count - ) - } return ( - rack.value.moduleTpCd === rightRowsInfo.moduleTotalTp && - rack.value.moduleRows === rightRowsInfo.rowsInfo.reduce((acc, row) => acc + row.count, 0) && - Number(rack.value.moduleTpRows1) === rightRowsInfo.rowsInfo[0].count && - Number(rack.value.moduleTpRows2) === rightRowsInfo.rowsInfo[1].count + rack.value.moduleTpCd === newRightRowsInfo.moduleTotalTp && + rack.value.moduleRows === newRightRowsInfo.rowsInfo.reduce((acc, row) => acc + row.count, 0) && + newRightRowsInfo.rowsInfo.every((row, index) => { + const rackRowCount = Number(rack.value[`moduleTpRows${index + 1}`]) // 동적으로 접근 + return rackRowCount === row.count + }) ) } })?.value.racks