diff --git a/src/components/floor-plan/CanvasFrame.jsx b/src/components/floor-plan/CanvasFrame.jsx index eb8e7bea..31698b1a 100644 --- a/src/components/floor-plan/CanvasFrame.jsx +++ b/src/components/floor-plan/CanvasFrame.jsx @@ -2,7 +2,7 @@ import { useContext, useEffect, useRef } from 'react' -import { useRecoilValue } from 'recoil' +import { useRecoilState, useRecoilValue, useResetRecoilState } from 'recoil' import QContextMenu from '@/components/common/context-menu/QContextMenu' import PanelBatchStatistics from '@/components/floor-plan/modal/panelBatch/PanelBatchStatistics' @@ -16,6 +16,7 @@ import { totalDisplaySelector } from '@/store/settingAtom' import { MENU } from '@/common/common' import { FloorPlanContext } from '@/app/floor-plan/FloorPlanProvider' import { QcastContext } from '@/app/QcastProvider' +import { moduleStatisticsState } from '@/store/circuitTrestleAtom' export default function CanvasFrame() { const canvasRef = useRef(null) @@ -27,7 +28,8 @@ export default function CanvasFrame() { const { currentCanvasPlan } = usePlan() const totalDisplay = useRecoilValue(totalDisplaySelector) // 집계표 표시 여부 const { setIsGlobalLoading } = useContext(QcastContext) - + const [moduleStatistics, setModuleStatistics] = useRecoilState(moduleStatisticsState) + const reset = useResetRecoilState(moduleStatisticsState) const loadCanvas = () => { if (canvas) { canvas?.clear() // 캔버스를 초기화합니다. @@ -43,6 +45,7 @@ export default function CanvasFrame() { useEffect(() => { loadCanvas() + reset() }, [currentCanvasPlan, canvas]) useEffect(() => { diff --git a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx index 1e22171b..3783e033 100644 --- a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx +++ b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx @@ -163,7 +163,6 @@ export default function CircuitTrestleSetting({ id }) { .getObjects() .filter((obj) => obj.name === POLYGON_TYPE.MODULE_SETUP_SURFACE) .map((obj) => { - getModuleList(obj) return { roofSurfaceId: obj.id, roofSurface: canvas @@ -430,6 +429,8 @@ export default function CircuitTrestleSetting({ id }) { obj.circuit = null obj.pcsItemId = null }) + setAllocationType(ALLOCATION_TYPE.AUTO) + canvas.renderAll() }, }) } @@ -507,7 +508,7 @@ export default function CircuitTrestleSetting({ id }) { )} {tabNum === 1 && allocationType === ALLOCATION_TYPE.PASSIVITY && (
-