diff --git a/src/components/common/input/CalcInput.jsx b/src/components/common/input/CalcInput.jsx index d386bd7d..5cb2bb42 100644 --- a/src/components/common/input/CalcInput.jsx +++ b/src/components/common/input/CalcInput.jsx @@ -3,7 +3,7 @@ import { createCalculator } from '@/util/calc-utils' import '@/styles/calc.scss' export const CalculatorInput = forwardRef( - ({ value, onChange, label, options = {}, id, className = 'calculator-input', readOnly = false, placeholder, name='', disabled = false, maxLength = 6 }, ref) => { + ({ value, onChange, label, options = {}, id, className = 'calculator-input', readOnly = false, placeholder, name='', disabled = false, maxLength = 12 }, ref) => { const [showKeypad, setShowKeypad] = useState(false) const [displayValue, setDisplayValue] = useState(value || '0') const [hasOperation, setHasOperation] = useState(false) diff --git a/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx b/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx index a9b5029a..b0b9a1e5 100644 --- a/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx +++ b/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx @@ -634,7 +634,7 @@ export default function StepUp(props) {
{/* 3개일때 className = by-max */} - {originPcsVoltageStepUpList.map((stepUp, index) => ( + {stepUpListData.map((stepUp, index) => (
{stepUp?.pcsItemList.map((pcsItem, idx) => (
@@ -659,7 +659,7 @@ export default function StepUp(props) { { - handleRowClick(idx, serQtyIdx) + handleRowClick(idx, serQtyIdx, item.paralQty) }} > {item.serQty} @@ -681,7 +681,14 @@ export default function StepUp(props) { 0 )} - {Array.from({ length: item.paralQty }, (_, i) => i + 1).map((num) => ( + {Array.from( + { + length: originPcsVoltageStepUpList[index] + ? originPcsVoltageStepUpList[index]?.pcsItemList[idx].serQtyList[serQtyIdx].paralQty + : item.paralQty, + }, + (_, i) => i + 1, + ).map((num) => ( diff --git a/src/hooks/roofcover/useRoofAllocationSetting.js b/src/hooks/roofcover/useRoofAllocationSetting.js index 3ebaa56c..4bb3d8ca 100644 --- a/src/hooks/roofcover/useRoofAllocationSetting.js +++ b/src/hooks/roofcover/useRoofAllocationSetting.js @@ -316,12 +316,13 @@ export function useRoofAllocationSetting(id) { addPopup(popupId, 1, ) } else { apply() - //기존 지붕 선은 남겨둔다. - drawOriginRoofLine() + resetPoints() basicSettingSave() } + //기존 지붕 선은 남겨둔다. + drawOriginRoofLine() } const drawOriginRoofLine = () => { diff --git a/src/hooks/useCirCuitTrestle.js b/src/hooks/useCirCuitTrestle.js index 83bb0b84..0c332ec8 100644 --- a/src/hooks/useCirCuitTrestle.js +++ b/src/hooks/useCirCuitTrestle.js @@ -91,6 +91,7 @@ export function useCircuitTrestle(executeEffect = false) { return { itemId: m.itemId, mixMatlNo: m.mixMatlNo, + northModuleYn: m.northModuleYn, } }) }