diff --git a/src/hooks/module/useModuleBasicSetting.js b/src/hooks/module/useModuleBasicSetting.js index 111aa7e9..1053f8a7 100644 --- a/src/hooks/module/useModuleBasicSetting.js +++ b/src/hooks/module/useModuleBasicSetting.js @@ -841,6 +841,8 @@ export function useModuleBasicSetting(tabNum) { const flowLines = getFlowLines(moduleSetupSurface, height) //육지붕이 아닐때만 넣는다 육지붕일땐 클릭 이벤트에 별도로 넣어놓음 + // let startPoint = flowLines.bottom + let startPoint = flowLines.bottom const moduleArray = [] @@ -860,6 +862,11 @@ export function useModuleBasicSetting(tabNum) { } } } else { + //밑에가 평면이면 좌측으로 붙여서 배치 + if (flowLines.bottom.type === 'flat') { + startPoint = flowLines.left + } + const maxLeftEndPoint = surfaceMaxLines.left.x1 //최 좌측 const maxRightEndPoint = surfaceMaxLines.right.x1 //최 우측 const maxTopEndPoint = surfaceMaxLines.top.y1 //최 상단 @@ -919,8 +926,8 @@ export function useModuleBasicSetting(tabNum) { } } else { //디버깅용 - tempModule.set({ fill: 'rgba(255,190,41, 0.4)', stroke: 'black', strokeWidth: 1 }) - canvas?.add(tempModule) + // tempModule.set({ fill: 'rgba(255,190,41, 0.4)', stroke: 'black', strokeWidth: 1 }) + // canvas?.add(tempModule) } } } @@ -965,8 +972,8 @@ export function useModuleBasicSetting(tabNum) { } } - const maxRightEndPoint = surfaceMaxLines.right.x1 //최 우측 - const maxTopEndPoint = surfaceMaxLines.top.y1 //최 상단 + const maxRightEndPoint = surfaceMaxLines.right.x1 - 100 //최 우측 + const maxTopEndPoint = surfaceMaxLines.top.y1 - 50 //최 상단 const maxBottomEndPoint = surfaceMaxLines.bottom.y1 //최하단 let totalTopEndPoint = Math.abs(maxTopEndPoint - startPoint.y1) //전체 높이에서 현재 높이를 뺌 @@ -1013,6 +1020,7 @@ export function useModuleBasicSetting(tabNum) { canvas?.add(tempModule) moduleSetupArray.push(tempModule) moduleArray.push(tempModule) + canvas.renderAll() } }) } else { @@ -1021,11 +1029,13 @@ export function useModuleBasicSetting(tabNum) { canvas?.add(tempModule) moduleSetupArray.push(tempModule) moduleArray.push(tempModule) + canvas.renderAll() } } else { //디버깅용 - tempModule.set({ fill: 'rgba(255,190,41, 0.4)', stroke: 'black', strokeWidth: 1 }) - canvas?.add(tempModule) + // tempModule.set({ fill: 'rgba(255,190,41, 0.4)', stroke: 'black', strokeWidth: 1 }) + // canvas?.add(tempModule) + // canvas.renderAll() } } } @@ -1134,9 +1144,9 @@ export function useModuleBasicSetting(tabNum) { } else { //최초 한번은 그냥 그린다 //겹치는지 확인해서 포함된 모듈만 그린다 - canvas?.add(tempModule) - moduleSetupArray.push(tempModule) - moduleArray.push(tempModule) + // canvas?.add(tempModule) + // moduleSetupArray.push(tempModule) + // moduleArray.push(tempModule) } } else { //디버깅용 @@ -1243,8 +1253,8 @@ export function useModuleBasicSetting(tabNum) { } } else { //디버깅용 - tempModule.set({ fill: 'rgba(255,190,41, 0.4)', stroke: 'black', strokeWidth: 1 }) - canvas?.add(tempModule) + // tempModule.set({ fill: 'rgba(255,190,41, 0.4)', stroke: 'black', strokeWidth: 1 }) + // canvas?.add(tempModule) } } }