From aabd464b8882304e9a085ecd2cd29111c577b7b2 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: Wed, 5 Feb 2025 20:21:16 +0900 Subject: [PATCH] =?UTF-8?q?circuitNumber=20visible=20selector=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../floor-plan/modal/circuitTrestle/step/StepUp.jsx | 4 +++- .../circuitTrestle/step/type/PassivityCircuitAllocation.jsx | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx b/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx index 65e35583..90d40c2f 100644 --- a/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx +++ b/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx @@ -12,6 +12,7 @@ import { useMasterController } from '@/hooks/common/useMasterController' import { v4 as uuidv4 } from 'uuid' import { globalLocaleStore } from '@/store/localeAtom' import { POLYGON_TYPE } from '@/common/common' +import { circuitNumDisplaySelector } from '@/store/settingAtom' export default function StepUp(props) { const { @@ -43,7 +44,7 @@ export default function StepUp(props) { // 선택된 값들을 저장할 상태 추가 const [selectedValues, setSelectedValues] = useState({}) - + const isDisplayCircuitNumber = useRecoilValue(circuitNumDisplaySelector) // useCanvasPopupStatusController(6) // const canvasPopupStatusState = useRecoilValue(canvasPopupStatusStore) // if (Object.keys(canvasPopupStatusState[6]).length !== 0) { @@ -323,6 +324,7 @@ export default function StepUp(props) { name: 'circuitNumber', parentId: targetModule.id, circuitInfo: module.pcsItemId, + visible: isDisplayCircuitNumber, }) targetModule.circuit = moduleCircuitText targetModule.pcsItemId = module.pcsItemId 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 ff1e7cb8..1c5595a6 100644 --- a/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx +++ b/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx @@ -7,6 +7,7 @@ import { useSwal } from '@/hooks/useSwal' import { canvasState } from '@/store/canvasAtom' import { moduleStatisticsState } from '@/store/circuitTrestleAtom' import { selectedModuleState } from '@/store/selectedModuleOptions' +import { circuitNumDisplaySelector } from '@/store/settingAtom' import { useContext, useEffect, useState } from 'react' import { useRecoilState, useRecoilValue } from 'recoil' @@ -29,6 +30,7 @@ export default function PassivityCircuitAllocation(props) { const [targetModules, setTargetModules] = useState([]) const { setModuleStatisticsData } = useModule() const { getPcsManualConfChk } = useMasterController() + const isDisplayCircuitNumber = useRecoilValue(circuitNumDisplaySelector) useEffect(() => { console.log('header, rows', header, rows) @@ -215,6 +217,7 @@ export default function PassivityCircuitAllocation(props) { name: 'circuitNumber', parentId: obj.id, circuitInfo: selectedPcs, + visible: isDisplayCircuitNumber, }) obj.set({ strokeWidth: 0.3,