floor-plan 실행 시 배치면초기설정 팝업 Open 처리 및 오류 수정
This commit is contained in:
parent
4618b7a4fa
commit
b0f145ef4e
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
import { correntObjectNoState } from '@/store/settingAtom'
|
import { correntObjectNoState } from '@/store/settingAtom'
|
||||||
import { notFound, usePathname, useSearchParams } from 'next/navigation'
|
import { notFound, usePathname, useSearchParams } from 'next/navigation'
|
||||||
import { createContext, useReducer, useState } from 'react'
|
import { createContext, useReducer, useState, useEffect } from 'react'
|
||||||
import { useSetRecoilState } from 'recoil'
|
import { useSetRecoilState } from 'recoil'
|
||||||
|
|
||||||
const reducer = (prevState, nextState) => {
|
const reducer = (prevState, nextState) => {
|
||||||
@ -48,12 +48,14 @@ const FloorPlanProvider = ({ children }) => {
|
|||||||
const objectNo = searchParams.get('objectNo')
|
const objectNo = searchParams.get('objectNo')
|
||||||
const pid = searchParams.get('pid')
|
const pid = searchParams.get('pid')
|
||||||
|
|
||||||
if (pathname === '/floor-plan') {
|
useEffect(() => { // 오류 발생으로 useEffect 사용
|
||||||
if (pid === undefined || pid === '' || pid === null || objectNo === undefined || objectNo === '' || objectNo === null) {
|
if (pathname === '/floor-plan') {
|
||||||
notFound()
|
if (pid === undefined || pid === '' || pid === null || objectNo === undefined || objectNo === '' || objectNo === null) {
|
||||||
|
notFound()
|
||||||
|
}
|
||||||
|
setCurrentObjectNo(objectNo)
|
||||||
}
|
}
|
||||||
setCurrentObjectNo(objectNo)
|
}, [pid, objectNo])
|
||||||
}
|
|
||||||
|
|
||||||
const [floorPlanState, setFloorPlanState] = useState({
|
const [floorPlanState, setFloorPlanState] = useState({
|
||||||
// 플랜 파일 업로드 모달 오픈 제어
|
// 플랜 파일 업로드 모달 오픈 제어
|
||||||
|
|||||||
@ -309,10 +309,9 @@ export default function CanvasMenu(props) {
|
|||||||
}, [type, globalLocale])
|
}, [type, globalLocale])
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
console.log('🚀 ~ useEffect ~ basicSetting:', basicSetting)
|
if (!selectedRoofMaterial) return
|
||||||
if (Object.keys(basicSetting).length === 0 || !basicSetting.roofSizeSet) return
|
//if (Object.keys(basicSetting).length === 0 || !basicSetting.roofSizeSet) return
|
||||||
|
setMenuNumber(1)
|
||||||
// setMenuNumber(1)
|
|
||||||
// if ([2, 3].some((num) => num === canvasSetting?.roofSizeSet)) {
|
// if ([2, 3].some((num) => num === canvasSetting?.roofSizeSet)) {
|
||||||
// setMenuNumber(3)
|
// setMenuNumber(3)
|
||||||
// setType('surface')
|
// setType('surface')
|
||||||
@ -322,7 +321,8 @@ export default function CanvasMenu(props) {
|
|||||||
// setType('outline')
|
// setType('outline')
|
||||||
// setCurrentMenu(MENU.ROOF_COVERING.EXTERIOR_WALL_LINE)
|
// setCurrentMenu(MENU.ROOF_COVERING.EXTERIOR_WALL_LINE)
|
||||||
// }
|
// }
|
||||||
}, [basicSetting])
|
}, [selectedRoofMaterial])
|
||||||
|
|
||||||
const checkMenuState = (menu) => {
|
const checkMenuState = (menu) => {
|
||||||
return (['2', '3'].includes(canvasSetting?.roofSizeSet) && menu.index === 2) || (menuNumber === 4 && menu.index === 2)
|
return (['2', '3'].includes(canvasSetting?.roofSizeSet) && menu.index === 2) || (menuNumber === 4 && menu.index === 2)
|
||||||
}
|
}
|
||||||
|
|||||||
@ -43,15 +43,15 @@ export default function PlacementShapeSetting({ id, pos = { x: 50, y: 180 }, set
|
|||||||
|
|
||||||
//치수 입력방법(복시도입력/실측값입력/육지붕)
|
//치수 입력방법(복시도입력/실측값입력/육지붕)
|
||||||
const roofSizeSetArray = [
|
const roofSizeSetArray = [
|
||||||
{ id: 'ra01', name: 'roofSizeSet', value: '1', checked: 'ture', message: 'modal.placement.initial.setting.size.roof' },
|
{ id: 'ra01', name: 'roofSizeSet', value: '1', message: 'modal.placement.initial.setting.size.roof' },
|
||||||
{ id: 'ra02', name: 'roofSizeSet', value: '2', checked: 'false', message: 'modal.placement.initial.setting.size.actual' },
|
{ id: 'ra02', name: 'roofSizeSet', value: '2', message: 'modal.placement.initial.setting.size.actual' },
|
||||||
{ id: 'ra03', name: 'roofSizeSet', value: '3', checked: 'false', message: 'modal.placement.initial.setting.size.none.pitch' },
|
{ id: 'ra03', name: 'roofSizeSet', value: '3', message: 'modal.placement.initial.setting.size.none.pitch' },
|
||||||
]
|
]
|
||||||
|
|
||||||
//지붕각도 설정(경사/각도)
|
//지붕각도 설정(경사/각도)
|
||||||
const roofAngleSetArray = [
|
const roofAngleSetArray = [
|
||||||
{ id: 'ra04', name: 'roofAngleSet', value: 'slope', checked: 'true', message: 'modal.placement.initial.setting.roof.pitch'},
|
{ id: 'ra04', name: 'roofAngleSet', value: 'slope', message: 'modal.placement.initial.setting.roof.pitch'},
|
||||||
{ id: 'ra05', name: 'roofAngleSet', value: 'flat', checked: 'false', message: 'modal.placement.initial.setting.roof.angle' },
|
{ id: 'ra05', name: 'roofAngleSet', value: 'flat', message: 'modal.placement.initial.setting.roof.angle' },
|
||||||
]
|
]
|
||||||
|
|
||||||
// 데이터를 최초 한 번만 조회
|
// 데이터를 최초 한 번만 조회
|
||||||
@ -59,12 +59,17 @@ export default function PlacementShapeSetting({ id, pos = { x: 50, y: 180 }, set
|
|||||||
if (!basicSetting || !currentRoof || Object.keys(currentRoof).length === 0 || Object.keys(basicSetting).length === 0) return
|
if (!basicSetting || !currentRoof || Object.keys(currentRoof).length === 0 || Object.keys(basicSetting).length === 0) return
|
||||||
const raftCodeList = findCommonCode('203800')
|
const raftCodeList = findCommonCode('203800')
|
||||||
setRaftCodes(raftCodeList)
|
setRaftCodes(raftCodeList)
|
||||||
setCurrentRoof({ ...currentRoof, roofSizeSet: basicSetting.roofSizeSet, roofAngleSet: basicSetting.roofAngleSet })
|
|
||||||
console.log('🚀 ~ fetchBasicSettings ~ currentRoof 11:', currentRoof)
|
if (addedRoofs.length > 0) {
|
||||||
|
setCurrentRoof({ ...currentRoof, roofSizeSet: addedRoofs[0].roofSizeSet, roofAngleSet: addedRoofs[0].roofAngleSet })
|
||||||
|
} else if (basicSetting.roofSizeSet.length > 0) {
|
||||||
|
setCurrentRoof({ ...currentRoof, roofSizeSet: basicSetting.roofSizeSet, roofAngleSet: basicSetting.roofAngleSet })
|
||||||
|
}
|
||||||
}, [])
|
}, [])
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
console.log('🚀 ~ fetchBasicSettings ~ currentRoof 22:', currentRoof)
|
console.log('🚀 ~ fetchBasicSettings ~ currentRoof :', currentRoof)
|
||||||
|
if(!currentRoof) return
|
||||||
setBasicSettings({
|
setBasicSettings({
|
||||||
...basicSetting,
|
...basicSetting,
|
||||||
roofSizeSet: String(currentRoof.roofSizeSet),
|
roofSizeSet: String(currentRoof.roofSizeSet),
|
||||||
@ -194,14 +199,12 @@ export default function PlacementShapeSetting({ id, pos = { x: 50, y: 180 }, set
|
|||||||
<div className="pop-form-radio">
|
<div className="pop-form-radio">
|
||||||
{currentRoof &&
|
{currentRoof &&
|
||||||
roofSizeSetArray.map((item) => (
|
roofSizeSetArray.map((item) => (
|
||||||
<div className="d-check-radio pop">
|
<div className="d-check-radio pop" key={item.id}>
|
||||||
<input type="radio"
|
<input type="radio"
|
||||||
key={item.id}
|
|
||||||
id={item.id}
|
id={item.id}
|
||||||
name={item.name}
|
name={item.name}
|
||||||
value={item.value}
|
value={item.value}
|
||||||
checked={currentRoof?.roofSizeSet === item.value}
|
checked={currentRoof?.roofSizeSet === item.value}
|
||||||
defaultChecked={'1'}
|
|
||||||
onChange={(e) => setCurrentRoof({ ...currentRoof, roofSizeSet: e.target.value })}
|
onChange={(e) => setCurrentRoof({ ...currentRoof, roofSizeSet: e.target.value })}
|
||||||
/>
|
/>
|
||||||
<label htmlFor={item.id}>{getMessage(item.message)}</label>
|
<label htmlFor={item.id}>{getMessage(item.message)}</label>
|
||||||
@ -217,14 +220,12 @@ export default function PlacementShapeSetting({ id, pos = { x: 50, y: 180 }, set
|
|||||||
<div className="pop-form-radio">
|
<div className="pop-form-radio">
|
||||||
{currentRoof &&
|
{currentRoof &&
|
||||||
roofAngleSetArray.map((item) => (
|
roofAngleSetArray.map((item) => (
|
||||||
<div className="d-check-radio pop">
|
<div className="d-check-radio pop" key={item.id}>
|
||||||
<input type="radio"
|
<input type="radio"
|
||||||
key={item.id}
|
|
||||||
id={item.id}
|
id={item.id}
|
||||||
name={item.name}
|
name={item.name}
|
||||||
value={item.value}
|
value={item.value}
|
||||||
checked={currentRoof?.roofAngleSet === item.value}
|
checked={currentRoof?.roofAngleSet === item.value}
|
||||||
defaultChecked={'slope'}
|
|
||||||
onChange={(e) => setCurrentRoof({ ...currentRoof, roofAngleSet: e.target.value })}
|
onChange={(e) => setCurrentRoof({ ...currentRoof, roofAngleSet: e.target.value })}
|
||||||
/>
|
/>
|
||||||
<label htmlFor={item.id}>{getMessage(item.message)}</label>
|
<label htmlFor={item.id}>{getMessage(item.message)}</label>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user