From d16929e6fa3449fb83fb57641b620082b9f0a477 Mon Sep 17 00:00:00 2001 From: changkyu choi Date: Wed, 22 Jan 2025 17:37:17 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B0=B0=EC=B9=98=EB=A9=B4=EC=B4=88=EA=B8=B0?= =?UTF-8?q?=EC=84=A4=EC=A0=95=20=EC=98=A4=EB=A5=98=20correntObjectNo=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20=EB=B0=8F=20=ED=9A=8C=EB=A1=9C=EB=B0=8F?= =?UTF-8?q?=EA=B0=80=EB=8C=80=EC=84=A4=EC=A0=95(=EC=8A=B9=EC=95=95?= =?UTF-8?q?=EC=84=A4=EC=A0=95)=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modal/circuitTrestle/step/StepUp.jsx | 36 +++++++++++++------ src/hooks/option/useCanvasSetting.js | 6 ++-- 2 files changed, 30 insertions(+), 12 deletions(-) diff --git a/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx b/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx index d1b3d3dd..19a701dc 100644 --- a/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx +++ b/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx @@ -13,6 +13,7 @@ import { useMasterController } from '@/hooks/common/useMasterController' export default function StepUp(props) { const { getMessage } = useMessage() const [moduleTab, setModuleTab] = useState(1) + const [moduleTabs, setModuleTabs] = useState({}) const [arrayLength, setArrayLength] = useState(3) //module-table-inner의 반복 개수 const [pcsCheck, setPcsCheck] = useRecoilState(pcsCheckState) const { models } = props @@ -104,15 +105,24 @@ export default function StepUp(props) { })) console.log('🚀 ~ useEffect ~ getPcsVoltageStepUpList ~ stepUpListData:', stepUpListData) setStepUpListData(stepUpListData) + + setOptCodes(res.data.optionList.map((opt) => ({ ...opt, code: opt.pcsOptCd, name: opt.pcsOptNm, nameJp: opt.pcsOptNmJp }))) } }) - - //setOptCodes(stepUpListData.optionList.map((opt) => ({ ...opt, code: opt.pcsOptCd, name: opt.pcsOptNm, nameJp: opt.pcsOptNmJp }))) }, []) useCanvasPopupStatusController(6) const canvasPopupStatusState = useRecoilValue(canvasPopupStatusStore) if (Object.keys(canvasPopupStatusState[6]).length !== 0) { + console.log('🚀 ~ useEffect ~ canvasPopupStatusState :', canvasPopupStatusState) + } + + // 각 모듈의 탭을 변경하는 함수 + const handleTabChange = (stepUpId, idx, tabNumber) => { + setModuleTabs((prev) => ({ + ...prev, + [`${stepUpId}_${idx}`]: tabNumber, + })) } return ( @@ -122,7 +132,7 @@ export default function StepUp(props) { {/* 3개일때 className = by-max */} {stepUpListData.map((stepUp, index) => (
- {Array.from({ length: stepUp.pcsItemList.length }).map((_, idx) => ( + {stepUp?.pcsItemList.map((_, idx) => (
{stepUp.pcsItemList[idx].goodsNo}
@@ -134,7 +144,7 @@ export default function StepUp(props) { {getMessage('modal.circuit.trestle.setting.step.up.allocation.total.amount')} - + {stepUp.pcsItemList[idx].serQtyList.map((item) => { return ( @@ -148,15 +158,21 @@ export default function StepUp(props) {
- -
- {moduleTab === 1 && ( + {(moduleTabs[`${stepUp.id}_${idx}`] || 1) === 1 && (
@@ -178,7 +194,7 @@ export default function StepUp(props) { )} - {moduleTab === 2 && ( + {(moduleTabs[`${stepUp.id}_${idx}`] || 1) === 2 && (
@@ -211,8 +227,8 @@ export default function StepUp(props) { {optCodes.length > 0 && (
- - {/* */} + {/* */} +
)} diff --git a/src/hooks/option/useCanvasSetting.js b/src/hooks/option/useCanvasSetting.js index b91d8991..29287689 100644 --- a/src/hooks/option/useCanvasSetting.js +++ b/src/hooks/option/useCanvasSetting.js @@ -180,8 +180,10 @@ export function useCanvasSetting() { ) { // 1회만 실행 if (roofMaterials && previousRoofMaterialsYn === 'N') { - fetchBasicSettings() - previousRoofMaterialsYn = 'Y' + if (correntObjectNo) { + fetchBasicSettings() + previousRoofMaterialsYn = 'Y' + } } // 이전 값을 업데이트