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(',', ''),
+ )}
|
)
diff --git a/src/components/floor-plan/modal/basic/step/Trestle.jsx b/src/components/floor-plan/modal/basic/step/Trestle.jsx
index ce0d093e..9fd2a7aa 100644
--- a/src/components/floor-plan/modal/basic/step/Trestle.jsx
+++ b/src/components/floor-plan/modal/basic/step/Trestle.jsx
@@ -291,6 +291,8 @@ const Trestle = forwardRef((props, ref) => {
snowGdPossYn,
cvrChecked,
snowGdChecked,
+ setupCover: cvrChecked,
+ setupSnowCover: snowGdChecked,
},
trestleDetail: trestleDetail,
}
@@ -365,8 +367,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,
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
}
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()