From 9a68559323535d98600c806224e4c699aacc7198 Mon Sep 17 00:00:00 2001 From: yoosangwook Date: Wed, 19 Feb 2025 16:55:58 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=93=8Cfix:=20=EA=B2=AC=EC=A0=81?= =?UTF-8?q?=EC=84=9C/=EB=B0=9C=EC=A0=84=20=EC=8B=9C=EB=AE=AC=EB=A0=88?= =?UTF-8?q?=EC=9D=B4=EC=85=98=20=EC=97=90=EC=84=9C=20=EB=AA=A8=EB=93=88=20?= =?UTF-8?q?=ED=99=94=EB=A9=B4=20=EC=9D=B4=EB=8F=99=EC=8B=9C=20=EB=A1=9C?= =?UTF-8?q?=EC=A7=81=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 서브 메뉴 안나오던 문제 해결 --- src/components/floor-plan/CanvasMenu.jsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/floor-plan/CanvasMenu.jsx b/src/components/floor-plan/CanvasMenu.jsx index b3b461b3..e2b997ce 100644 --- a/src/components/floor-plan/CanvasMenu.jsx +++ b/src/components/floor-plan/CanvasMenu.jsx @@ -216,6 +216,7 @@ export default function CanvasMenu(props) { } } else { router.push(`/floor-plan?pid=${pid}&objectNo=${objectNo}`) + setType('module') } await reloadCanvasStatus(objectNo, pid) break From fdf834260d9eb510a8e7ad90f71e55f504d99a10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=8B=9D?= <43837214+Minsiki@users.noreply.github.com> Date: Wed, 19 Feb 2025 17:05:31 +0900 Subject: [PATCH 2/3] =?UTF-8?q?-=20=EB=A9=B4=ED=98=95=EC=83=81=20=EB=B0=B0?= =?UTF-8?q?=EC=B9=98=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modal/placementSurface/PlacementSurface.jsx | 4 ++-- src/hooks/surface/useSurfaceShapeBatch.js | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/floor-plan/modal/placementSurface/PlacementSurface.jsx b/src/components/floor-plan/modal/placementSurface/PlacementSurface.jsx index a4722bff..7ab89106 100644 --- a/src/components/floor-plan/modal/placementSurface/PlacementSurface.jsx +++ b/src/components/floor-plan/modal/placementSurface/PlacementSurface.jsx @@ -33,9 +33,9 @@ const PlacementSurface = forwardRef((props, refs) => { imageRotate = Math.abs(rotate % 4) } else { if (rotate < 0) { - imageRotate = Math.abs((rotate + 2) % 4) - } else { imageRotate = Math.abs((rotate - 2) % 4) + } else { + imageRotate = Math.abs((rotate + 2) % 4) } } } else { diff --git a/src/hooks/surface/useSurfaceShapeBatch.js b/src/hooks/surface/useSurfaceShapeBatch.js index 6f7d1dfa..6ad9861e 100644 --- a/src/hooks/surface/useSurfaceShapeBatch.js +++ b/src/hooks/surface/useSurfaceShapeBatch.js @@ -113,9 +113,9 @@ export function useSurfaceShapeBatch({ isHidden, setIsHidden }) { let imageRotate = 0 if (xInversion && !yInversion) { if (rotate % 180 === 0 || rotate < 0) { - imageRotate = Math.abs(rotate % 360) + imageRotate = Math.abs((rotate - 180) % 360) } else { - imageRotate = Math.abs((rotate - 180) % 4) + imageRotate = Math.abs((rotate + 180) % 4) } } else if (xInversion && yInversion) { imageRotate = Math.abs((rotate + 360) % 360) @@ -126,9 +126,9 @@ export function useSurfaceShapeBatch({ isHidden, setIsHidden }) { imageRotate = Math.abs(rotate % 360) } else { if (rotate < 0) { - imageRotate = Math.abs((rotate + 180) % 360) - } else { imageRotate = Math.abs((rotate - 180) % 360) + } else { + imageRotate = Math.abs((rotate + 180) % 360) } } } else { From 4507e6f9de0447ea02ec67654b6e7c2d08e0bfbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=8B=9D?= <43837214+Minsiki@users.noreply.github.com> Date: Wed, 19 Feb 2025 17:06:04 +0900 Subject: [PATCH 3/3] =?UTF-8?q?-=20=EA=B2=BD=EC=82=AC=20type=20number=20?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx | 2 +- .../circuitTrestle/step/type/PassivityCircuitAllocation.jsx | 2 +- src/hooks/useCirCuitTrestle.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx b/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx index d8fa01e5..239487e9 100644 --- a/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx +++ b/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx @@ -322,7 +322,7 @@ export default function StepUp(props) { moduleList: formatModuleList(rsf.moduleList), roofSurface: rsf.roofSurface ? rsf.roofSurface : '', roofSurfaceId: rsf.roofSurfaceId ? rsf.roofSurfaceId : '', - roofSurfaceIncl: rsf.roofSurfaceIncl ? rsf.roofSurfaceIncl : '', + roofSurfaceIncl: rsf.roofSurfaceIncl ? +rsf.roofSurfaceIncl : '', })) } // PCS MatModule 포맷 diff --git a/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx b/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx index ee118601..36fdad35 100644 --- a/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx +++ b/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx @@ -175,7 +175,7 @@ export default function PassivityCircuitAllocation(props) { return { roofSurfaceId: surface.id, roofSurface: surface.direction, - roofSurfaceIncl: canvas.getObjects().filter((obj) => obj.id === surface.parentId)[0].pitch, + roofSurfaceIncl: +canvas.getObjects().filter((obj) => obj.id === surface.parentId)[0].pitch, moduleList: surface.modules.map((module) => { return { itemId: module.moduleInfo.itemId, diff --git a/src/hooks/useCirCuitTrestle.js b/src/hooks/useCirCuitTrestle.js index 0d811dfd..aacc7e5d 100644 --- a/src/hooks/useCirCuitTrestle.js +++ b/src/hooks/useCirCuitTrestle.js @@ -83,7 +83,7 @@ export function useCircuitTrestle() { .getObjects() .filter((o) => o.id === obj.parentId)[0] .directionText.replace(/[0-9]/g, ''), - roofSurfaceIncl: canvas.getObjects().filter((o) => o.id === obj.parentId)[0].roofMaterial.pitch, + roofSurfaceIncl: +canvas.getObjects().filter((o) => o.id === obj.parentId)[0].roofMaterial.pitch, moduleList: getModuleList(obj).map((module) => { return { itemId: module.moduleInfo.itemId,