From 670f2a4193562e439e6a8d154fb81d737c41db97 Mon Sep 17 00:00:00 2001 From: ysCha Date: Tue, 10 Mar 2026 12:29:26 +0900 Subject: [PATCH 1/3] Fix typo: 'ues client' -> 'use client' --- src/app/floor-plan/FloorPlanProvider.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/floor-plan/FloorPlanProvider.js b/src/app/floor-plan/FloorPlanProvider.js index a9595aa5..d09577f5 100644 --- a/src/app/floor-plan/FloorPlanProvider.js +++ b/src/app/floor-plan/FloorPlanProvider.js @@ -1,4 +1,4 @@ -'ues client' +'use client' // import { correntObjectNoState } from '@/store/settingAtom' import { notFound, usePathname, useSearchParams } from 'next/navigation' From 19b45b481074cdb2aa5f02458f29babe92fce571 Mon Sep 17 00:00:00 2001 From: ysCha Date: Tue, 10 Mar 2026 12:32:17 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EC=A7=80=EB=B6=95=EB=A9=B4=EC=84=A4?= =?UTF-8?q?=EC=A0=95=EC=B0=BD=20=ED=99=95=EC=9D=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hooks/option/useCanvasSetting.js | 33 ++++++++++++++++++---------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/src/hooks/option/useCanvasSetting.js b/src/hooks/option/useCanvasSetting.js index 11315cdf..a4068f92 100644 --- a/src/hooks/option/useCanvasSetting.js +++ b/src/hooks/option/useCanvasSetting.js @@ -326,9 +326,14 @@ export function useCanvasSetting(executeEffect = true) { } try { + const apiUrl = `/api/canvas-management/canvas-basic-settings/by-object/${correntObjectNo}/${planNo}` + logger.log('🔍 fetchBasicSettings API 호출:', apiUrl) + logger.log('🔍 correntObjectNo:', correntObjectNo, 'planNo:', planNo) + await get({ - url: `/api/canvas-management/canvas-basic-settings/by-object/${correntObjectNo}/${planNo}`, + url: apiUrl, }).then((res) => { + logger.log('📦 API 응답 데이터:', res) let roofsRow = {} let roofsArray = {} @@ -388,17 +393,23 @@ export function useCanvasSetting(executeEffect = true) { /** 메뉴에서 배치면 초기설정 클릭 시 실행하지 않음 */ if (openPoint === null) { + logger.log('🎯 팝업 열기 조건 충족: openPoint=', openPoint, 'res.length=', res.length) /** 배치면 초기설정 미저장 상태이면 화면 열기 */ - const placementInitialProps = { - id: popupId, - pos: { - x: 50, - y: 180, - }, - planNo: planNo, - openPoint: 'useCanvasSetting', - } - addPopup(popupId, 1, ) + // 다른 closeAll 호출이 끝날 때까지 기다림 + //setTimeout(() => { + const placementInitialProps = { + id : popupId, + pos : { + x: 50, + y: 180, + }, + planNo : planNo, + openPoint: 'useCanvasSetting', + } + addPopup(popupId, 1, ) + // },50) + } else { + logger.log('❌ 팝업 열기 조건 불충족: openPoint=', openPoint) } } From 07ce6b6f4d4a5cd614990a5eb3a1c76329bfecd3 Mon Sep 17 00:00:00 2001 From: ysCha Date: Tue, 10 Mar 2026 15:06:55 +0900 Subject: [PATCH 3/3] =?UTF-8?q?[1456]=EB=B0=B0=EC=B9=98=EB=A9=B4=20?= =?UTF-8?q?=EC=B4=88=EA=B8=B0=20=EC=84=A4=EC=A0=95=EC=97=90=EC=84=9C?= =?UTF-8?q?=EC=9D=98=20=EC=A7=80=EB=B6=95=EC=9E=AC=EC=99=80=20=EC=B4=8C=20?= =?UTF-8?q?=EC=9C=84=EC=B9=98=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../placementShape/PlacementShapeSetting.jsx | 152 +++++++++--------- 1 file changed, 76 insertions(+), 76 deletions(-) diff --git a/src/components/floor-plan/modal/placementShape/PlacementShapeSetting.jsx b/src/components/floor-plan/modal/placementShape/PlacementShapeSetting.jsx index 87ad753c..a4e9959f 100644 --- a/src/components/floor-plan/modal/placementShape/PlacementShapeSetting.jsx +++ b/src/components/floor-plan/modal/placementShape/PlacementShapeSetting.jsx @@ -342,82 +342,6 @@ export default function PlacementShapeSetting({ id, pos = { x: 50, y: 180 }, pla - - {getMessage('modal.placement.initial.setting.roof.angle.setting')} - -
- {currentRoof && - roofAngleSetArray.map((item, index) => ( -
- -
- setCurrentRoof({ ...currentRoof, roofAngleSet: e.target.value })} - /> - -
- -
- {/* { - const v = normalizeDecimal(e.target.value) - e.target.value = v - if (index === 0) { - const num = v === '' ? '' : Number(v) - setCurrentRoof({ ...currentRoof, pitch: num === '' ? '' : num, angle: num === '' ? '' : getDegreeByChon(num) }) - } else { - const num = v === '' ? '' : Number(v) - setCurrentRoof({ ...currentRoof, pitch: num === '' ? '' : getChonByDegree(num), angle: num === '' ? '' : num }) - } - }} - /> */} - { - if (index === 0) { - const pitch = value === '' ? '' : Number(value) - const angle = pitch === '' ? '' : getDegreeByChon(pitch) - setCurrentRoof((prev) => ({ - ...prev, - pitch, - angle, - })) - } else { - const angle = value === '' ? '' : Number(value) - const pitch = angle === '' ? '' : getChonByDegree(angle) - setCurrentRoof((prev) => ({ - ...prev, - pitch, - angle, - })) - } - }} - options={{ - allowNegative: false, - allowDecimal: true, - }} - /> -
- {index === 0 ? '寸' : '度'} -
- ))} -
- -
@@ -600,6 +524,82 @@ export default function PlacementShapeSetting({ id, pos = { x: 50, y: 180 }, pla )} */} + + {getMessage('modal.placement.initial.setting.roof.angle.setting')} + +
+ {currentRoof && + roofAngleSetArray.map((item, index) => ( +
+ +
+ setCurrentRoof({ ...currentRoof, roofAngleSet: e.target.value })} + /> + +
+ +
+ {/* { + const v = normalizeDecimal(e.target.value) + e.target.value = v + if (index === 0) { + const num = v === '' ? '' : Number(v) + setCurrentRoof({ ...currentRoof, pitch: num === '' ? '' : num, angle: num === '' ? '' : getDegreeByChon(num) }) + } else { + const num = v === '' ? '' : Number(v) + setCurrentRoof({ ...currentRoof, pitch: num === '' ? '' : getChonByDegree(num), angle: num === '' ? '' : num }) + } + }} + /> */} + { + if (index === 0) { + const pitch = value === '' ? '' : Number(value) + const angle = pitch === '' ? '' : getDegreeByChon(pitch) + setCurrentRoof((prev) => ({ + ...prev, + pitch, + angle, + })) + } else { + const angle = value === '' ? '' : Number(value) + const pitch = angle === '' ? '' : getChonByDegree(angle) + setCurrentRoof((prev) => ({ + ...prev, + pitch, + angle, + })) + } + }} + options={{ + allowNegative: false, + allowDecimal: true, + }} + /> +
+ {index === 0 ? '寸' : '度'} +
+ ))} +
+ +