Merge branch 'feature/yj-layoutSetup' of https://git.hanasys.jp/qcast3/qcast-front into qcast-pub

src/components/estimate/Estimate.jsx

@@ -2057,15 +2057,17 @@ export default function Estimate({}) {
                               </div>
                             </td>
                             <td className="al-r">
-                              {convertNumberToPriceDecimal(
+                              {item?.openFlg === '1'
-                                item?.showSaleTotPrice === '0'
+                                ? 'OPEN'
-                                  ? null
+                                : convertNumberToPriceDecimal(
-                                  : item?.amount === ''
+                                    item?.showSaleTotPrice === '0'
-                                    ? null
-                                    : item?.saleTotPrice === '0'
                                       ? null
-                                      : item?.saleTotPrice?.replaceAll(',', ''),
+                                      : item?.amount === ''
-                              )}
+                                        ? null
+                                        : item?.saleTotPrice === '0'
+                                          ? null
+                                          : item?.saleTotPrice?.replaceAll(',', ''),
+                                  )}
                             </td>
                           </tr>
                         )

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',
+              setupCover: cvrChecked,
-              setupSnowCover: roof.snowGdYn === 'Y',
+              setupSnowCover: snowGdChecked,
               selectedIndex: roof.index,
             },
             trestleDetail: roof.trestleDetail,

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
     }
 

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.zoomToPoint(new fabric.Point(opt.e.offsetX, opt.e.offsetY), zoom)
-
-    canvas.requestRenderAll()
     canvas.calcOffset()
+    canvas.setViewportTransform(canvas.viewportTransform)
+    canvas.requestRenderAll()
 
     // 이벤트의 기본 동작 방지 (스크롤 방지)
     opt.e.preventDefault()