From 3fc8a562749e2d878a012150cc13b0ad3cc601e9 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: Fri, 7 Feb 2025 20:54:15 +0900 Subject: [PATCH] =?UTF-8?q?-=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../circuitTrestle/CircuitTrestleSetting.jsx | 42 +++---- .../step/PowerConditionalSelect.jsx | 8 +- .../floor-plan/modal/module/PanelEdit.jsx | 12 ++ .../modal/panelBatch/PanelBatchStatistics.jsx | 12 +- src/hooks/common/useMasterController.js | 10 -- src/hooks/module/useModule.js | 91 +-------------- src/hooks/useCirCuitTrestle.js | 108 +++++++++++++++++- src/locales/ja.json | 1 + src/locales/ko.json | 1 + 9 files changed, 156 insertions(+), 129 deletions(-) diff --git a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx index c09687b6..0ddc219b 100644 --- a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx +++ b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx @@ -46,7 +46,7 @@ export default function CircuitTrestleSetting({ id }) { // 회로할당(승합설정)에서 선택된 값들을 저장할 상태 추가 const [selectedStepUpValues, setSelectedStepUpValues] = useState({}) const [getStepUpSelections, setGetStepUpSelections] = useState(null) - const { trigger: setCircuitData } = useCanvasPopupStatusController(4) + // const { trigger: setCircuitData } = useCanvasPopupStatusController(4) // const [stepUpListData, setStepUpListData] = useRecoilState(stepUpListDataState) const [stepUpListData, setStepUpListData] = useState([]) const [seletedOption, setSeletedOption] = useState(null) @@ -71,19 +71,19 @@ export default function CircuitTrestleSetting({ id }) { getModuleList, removeNotAllocationModules, } = useCircuitTrestle() - + // const { trigger: moduleSelectedDataTrigger } = useCanvasPopupStatusController(2) useEffect(() => { if (!managementState) { setManagementState(managementStateLoaded) } - setCircuitData({ - makers, - selectedMaker, - series, - models, - selectedModels, - pcsCheck, - }) + // setCircuitData({ + // makers, + // selectedMaker, + // series, + // models, + // selectedModels, + // pcsCheck, + // }) }, []) // 수동할당 시 모듈 삭제 @@ -137,7 +137,7 @@ export default function CircuitTrestleSetting({ id }) { ...getOptYn(), useModuleItemList: getUseModuleItemList(), roofSurfaceList: getRoofSurfaceList(), - pcsItemList: getPcsItemList(), + pcsItemList: pcsItemList, } // 추천 목록 선택 setSelectedModels(pcsItemList) @@ -245,10 +245,6 @@ export default function CircuitTrestleSetting({ id }) { // 파워컨디셔너 추천 목록 조회 getPcsAutoRecommendList(params).then((res) => { if (res.data?.pcsItemList) { - const itemList = models.filter((model) => { - return res.data?.pcsItemList.map((item) => item.itemId).includes(model.itemId) - }) - let pcsItemList = [] let pcsObj = {} models.forEach((model) => { @@ -353,21 +349,25 @@ export default function CircuitTrestleSetting({ id }) { // 이전 버튼 클릭 시 const onClickPrev = () => { - setAllocationType(ALLOCATION_TYPE.AUTO) + // setAllocationType(ALLOCATION_TYPE.AUTO) swalFire({ text: '할당한 회로 번호가 초기화됩니다.', type: 'alert', icon: 'warning', confirmFn: () => { - const circuitModules = canvas - .getObjects() - .filter((obj) => obj.name === 'module' && selectedModels.map((model) => model.id).includes(obj.circuit?.circuitInfo?.id)) + const circuitModules = canvas.getObjects().filter((obj) => obj.name === 'module') canvas.remove(...circuitModules.map((module) => module.circuit)) circuitModules.forEach((obj) => { obj.circuit = null obj.pcsItemId = null }) - setAllocationType(ALLOCATION_TYPE.AUTO) + + if (allocationType === ALLOCATION_TYPE.PASSIVITY) { + setAllocationType(ALLOCATION_TYPE.AUTO) + } else { + setTabNum(1) + } + canvas.renderAll() }, }) @@ -513,7 +513,7 @@ export default function CircuitTrestleSetting({ id }) { )} {tabNum === 2 && (
- {/*