From 178d53ef14e306e05f6ba1237c4489286193a9e3 Mon Sep 17 00:00:00 2001 From: "hyojun.choi" Date: Fri, 4 Jul 2025 10:07:01 +0900 Subject: [PATCH] =?UTF-8?q?1172=20:=20=E3=80=90HANASYS=20DESIGN=E3=80=91?= =?UTF-8?q?=E5=BD=B1=E3=82=92=E9=85=8D=E7=BD=AE=E3=81=97=E3=81=9F=E6=99=82?= =?UTF-8?q?=E3=81=AE=E3=83=A2=E3=82=B8=E3=83=A5=E3=83=BC=E3=83=AB=20?= =?UTF-8?q?=EA=B7=B8=EB=A6=BC=EC=9E=90=20=EB=B0=B0=EC=B9=98=20=EC=9C=84?= =?UTF-8?q?=EB=A1=9C=20=EB=AA=A8=EB=93=88=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hooks/module/useModuleBasicSetting.js | 34 ++++++++++++----------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/src/hooks/module/useModuleBasicSetting.js b/src/hooks/module/useModuleBasicSetting.js index 1546c2e0..f4f8901b 100644 --- a/src/hooks/module/useModuleBasicSetting.js +++ b/src/hooks/module/useModuleBasicSetting.js @@ -520,6 +520,7 @@ export function useModuleBasicSetting(tabNum) { lockScalingX: true, // X 축 크기 조정 잠금 lockScalingY: true, // Y 축 크기 조정 잠금 name: POLYGON_TYPE.MODULE, + opacity: 0.85, } if (moduleSetupSurfaces.length !== 0) { @@ -895,6 +896,7 @@ export function useModuleBasicSetting(tabNum) { }) canvas?.add(manualModule) + canvas.bringToFront(manualModule) manualDrawModules.push(manualModule) setModuleStatisticsData() @@ -993,6 +995,7 @@ export function useModuleBasicSetting(tabNum) { lockScalingX: true, // X 축 크기 조정 잠금 lockScalingY: true, // Y 축 크기 조정 잠금 name: POLYGON_TYPE.MODULE, + opacity: 0.85, } const objectsIncludeSurface = (turfModuleSetupSurface) => { @@ -1453,6 +1456,7 @@ export function useModuleBasicSetting(tabNum) { //오브젝트와 겹치지 않으면 넣는다 if (isDisjoint) { canvas?.add(manualModule) + canvas.bringToFront(manualModule) canvas?.renderAll() manualDrawModules.push(manualModule) setModuleStatisticsData() @@ -1877,6 +1881,8 @@ export function useModuleBasicSetting(tabNum) { lockScalingX: true, // X 축 크기 조정 잠금 lockScalingY: true, // Y 축 크기 조정 잠금 name: POLYGON_TYPE.MODULE, + //투명도 추가 + opacity: 0.85, } //선택된 지붕안에 오브젝트(도머, 개구등)이 있는지 확인하는 로직 포함되면 배열 반환 @@ -1895,6 +1901,14 @@ export function useModuleBasicSetting(tabNum) { return containsBatchObjects } + const addModule = (tempModule, moduleSetupArray, moduleArray) => { + canvas?.add(tempModule) + canvas.bringToFront(tempModule) + moduleSetupArray.push(tempModule) + moduleArray.push(tempModule) + canvas.renderAll() + } + /** * 배치면 안에 있는지 확인 * @param {*} squarePolygon @@ -2170,10 +2184,7 @@ export function useModuleBasicSetting(tabNum) { if (disjointFromTrestle && isDisjoint) { //최초 한번은 그냥 그린다 //겹치는지 확인해서 포함된 모듈만 그린다 - canvas?.add(tempModule) - moduleSetupArray.push(tempModule) - moduleArray.push(tempModule) - canvas.renderAll() + addModule(tempModule, moduleSetupArray, moduleArray) // ++installedModuleHeightCount @@ -2349,10 +2360,7 @@ export function useModuleBasicSetting(tabNum) { let isDisjoint = checkModuleDisjointObjects(squarePolygon, containsBatchObjects) if (disjointFromTrestle && isDisjoint) { - canvas?.add(tempModule) - moduleSetupArray.push(tempModule) - moduleArray.push(tempModule) - canvas.renderAll() + addModule(tempModule, moduleSetupArray, moduleArray) isInstall = true @@ -2534,10 +2542,7 @@ export function useModuleBasicSetting(tabNum) { if (disjointFromTrestle && isDisjoint) { //최초 한번은 그냥 그린다 //겹치는지 확인해서 포함된 모듈만 그린다 - canvas?.add(tempModule) - moduleSetupArray.push(tempModule) - moduleArray.push(tempModule) - canvas.renderAll() + addModule(tempModule, moduleSetupArray, moduleArray) // ++installedModuleHeightCount @@ -2721,10 +2726,7 @@ export function useModuleBasicSetting(tabNum) { if (disjointFromTrestle && isDisjoint) { //최초 한번은 그냥 그린다 //겹치는지 확인해서 포함된 모듈만 그린다 - canvas?.add(tempModule) - moduleSetupArray.push(tempModule) - moduleArray.push(tempModule) - canvas.renderAll() + addModule(tempModule, moduleSetupArray, moduleArray) isInstall = true //마지막에 설치된 모듈의 Y 좌표