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

Reviewed-on: #19

src/components/estimate/Estimate.jsx

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

src/components/floor-plan/modal/basic/step/Trestle.jsx

@@ -239,6 +239,7 @@ const Trestle = forwardRef((props, ref) => {
       if (i === selectedRoof.index) {
         return {
           ...selectedRoof,
+          hajebichi,
           eavesMargin,
           ridgeMargin,
           kerabaMargin,
@@ -268,8 +269,6 @@ const Trestle = forwardRef((props, ref) => {
   }
 
   const isComplete = async () => {
-    console.log('roofs', roofs)
-
     const newAddedRoofs = roofs.map((roof, i) => {
       if (i === selectedRoof?.index) {
         return {
@@ -292,6 +291,8 @@ const Trestle = forwardRef((props, ref) => {
             snowGdPossYn,
             cvrChecked,
             snowGdChecked,
+            setupCover: cvrChecked,
+            setupSnowCover: snowGdChecked,
           },
           trestleDetail: trestleDetail,
         }
@@ -300,7 +301,6 @@ const Trestle = forwardRef((props, ref) => {
     })
 
     let result = true
-    console.log('newAddedRoofs', newAddedRoofs)
     newAddedRoofs.forEach((roof) => {
       if (!roof?.eavesMargin || !roof?.ridgeMargin || !roof?.kerabaMargin) result = false
       if (!roof.trestle?.trestleMkrCd) result = false
@@ -367,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,
@@ -461,7 +461,7 @@ const Trestle = forwardRef((props, ref) => {
                             type="text"
                             className="input-origin block"
                             disabled={selectedRoof.roofPchAuth === 'R'}
-                            onChange={(e) => handleHajebichiAndLength(e, 'hajebichi')}
+                            onChange={(e) => setHajebichi(e.target.value)}
                             value={hajebichi}
                           />
                         </div>

src/hooks/module/useModuleTrestle.js

@@ -23,6 +23,7 @@ const trestleReducer = (state, action) => {
       return {
         moduleTpCd: action.roof.module?.itemTp ?? '',
         roofMatlCd: action.roof?.roofMatlCd ?? '',
+        hajebichi: action.roof?.hajebichi ?? 0,
         raftBaseCd: action.roof?.raftBaseCd ?? null,
         trestleMkrCd: action.roof.trestle?.trestleMkrCd ?? null,
         constMthdCd: action.roof.trestle?.constMthdCd ?? null,
@@ -80,7 +81,7 @@ export function useModuleTrestle(props) {
     // setRidgeMargin(selectedRoof?.addRoof?.ridgeMargin ?? 0)
     // setKerabaMargin(selectedRoof?.addRoof?.kerabaMargin ?? 0)
 
-    setHajebichi(selectedRoof?.trestle?.hajebichi ?? 0)
+    setHajebichi(selectedRoof?.hajebichi ?? 0)
     setEavesMargin(selectedRoof?.eavesMargin ?? 0)
     setRidgeMargin(selectedRoof?.ridgeMargin ?? 0)
     setKerabaMargin(selectedRoof?.kerabaMargin ?? 0)

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/roofcover/useRoofAllocationSetting.js

@@ -28,6 +28,7 @@ import { useCanvasPopupStatusController } from '@/hooks/common/useCanvasPopupSta
 import { outerLinePointsState } from '@/store/outerLineAtom'
 import { QcastContext } from '@/app/QcastProvider'
 import { usePlan } from '@/hooks/usePlan'
+import { roofsState } from '@/store/roofAtom'
 
 export function useRoofAllocationSetting(id) {
   const canvas = useRecoilValue(canvasState)
@@ -54,7 +55,7 @@ export function useRoofAllocationSetting(id) {
   const { setIsGlobalLoading } = useContext(QcastContext)
   const { setSurfaceShapePattern } = useRoofFn()
   const { saveCanvas } = usePlan()
-
+  const [roofsStore, setRoofsStore] = useRecoilState(roofsState)
   const [moduleSelectionData, setModuleSelectionData] = useRecoilState(moduleSelectionDataState)
   const resetPoints = useResetRecoilState(outerLinePointsState)
 
@@ -265,6 +266,8 @@ export function useRoofAllocationSetting(id) {
       newRoofList[0].selected = true
     }
     setCurrentRoofList(newRoofList)
+    setRoofsStore(newRoofList)
+    setModuleSelectionData({ ...moduleSelectionData, roofConstructions: newRoofList })
   }
 
   /**
@@ -305,12 +308,14 @@ export function useRoofAllocationSetting(id) {
 
     setRoofList(newRoofList)
     setRoofMaterials(newRoofList)
+    setRoofsStore(newRoofList)
     const selectedRoofMaterial = newRoofList.find((roof) => roof.selected)
     setSurfaceShapePattern(currentObject, roofDisplay.column, false, selectedRoofMaterial, true)
     drawDirectionArrow(currentObject)
     modifyModuleSelectionData()
     closeAll()
     basicSettingSave()
+    setModuleSelectionData({ ...moduleSelectionData, roofConstructions: newRoofList })
   }
 
   /**
@@ -419,7 +424,7 @@ export function useRoofAllocationSetting(id) {
     })
 
     setRoofMaterials(newRoofList)
-
+    setRoofsStore(newRoofList)
     /** 외곽선 삭제 */
     const removeTargets = canvas.getObjects().filter((obj) => obj.name === 'outerLinePoint' || obj.name === 'outerLine')
     removeTargets.forEach((obj) => {

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()