From 82210a99c9264d37dd3bfd28267c5db079597686 Mon Sep 17 00:00:00 2001 From: basssy Date: Thu, 10 Apr 2025 10:45:36 +0900 Subject: [PATCH 1/5] =?UTF-8?q?=EA=B2=AC=EC=A0=81=EC=84=9C=20=EC=98=A4?= =?UTF-8?q?=ED=94=88=ED=94=8C=EB=9E=98=EA=B7=B8=20=ED=85=8D=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/estimate/Estimate.jsx | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/components/estimate/Estimate.jsx b/src/components/estimate/Estimate.jsx index 64b0ffbb..e2c6c088 100644 --- a/src/components/estimate/Estimate.jsx +++ b/src/components/estimate/Estimate.jsx @@ -2057,15 +2057,17 @@ export default function Estimate({}) { - {convertNumberToPriceDecimal( - item?.showSaleTotPrice === '0' - ? null - : item?.amount === '' - ? null - : item?.saleTotPrice === '0' + {item?.openFlg === '1' + ? 'OPEN' + : convertNumberToPriceDecimal( + item?.showSaleTotPrice === '0' ? null - : item?.saleTotPrice?.replaceAll(',', ''), - )} + : item?.amount === '' + ? null + : item?.saleTotPrice === '0' + ? null + : item?.saleTotPrice?.replaceAll(',', ''), + )} ) From 990de88cafeeb426652b9bfa681188d03ca94ef5 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: Thu, 10 Apr 2025 10:51:59 +0900 Subject: [PATCH 2/5] =?UTF-8?q?=ED=82=A4=20=EA=B0=92=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/floor-plan/modal/basic/step/Trestle.jsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/components/floor-plan/modal/basic/step/Trestle.jsx b/src/components/floor-plan/modal/basic/step/Trestle.jsx index c8ece93c..82bd3de7 100644 --- a/src/components/floor-plan/modal/basic/step/Trestle.jsx +++ b/src/components/floor-plan/modal/basic/step/Trestle.jsx @@ -292,6 +292,8 @@ const Trestle = forwardRef((props, ref) => { snowGdPossYn, cvrChecked, snowGdChecked, + setupCover: cvrChecked, + setupSnowCover: snowGdChecked, }, trestleDetail: trestleDetail, } From 089ffed7afcdc1169851e1d94929e9e84f45ed20 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: Thu, 10 Apr 2025 10:54:21 +0900 Subject: [PATCH 3/5] =?UTF-8?q?=ED=82=A4=20=EB=AA=85=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/floor-plan/modal/basic/step/Trestle.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/floor-plan/modal/basic/step/Trestle.jsx b/src/components/floor-plan/modal/basic/step/Trestle.jsx index 82bd3de7..ccfdf063 100644 --- a/src/components/floor-plan/modal/basic/step/Trestle.jsx +++ b/src/components/floor-plan/modal/basic/step/Trestle.jsx @@ -369,8 +369,8 @@ const Trestle = forwardRef((props, ref) => { // ...constructionList.find((construction) => newAddedRoofs[index].construction.constTp === construction.constTp), ...roof.construction, roofIndex: roof.index, - setupCover: roof.cvrYn === 'Y', - setupSnowCover: roof.snowGdYn === 'Y', + setupCover: cvrChecked, + setupSnowCover: snowGdChecked, selectedIndex: roof.index, }, trestleDetail: roof.trestleDetail, From e67fc749f46895a36f5ee5b428c053d337d6974f Mon Sep 17 00:00:00 2001 From: yjnoh Date: Thu, 10 Apr 2025 10:55:00 +0900 Subject: [PATCH 4/5] =?UTF-8?q?=EB=A7=88=EC=9A=B0=EC=8A=A4=20=ED=9C=A0=20?= =?UTF-8?q?=EC=A4=8C=20=EC=9D=B4=EB=B2=A4=ED=8A=B8=20=EB=B3=B4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hooks/useEvent.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/hooks/useEvent.js b/src/hooks/useEvent.js index 8361ff7e..593fd76f 100644 --- a/src/hooks/useEvent.js +++ b/src/hooks/useEvent.js @@ -77,10 +77,10 @@ export function useEvent() { setCanvasZoom(Number((zoom * 100).toFixed(0))) // 마우스 위치 기준으로 확대/축소 - canvas.zoomToPoint({ x: opt.e.offsetX, y: opt.e.offsetY }, zoom) - - canvas.requestRenderAll() + canvas.zoomToPoint(new fabric.Point(opt.e.offsetX, opt.e.offsetY), zoom) canvas.calcOffset() + canvas.setViewportTransform(canvas.viewportTransform) + canvas.requestRenderAll() // 이벤트의 기본 동작 방지 (스크롤 방지) opt.e.preventDefault() From 070e9d933fe746a7b4c5f29ab9b697cc4b4e9b6e Mon Sep 17 00:00:00 2001 From: "hyojun.choi" Date: Thu, 10 Apr 2025 11:36:44 +0900 Subject: [PATCH 5/5] =?UTF-8?q?api=20=EC=98=A4=EB=A5=98=20=EC=8B=9C=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC=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/useTrestle.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/hooks/module/useTrestle.js b/src/hooks/module/useTrestle.js index 835609af..7048e64e 100644 --- a/src/hooks/module/useTrestle.js +++ b/src/hooks/module/useTrestle.js @@ -717,6 +717,9 @@ export const useTrestle = () => { if (result.resultCode === 'E') { swalFire({ text: result.resultMsg, icon: 'error' }) + clear() + setViewCircuitNumberTexts(true) + setIsGlobalLoading(false) return }