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

배치면기본설정 및 Canvas설정 초기 데이터 설정 처리

Browse Source
This commit is contained in:
changkyu choi 2025-01-20 11:27:26 +09:00
parent 4edef1c87d
commit e460f7daae
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/floor-plan/FloorPlan.jsx
View File

@ -15,7 +15,7 @@ export default function FloorPlan({ children }) {
//const [correntObjectNo, setCorrentObjectNo] = useRecoilState(correntObjectNoState)
const { closeAll } = usePopup()
const { menuNumber, setMenuNumber } = useCanvasMenu()
const { fetchSettings } = useCanvasSetting()
const { fetchSettings, fetchBasicSettings } = useCanvasSetting()
const modalProps = {
menuNumber,
@ -26,7 +26,8 @@ export default function FloorPlan({ children }) {
///setCorrentObjectNo(floorPlanState.objectNo)
//console.log('FloorPlan objectNo ', floorPlanState.objectNo, correntObjectNo)
setMenuNumber(1)
fetchSettings()
fetchSettings() // Canvas 설정 정보 조회
fetchBasicSettings() // 기본 설정 정보 조회
return () => {
closeAll()
}

31
src/hooks/option/useCanvasSetting.js
View File

@ -165,9 +165,10 @@ export function useCanvasSetting() {
useEffect(() => {
//console.log('🚀 ~ useEffect ~ roofMaterials 22 :', previousRoofMaterialsYn, roofMaterials.length , JSON.stringify(previousRoofMaterialsRef.current) !== JSON.stringify(roofMaterials))
// 지붕재 select 정보가 존재해야 배치면초기설정 DB 정보 비교 후 지붕재 정보를 가져올 수 있음
if (!previousObjectNoRef.current && !correntObjectNo && previousObjectNoRef.current !== correntObjectNo
|| roofMaterials.length !== 0 && JSON.stringify(previousRoofMaterialsRef.current) !== JSON.stringify(roofMaterials)) {
if (
(!previousObjectNoRef.current && !correntObjectNo && previousObjectNoRef.current !== correntObjectNo) ||
(roofMaterials.length !== 0 && JSON.stringify(previousRoofMaterialsRef.current) !== JSON.stringify(roofMaterials))
) {
// 1회만 실행
if (roofMaterials && previousRoofMaterialsYn === 'N') {
fetchBasicSettings()
@ -290,10 +291,12 @@ export function useCanvasSetting() {
const fetchBasicSettings = async () => {
try {
await get({ url: `/api/canvas-management/canvas-basic-settings/by-object/${correntObjectNo}` }).then((res) => {
console.log('🚀 ~ fetchBasicSettings ~ res >>>>>>>>>> :', res)
let roofsRow = {}
let roofsArray = {}
if (res) {
if (res.length > 0) {
roofsRow = res.map((item) => {
return {
roofSizeSet: String(item.roofSizeSet),
@ -444,7 +447,7 @@ export function useCanvasSetting() {
const res = await get({ url: `/api/canvas-management/canvas-settings/by-object/${correntObjectNo}` })
console.log('res', res)
if (res.length > 0) {
if (Object.keys(res).length > 0) {
const optionData1 = settingModalFirstOptions.option1.map((item) => ({ ...item, selected: res[item.column] }))
const optionData2 = settingModalFirstOptions.option2.map((item) => ({ ...item, selected: res[item.column] }))
const optionData3 = settingModalSecondOptions.option3.map((item) => ({ ...item }))
@ -539,20 +542,17 @@ export function useCanvasSetting() {
setAdsorptionPointMode({ ...adsorptionPointMode, adsorptionPoint: false })
//치수선 설정
setDimensionLineSettings({ ...dimensionLineSettings })
setDimensionLineSettings({ ...dimensionLineSettings, ...dimensionLineSettingsState.default })
//도면크기 설정
setPlanSizeSettingMode({ ...planSizeSettingMode })
setPlanSizeSettingMode({ ...planSizeSettingMode, ...planSizeSettingModeState.default })
// 데이터 설정
setSettingModalFirstOptions({
...settingModalFirstOptions,
})
setSettingModalSecondOptions({
...settingModalSecondOptions,
})
setSettingModalFirstOptions(...settingModalFirstOptions, ...settingModalFirstOptionsState.default)
setGlobalFont({ ...globalFont })
setSettingModalSecondOptions(...settingModalSecondOptions, ...settingModalSecondOptionsState.default)
setGlobalFont({ ...globalFont, ...globalFontState.default })
//점/선 그리드
setDotLineGridSettingState({ ...defaultDotLineGridSetting })
@ -677,7 +677,7 @@ export function useCanvasSetting() {
// HTTP POST 요청 보내기
await post({ url: `/api/canvas-management/canvas-settings`, data: patternData })
.then((res) => {
swalFire({ text: getMessage(res.returnMessage) })
//swalFire({ text: getMessage(res.returnMessage) })
// Canvas 디스플레이 설정 시 해당 옵션 적용
frontSettings()
@ -777,6 +777,7 @@ export function useCanvasSetting() {
adsorptionRange,
setAdsorptionRange,
fetchSettings,
fetchBasicSettings,
frontSettings,
globalFont,
setGlobalFont,