qcast3/qcast-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

캔버스 데이터 로드시 module data 저장 추가

Browse Source
This commit is contained in:
김민식 2025-02-11 10:02:33 +09:00
parent 0597a10af2
commit c253cfe07e
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/hooks/common/useCanvasPopupStatusController.js
View File

@ -5,16 +5,18 @@ import useSWR from 'swr'
import useSWRMutation from 'swr/mutation' import useSWRMutation from 'swr/mutation'
import { useAxios } from '../useAxios' import { useAxios } from '../useAxios'
import { unescapeString } from '@/util/common-utils' import { unescapeString } from '@/util/common-utils'
import { moduleSelectionDataState, moduleSelectionTotalState } from '@/store/selectedModuleOptions' import { moduleSelectionDataState, moduleSelectionTotalState, selectedModuleOptionsState, selectedModuleState } from '@/store/selectedModuleOptions'
import { compasDegAtom } from '@/store/orientationAtom' import { compasDegAtom } from '@/store/orientationAtom'
import { canvasState, currentCanvasPlanState } from '@/store/canvasAtom' import { canvasState, currentCanvasPlanState } from '@/store/canvasAtom'
import { POLYGON_TYPE } from '@/common/common' import { POLYGON_TYPE } from '@/common/common'
import { DateRangePickerField } from '@nextui-org/react'
export function useCanvasPopupStatusController(param = 1) { export function useCanvasPopupStatusController(param = 1) {
const popupType = parseInt(param) const popupType = parseInt(param)
const [compasDeg, setCompasDeg] = useRecoilState(compasDegAtom) const [compasDeg, setCompasDeg] = useRecoilState(compasDegAtom)
const [moduleSelectionDataStore, setModuleSelectionDataStore] = useRecoilState(moduleSelectionDataState) const [moduleSelectionDataStore, setModuleSelectionDataStore] = useRecoilState(moduleSelectionDataState)
const [selectedModules, setSelectedModules] = useRecoilState(selectedModuleState)
const { get, getFetcher, postFetcher } = useAxios() const { get, getFetcher, postFetcher } = useAxios()
const canvas = useRecoilValue(canvasState) const canvas = useRecoilValue(canvasState)
const currentCanvasPlan = useRecoilValue(currentCanvasPlanState) const currentCanvasPlan = useRecoilValue(currentCanvasPlanState)
@ -50,12 +52,13 @@ export function useCanvasPopupStatusController(param = 1) {
for (let i = 1; i < 3; i++) { for (let i = 1; i < 3; i++) {
const result = await getModuleSelection(i) const result = await getModuleSelection(i)
// setModuleSelectionTotal((prev) => ({ ...prev, [i]: JSON.parse(unescapeString(result.popupStatus)) })) // setModuleSelectionTotal((prev) => ({ ...prev, [i]: JSON.parse(unescapeString(result.popupStatus)) }))
if(!result) return if (!result) return
if (i === 1) { if (i === 1) {
setCompasDeg(result.popupStatus) setCompasDeg(result.popupStatus)
} else if (i === 2) { } else if (i === 2) {
const data = JSON.parse(unescapeString(result.popupStatus)) const data = JSON.parse(unescapeString(result.popupStatus))
setModuleSelectionDataStore(data) setModuleSelectionDataStore(data)
if (data.module) setSelectedModules(data.module)
const roofSurfaceList = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE_SETUP_SURFACE) const roofSurfaceList = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE_SETUP_SURFACE)
const modules = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE) const modules = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE)

1
src/hooks/useCirCuitTrestle.js
View File

@ -61,6 +61,7 @@ export function useCircuitTrestle() {
// 사용된 모듈아이템 목록 // 사용된 모듈아이템 목록
const getUseModuleItemList = () => { const getUseModuleItemList = () => {
console.log('🚀 ~ getUseModuleItemList ~ selectedModules:', selectedModules)
return selectedModules?.itemList?.map((m) => { return selectedModules?.itemList?.map((m) => {
return { return {
itemId: m.itemId, itemId: m.itemId,