From 819ebb43ff7c3d65e99f0e34705ad6668c55cf03 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: Sat, 8 Feb 2025 17:25:02 +0900 Subject: [PATCH] =?UTF-8?q?-=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95=20-?= =?UTF-8?q?=20=ED=9A=8C=EB=A1=9C=20=EC=B4=88=EA=B8=B0=ED=99=94=EC=8B=9C=20?= =?UTF-8?q?=EC=A7=91=EA=B3=84=ED=91=9C=20=EB=B0=98=EC=98=81=20-=20?= =?UTF-8?q?=EC=B4=88=EA=B8=B0=20Module=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20sur?= =?UTF-8?q?face=20modules=20=EC=97=90=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../circuitTrestle/CircuitTrestleSetting.jsx | 1 - .../step/PowerConditionalSelect.jsx | 6 ++--- .../step/type/PassivityCircuitAllocation.jsx | 8 +++--- .../modal/panelBatch/PanelBatchStatistics.jsx | 12 +++------ .../common/useCanvasPopupStatusController.js | 14 +++++++--- src/hooks/useCirCuitTrestle.js | 27 ++++++++++--------- src/store/selectedModuleOptions.js | 1 - 7 files changed, 36 insertions(+), 33 deletions(-) diff --git a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx index 84608186..daf0977a 100644 --- a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx +++ b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx @@ -1,7 +1,6 @@ import WithDraggable from '@/components/common/draggable/WithDraggable' import { useState, useEffect, useContext } from 'react' import PowerConditionalSelect from '@/components/floor-plan/modal/circuitTrestle/step/PowerConditionalSelect' -import CircuitAllocation from '@/components/floor-plan/modal/circuitTrestle/step/CircuitAllocation' import StepUp from '@/components/floor-plan/modal/circuitTrestle/step/StepUp' import { useMessage } from '@/hooks/useMessage' import { usePopup } from '@/hooks/usePopup' diff --git a/src/components/floor-plan/modal/circuitTrestle/step/PowerConditionalSelect.jsx b/src/components/floor-plan/modal/circuitTrestle/step/PowerConditionalSelect.jsx index 06cab2f1..5cc83160 100644 --- a/src/components/floor-plan/modal/circuitTrestle/step/PowerConditionalSelect.jsx +++ b/src/components/floor-plan/modal/circuitTrestle/step/PowerConditionalSelect.jsx @@ -223,7 +223,7 @@ export default function PowerConditionalSelect(props) {
{series?.map((series, index) => ( -
+
onCheckSeries(series)} checked={series.selected} />
@@ -263,8 +263,8 @@ export default function PowerConditionalSelect(props) {
- {selectedModels?.map((model) => ( - + {selectedModels?.map((model, index) => ( + {model.goodsNo} ))} diff --git a/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx b/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx index 635e1f8f..e77c2b66 100644 --- a/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx +++ b/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx @@ -271,10 +271,9 @@ export default function PassivityCircuitAllocation(props) { canvas.renderAll() canvas.discardActiveObject() + setModuleStatisticsData() }, }) - - setModuleStatisticsData() } const initAllPcsCircuitNumber = () => { @@ -292,12 +291,11 @@ export default function PassivityCircuitAllocation(props) { obj.circuit = null obj.pcsItemId = null }) - setTargetModules([]) - canvas.renderAll() + setTargetModules([]) + setModuleStatisticsData() }, }) - setModuleStatisticsData() } return ( diff --git a/src/components/floor-plan/modal/panelBatch/PanelBatchStatistics.jsx b/src/components/floor-plan/modal/panelBatch/PanelBatchStatistics.jsx index af66b672..8cd0de0e 100644 --- a/src/components/floor-plan/modal/panelBatch/PanelBatchStatistics.jsx +++ b/src/components/floor-plan/modal/panelBatch/PanelBatchStatistics.jsx @@ -4,12 +4,13 @@ import { useEffect, useState } from 'react' import { useMessage } from '@/hooks/useMessage' import WithDraggable from '@/components/common/draggable/WithDraggable' import { moduleStatisticsState } from '@/store/circuitTrestleAtom' -import { useRecoilValue, useResetRecoilState } from 'recoil' +import { useRecoilState, useRecoilValue, useResetRecoilState } from 'recoil' import { useModule } from '@/hooks/module/useModule' import { useEavesGableEdit } from '@/hooks/roofcover/useEavesGableEdit' import { canvasState } from '@/store/canvasAtom' import { POLYGON_TYPE } from '@/common/common' import { useCircuitTrestle } from '@/hooks/useCirCuitTrestle' +import { moduleSelectionDataState } from '@/store/selectedModuleOptions' export default function PanelBatchStatistics() { const { getMessage } = useMessage() @@ -21,15 +22,10 @@ export default function PanelBatchStatistics() { const canvas = useRecoilValue(canvasState) const { header, rows, footer } = useRecoilValue(moduleStatisticsState) const { setModuleStatisticsData } = useCircuitTrestle() + const [moduleSelectionDataStore, setModuleSelectionDataStore] = useRecoilState(moduleSelectionDataState) useEffect(() => { - const roofSurfaces = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE_SETUP_SURFACE) - console.log('πŸš€ ~ useEffect ~ roofSurfaces1:', roofSurfaces) - setModuleStatisticsData() - console.log( - 'πŸš€ ~ useEffect ~ roofSurfaces2:', - canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE_SETUP_SURFACE), - ) + if (moduleSelectionDataStore && moduleSelectionDataStore.module) setModuleStatisticsData() }, []) return ( diff --git a/src/hooks/common/useCanvasPopupStatusController.js b/src/hooks/common/useCanvasPopupStatusController.js index 5e560136..bbe4ae70 100644 --- a/src/hooks/common/useCanvasPopupStatusController.js +++ b/src/hooks/common/useCanvasPopupStatusController.js @@ -7,7 +7,8 @@ import { useAxios } from '../useAxios' import { unescapeString } from '@/util/common-utils' import { moduleSelectionDataState, moduleSelectionTotalState } from '@/store/selectedModuleOptions' import { compasDegAtom } from '@/store/orientationAtom' -import { currentCanvasPlanState } from '@/store/canvasAtom' +import { canvasState, currentCanvasPlanState } from '@/store/canvasAtom' +import { POLYGON_TYPE } from '@/common/common' export function useCanvasPopupStatusController(param = 1) { const popupType = parseInt(param) @@ -15,7 +16,7 @@ export function useCanvasPopupStatusController(param = 1) { const [compasDeg, setCompasDeg] = useRecoilState(compasDegAtom) const [moduleSelectionDataStore, setModuleSelectionDataStore] = useRecoilState(moduleSelectionDataState) const { get, getFetcher, postFetcher } = useAxios() - + const canvas = useRecoilValue(canvasState) const currentCanvasPlan = useRecoilValue(currentCanvasPlanState) // console.log('πŸš€ ~ Orientation ~ currentCanvasPlan:', currentCanvasPlan) @@ -52,7 +53,14 @@ export function useCanvasPopupStatusController(param = 1) { if (i === 1) { setCompasDeg(result.popupStatus) } else if (i === 2) { - setModuleSelectionDataStore(JSON.parse(unescapeString(result.popupStatus))) + const data = JSON.parse(unescapeString(result.popupStatus)) + setModuleSelectionDataStore(data) + + const roofSurfaceList = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE_SETUP_SURFACE) + const modules = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE) + roofSurfaceList.forEach((surface) => { + surface.modules = modules.filter((module) => module.surfaceId === surface.id) + }) } } } diff --git a/src/hooks/useCirCuitTrestle.js b/src/hooks/useCirCuitTrestle.js index 3b37d226..b216d3af 100644 --- a/src/hooks/useCirCuitTrestle.js +++ b/src/hooks/useCirCuitTrestle.js @@ -26,7 +26,6 @@ export function useCircuitTrestle() { const selectedModules = useRecoilValue(selectedModuleState) const { managementState, setManagementState, managementStateLoaded } = useContext(GlobalDataContext) const canvas = useRecoilValue(canvasState) - const { trigger: moduleSelectedDataTrigger } = useCanvasPopupStatusController(2) const [moduleSelectionData, setModuleSelectionData] = useRecoilState(moduleSelectionDataState) const setModuleStatistics = useSetRecoilState(moduleStatisticsState) const { getMessage } = useMessage() @@ -73,10 +72,6 @@ export function useCircuitTrestle() { // 지뢕면 λͺ©λ‘ const getRoofSurfaceList = () => { const roofSurfaceList = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE_SETUP_SURFACE) - const modules = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE) - roofSurfaceList.forEach((surface) => { - surface.modules = modules.filter((module) => module.surfaceId === surface.id) - }) roofSurfaceList.sort((a, b) => a.left - b.left || b.top - a.top) return roofSurfaceList .map((obj) => { @@ -183,13 +178,21 @@ export function useCircuitTrestle() { const setPowerConditionerData = () => {} const setModuleStatisticsData = () => { - const roofSurfaceList = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE_SETUP_SURFACE) - const modules = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE) - roofSurfaceList.forEach((surface) => { - surface.modules = modules.filter((module) => module.surfaceId === surface.id) - }) - // console.log(moduleSelectionData) - if (!moduleSelectionData || !moduleSelectionData.module || moduleSelectionData.module?.itemList?.length === 0) return + // const roofSurfaceList = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE_SETUP_SURFACE) + // const modules = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE) + // roofSurfaceList.forEach((surface) => { + // surface.modules = modules.filter((module) => module.surfaceId === surface.id) + // }) + // console.log('roofSurfaceList', roofSurfaceList) + // console.log('modules', modules) + console.log('moduleSelectionData', moduleSelectionData) + if ( + !moduleSelectionData || + !moduleSelectionData.module || + Object.keys(moduleSelectionData.module).length === 0 || + moduleSelectionData.module?.itemList?.length === 0 + ) + return const tempHeader = [ { name: getMessage('simulator.table.sub1'), prop: 'name' }, { name: getMessage('modal.circuit.trestle.setting.circuit.allocation.passivity.circuit'), prop: 'circuit' }, diff --git a/src/store/selectedModuleOptions.js b/src/store/selectedModuleOptions.js index c312c694..5165fb48 100644 --- a/src/store/selectedModuleOptions.js +++ b/src/store/selectedModuleOptions.js @@ -42,7 +42,6 @@ export const moduleSelectionOptionParamsState = atom({ stdWindSpeed: '', stdSnowLd: '', inclCd: '', - roofMatlCd: '', }, dangerouslyAllowMutability: true, })