From 4a697fc152d42ee92c45d881b068954d25027c72 Mon Sep 17 00:00:00 2001 From: "hyojun.choi" Date: Sat, 8 Feb 2025 20:46:37 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B0=80=EB=8C=80=EC=97=86=EC=9D=8C=20,=20?= =?UTF-8?q?=EB=9E=99=EB=A6=AC=EC=8A=A4=20=EB=82=98=EB=88=A0=EC=84=9C=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../circuitTrestle/CircuitTrestleSetting.jsx | 1 - src/hooks/module/useTrestle.js | 26 +++++++++++-------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx index 84608186..24cb387b 100644 --- a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx +++ b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx @@ -234,7 +234,6 @@ export default function CircuitTrestleSetting({ id }) { ...getOptYn(), useModuleItemList: getUseModuleItemList(), roofSurfaceList: getRoofSurfaceList().map((surface) => { - console.log(surface.moduleList) return { ...surface, moduleList: surface.moduleList.map((module) => { diff --git a/src/hooks/module/useTrestle.js b/src/hooks/module/useTrestle.js index c4e456a9..20e8b4ac 100644 --- a/src/hooks/module/useTrestle.js +++ b/src/hooks/module/useTrestle.js @@ -54,16 +54,20 @@ export const useTrestle = () => { let isSnowGuard = construction.setupSnowCover const direction = parent.direction const rack = surface.trestleDetail.rack - let { rackQty, rackIntvlPct, rackYn, cvrPlvrYn } = surface.trestleDetail + let { rackQty, rackIntvlPct, rackYn, cvrPlvrYn, lessSupFitIntvlPct, lessSupFitQty } = surface.trestleDetail - if (!rack) { + if (!rack && lessSupFitIntvlPct === 0 && lessSupFitQty === 0) { //25/02/06 가대없음의 경우 랙정보가 없음 return } - const rackInfos = Object.keys(rack).map((key) => { - return { key, value: rack[key] } - }) + let rackInfos = [] + + if (rack) { + rackInfos = Object.keys(rack).map((key) => { + return { key, value: rack[key] } + }) + } const result = calculateForApi(surface) @@ -1318,9 +1322,9 @@ export const useTrestle = () => { //랙 없음 인 경우 지지금구 설치 const installBracketWithOutRack = (surface, exposedBottomModules, leftExposedHalfBottomModules, rightExposedHalfBottomPoints, isChidory) => { let { rackQty, rackIntvlPct, moduleIntvlHor, moduleIntvlVer, lessSupFitQty, lessSupFitIntvlPct } = surface.trestleDetail + rackQty = lessSupFitQty + rackIntvlPct = lessSupFitIntvlPct const direction = surface.direction - rackQty = 3 - rackIntvlPct = 10 canvas.renderAll() exposedBottomModules.forEach((module) => { @@ -1472,13 +1476,13 @@ export const useTrestle = () => { canvas.add(bracket) canvas.renderAll() if (direction === 'south') { - startPointY -= height + moduleIntvlVer + startPointY -= height } else if (direction === 'north') { - startPointY += height + moduleIntvlVer + startPointY += height } else if (direction === 'east') { - startPointX -= width + moduleIntvlHor + startPointX -= width } else if (direction === 'west') { - startPointX += width + moduleIntvlHor + startPointX += width } } }