src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx

@@ -41,7 +41,7 @@ export default function CircuitTrestleSetting({ id }) {
   const [tabNum, setTabNum] = useState(1)
   const [allocationType, setAllocationType] = useState(ALLOCATION_TYPE.AUTO)
   const [circuitAllocationType, setCircuitAllocationType] = useState(1)
-  const { managementState, setManagementState } = useContext(GlobalDataContext)
+  const { managementState, setManagementState, managementStateLoaded } = useContext(GlobalDataContext)
   const selectedModules = useRecoilValue(selectedModuleState)
   const { getPcsAutoRecommendList, getPcsVoltageChk, getPcsVoltageStepUpList, getPcsManualConfChk } = useMasterController()
 
@@ -84,6 +84,7 @@ export default function CircuitTrestleSetting({ id }) {
   // const { trigger: moduleSelectedDataTrigger } = useCanvasPopupStatusController(2)
   useEffect(() => {
     if (!managementState) {
+      setManagementState(managementStateLoaded)
     }
     // setCircuitData({
     //   makers,

src/components/floor-plan/modal/circuitTrestle/step/PowerConditionalSelect.jsx

@@ -44,7 +44,7 @@ export default function PowerConditionalSelect(props) {
   const { getPcsMakerList, getPcsModelList } = useMasterController()
   const selectedModules = useRecoilValue(selectedModuleState)
   const { swalFire } = useSwal()
-  // const { trigger: moduleSelectedDataTrigger } = useCanvasPopupStatusController(2)
+  const { trigger: moduleSelectedDataTrigger } = useCanvasPopupStatusController(2)
   const [moduleSelectionData, setModuleSelectionData] = useRecoilState(moduleSelectionDataState)
   const modelHeader = [
     { name: getMessage('modal.circuit.trestle.setting.circuit.allocation.passivity.series'), width: '15%', prop: 'pcsSerNm', type: 'color-box' },

src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx

@@ -42,6 +42,7 @@ export default function StepUp(props) {
   const [arrayLength, setArrayLength] = useState(3) //module-table-inner의 반복 개수
   const [pcsCheck, setPcsCheck] = useRecoilState(pcsCheckState)
   const { getPcsVoltageStepUpList, getPcsAutoRecommendList, getPcsVoltageChk, getPcsConnOptionItemList } = useMasterController()
+  const { managementState, setManagementState, managementStateLoaded } = useContext(GlobalDataContext)
   const canvas = useRecoilValue(canvasState)
   const selectedModules = useRecoilValue(selectedModuleState)
   const [optCodes, setOptCodes] = useState([])

src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx

@@ -25,7 +25,7 @@ export default function PassivityCircuitAllocation(props) {
   const { swalFire } = useSwal()
   const { getMessage } = useMessage()
   const canvas = useRecoilValue(canvasState)
-  const { managementState } = useContext(GlobalDataContext)
+  const { managementState, setManagementState, managementStateLoaded } = useContext(GlobalDataContext)
   const selectedModules = useRecoilValue(selectedModuleState)
   const [selectedPcs, setSelectedPcs] = useState(selectedModels[0])
   const { header, rows, footer } = useRecoilValue(moduleStatisticsState)
@@ -38,6 +38,7 @@ export default function PassivityCircuitAllocation(props) {
   useEffect(() => {
     setModuleStatisticsData()
     if (!managementState) {
+      setManagementState(managementStateLoaded)
     }
     canvas
       .getObjects()

src/hooks/common/useCanvasPopupStatusController.js

@@ -9,10 +9,9 @@ import { compasDegAtom } from '@/store/orientationAtom'
 import { canvasState, currentCanvasPlanState } from '@/store/canvasAtom'
 import { POLYGON_TYPE } from '@/common/common'
 import { useCircuitTrestle } from '../useCirCuitTrestle'
-import { useContext } from 'react'
+import { useEffect } from 'react'
 import { addedRoofsState } from '@/store/settingAtom'
 import { roofsState } from '@/store/roofAtom'
-import { GlobalDataContext } from '@/app/GlobalDataProvider'
 
 /**
  * 캔버스 팝업 상태 관리
@@ -23,14 +22,13 @@ export function useCanvasPopupStatusController(param = 1) {
   const popupType = parseInt(param)
 
   const setCompasDeg = useSetRecoilState(compasDegAtom)
-  const [moduleSelectionDataStore, setModuleSelectionDataStore] = useRecoilState(moduleSelectionDataState)
+  const setModuleSelectionDataStore = useSetRecoilState(moduleSelectionDataState)
   const setSelectedModules = useSetRecoilState(selectedModuleState)
   const { get, promiseGet, getFetcher, postFetcher } = useAxios()
   const canvas = useRecoilValue(canvasState)
   const currentCanvasPlan = useRecoilValue(currentCanvasPlanState)
   const [addedRoofs, setAddedRoofs] = useRecoilState(addedRoofsState)
   const [roofs, setRoofs] = useRecoilState(roofsState)
-  const { managementState, setManagementState } = useContext(GlobalDataContext)
   /**
    * 팝업 상태 조회
    * @param {number} popupTypeParam
@@ -56,7 +54,6 @@ export function useCanvasPopupStatusController(param = 1) {
    * 조회 후 전체 데이터 recoil에 저장
    */
   const handleModuleSelectionTotal = async () => {
-    let resultData = {}
     for (let i = 1; i < 3; i++) {
       const result = await getModuleSelection(i)
       if (!result.objectNo) return
@@ -66,8 +63,7 @@ export function useCanvasPopupStatusController(param = 1) {
 
           if (data?.compasDeg) setCompasDeg(data.compasDeg)
           if (data?.module) setSelectedModules(data.module)
-          // setModuleSelectionDataStore(data)
-          resultData = { ...data }
+          setModuleSelectionDataStore(data)
         }
       } else if (i === 2) {
         const data = JSON.parse(unescapeString(result.popupStatus))
@@ -78,15 +74,11 @@ export function useCanvasPopupStatusController(param = 1) {
         })
         if (data.roofConstruction) {
           setRoofs(data.roofConstruction)
-          setManagementState({ ...managementState, roofs: data.roofConstruction.map((roof) => roof.construction.managementState) })
-          // setModuleSelectionDataStore({ ...moduleSelectionDataStore, roofConstructions: data.roofConstruction })
-          resultData = { ...resultData, ...data }
+          // setManagementState({ ...managementState, roofs: data.roofConstruction.map((roof) => roof.construction.managementState) })
         }
         // if (data?.module) setManagementState(data.common.managementState)
       }
     }
-    console.log('resultData', resultData)
-    setModuleSelectionDataStore(resultData)
   }
 
   /**

src/hooks/module/useModuleSelection.js

@@ -84,7 +84,7 @@ export function useModuleSelection(props) {
 
     //새로고침시 데이터 날아가는거 방지
     if (managementState === null) {
-      setManagementState(managementState)
+      setManagementState(managementStateLoaded)
     } else {
       bindInitData()
     }

src/hooks/useCirCuitTrestle.js

@@ -24,7 +24,7 @@ export function useCircuitTrestle(executeEffect = false) {
   const [selectedModels, setSelectedModels] = useRecoilState(selectedModelsState)
   const [pcsCheck, setPcsCheck] = useRecoilState(pcsCheckState)
   const selectedModules = useRecoilValue(selectedModuleState)
-  const { managementState } = useContext(GlobalDataContext)
+  const { managementState, setManagementState, managementStateLoaded } = useContext(GlobalDataContext)
   const canvas = useRecoilValue(canvasState)
   const setModuleStatistics = useSetRecoilState(moduleStatisticsState)
   const resetModuleStatistics = useResetRecoilState(moduleStatisticsState)

src/hooks/useEstimate.js

@@ -13,7 +13,7 @@ import { useTrestle } from '@/hooks/module/useTrestle'
 import { usePlan } from '@/hooks/usePlan'
 
 export function useEstimate() {
-  const { managementState } = useContext(GlobalDataContext)
+  const { managementStateLoaded } = useContext(GlobalDataContext)
   const { setIsGlobalLoading } = useContext(QcastContext)
   const router = useRouter()
   const loginUserState = useRecoilValue(loginUserStore)
@@ -32,15 +32,15 @@ export function useEstimate() {
    */
   const saveEstimate = async (estimateParam) => {
     const userId = loginUserState.userId
-    const saleStoreId = managementState.saleStoreId
+    const saleStoreId = managementStateLoaded.saleStoreId
     const objectNo = currentCanvasPlan.objectNo
     const planNo = currentCanvasPlan.planNo
     const slope = estimateParam.roofSurfaceList[0].slope
     const angle = estimateParam.roofSurfaceList[0].angle
-    const surfaceType = managementState.surfaceType
-    const setupHeight = managementState.installHeight
-    const standardWindSpeedId = managementState.standardWindSpeedId
-    const snowfall = managementState.verticalSnowCover
+    const surfaceType = managementStateLoaded.surfaceType
+    const setupHeight = managementStateLoaded.installHeight
+    const standardWindSpeedId = managementStateLoaded.standardWindSpeedId
+    const snowfall = managementStateLoaded.verticalSnowCover
     const drawingFlg = '1'
 
     const saveEstimateData = {