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

@@ -124,6 +124,7 @@ const Trestle = forwardRef((props, ref) => {
 
   useEffect(() => {
     if (constructionList.length > 0) {
+      console.log(constructionList)
       setSelectedConstruction(constructionList.find((construction) => construction.constTp === trestleState?.construction?.constTp) ?? null)
     } else {
       setSelectedConstruction(null)
@@ -143,19 +144,6 @@ const Trestle = forwardRef((props, ref) => {
     return 'no-click'
   }
 
-  const onChangeLength = (e) => {
-    setLengthBase(e)
-    dispatch({
-      type: 'SET_LENGTH',
-      roof: {
-        length: e,
-        moduleTpCd: selectedModules.itemTp ?? '',
-        roofMatlCd: selectedRoof?.roofMatlCd ?? '',
-        raftBaseCd: selectedRaftBase?.clCode,
-      },
-    })
-  }
-
   const onChangeRaftBase = (e) => {
     setSelectedRaftBase(e)
     dispatch({
@@ -237,8 +225,7 @@ const Trestle = forwardRef((props, ref) => {
           snowGdPossYn: constructionList[index].snowGdPossYn,
           cvrYn: constructionList[index].cvrYn,
           mixMatlNo: selectedModules.mixMatlNo,
-          // workingWidth: selectedRoof?.length?.toString() ?? '',
-          workingWidth: lengthBase,
+          workingWidth: selectedRoof?.length?.toString() ?? '',
         },
       })
 
@@ -255,7 +242,7 @@ const Trestle = forwardRef((props, ref) => {
         return {
           ...selectedRoof,
           hajebichi,
-          length: lengthBase,
+          lenBase: lengthBase,
           eavesMargin,
           ridgeMargin,
           kerabaMargin,
@@ -531,7 +518,7 @@ const Trestle = forwardRef((props, ref) => {
                             type="text"
                             className="input-origin block"
                             value={lengthBase}
-                            onChange={(e) => onChangeLength(e.target.value)}
+                            onChange={(e) => setLengthBase(e.target.value)}
                             disabled={selectedRoof.lenAuth === 'R'}
                           />
                         </div>

src/hooks/module/useModuleTrestle.js

@@ -10,7 +10,6 @@ const RAFT_BASE_CODE = '203800'
 
 const trestleReducer = (state, action) => {
   switch (action.type) {
-    case 'SET_LENGTH':
     case 'SET_RAFT_BASE':
     case 'SET_TRESTLE_MAKER':
     case 'SET_CONST_MTHD':
@@ -97,15 +96,11 @@ export function useModuleTrestle(props) {
   useEffect(() => {
     if (trestleState) {
       handleSetTrestleList()
-
       if (!trestleState?.trestleMkrCd) {
         setConstMthdList([])
         setRoofBaseList([])
         setConstructionList([])
         setTrestleDetail(null)
-        setEavesMargin(0)
-        setRidgeMargin(0)
-        setKerabaMargin(0)
         return
       }
 
@@ -114,9 +109,6 @@ export function useModuleTrestle(props) {
         setRoofBaseList([])
         setConstructionList([])
         setTrestleDetail(null)
-        setEavesMargin(0)
-        setRidgeMargin(0)
-        setKerabaMargin(0)
         return
       }
 
@@ -124,18 +116,12 @@ export function useModuleTrestle(props) {
       if (!trestleState?.roofBaseCd) {
         setConstructionList([])
         setTrestleDetail(null)
-        setEavesMargin(0)
-        setRidgeMargin(0)
-        setKerabaMargin(0)
         return
       }
 
       handleSetConstructionList()
       if (!trestleState?.constTp) {
         setTrestleDetail(null)
-        setEavesMargin(0)
-        setRidgeMargin(0)
-        setKerabaMargin(0)
         return
       }
 
@@ -238,8 +224,7 @@ export function useModuleTrestle(props) {
         constTp: trestleState.constTp ?? '',
         mixMatlNo: trestleState.mixMatlNo ?? '',
         roofPitch: trestleState.roofPitch ?? '',
-        // workingWidth: trestleState.length ?? '',
-        workingWidth: lengthBase ?? '',
+        workingWidth: trestleState.workingWidth ?? '',
       },
     ])
       .then((res) => {

src/hooks/surface/usePlacementShapeDrawing.js

@@ -14,7 +14,7 @@ import { useMouse } from '@/hooks/useMouse'
 import { useLine } from '@/hooks/useLine'
 import { useTempGrid } from '@/hooks/useTempGrid'
 import { useEffect, useRef } from 'react'
-import { calculateIntersection, distanceBetweenPoints, findClosestPoint } from '@/util/canvas-util'
+import { distanceBetweenPoints } from '@/util/canvas-util'
 import { fabric } from 'fabric'
 import { calculateAngle } from '@/util/qpolygon-utils'
 import {
@@ -37,13 +37,12 @@ import { useSurfaceShapeBatch } from './useSurfaceShapeBatch'
 import { roofDisplaySelector } from '@/store/settingAtom'
 import { useRoofFn } from '@/hooks/common/useRoofFn'
 import PlacementSurfaceLineProperty from '@/components/floor-plan/modal/placementShape/PlacementSurfaceLineProperty'
-import { useAdsorptionPoint } from '@/hooks/useAdsorptionPoint'
 
 // 배치면 그리기
 export function usePlacementShapeDrawing(id) {
   const canvas = useRecoilValue(canvasState)
   const roofDisplay = useRecoilValue(roofDisplaySelector)
-  const { addCanvasMouseEventListener, addDocumentEventListener, removeAllMouseEventListeners, removeAllDocumentEventListeners, removeMouseLine } =
+  const { addCanvasMouseEventListener, addDocumentEventListener, removeAllMouseEventListeners, removeAllDocumentEventListeners, removeMouseEvent } =
     useEvent()
   // const { addCanvasMouseEventListener, addDocumentEventListener, removeAllMouseEventListeners, removeAllDocumentEventListeners, removeMouseEvent } =
   //   useContext(EventContext)
@@ -119,7 +118,6 @@ export function usePlacementShapeDrawing(id) {
   }, [type])
 
   const clear = () => {
-    addCanvasMouseEventListener('mouse:move', mouseMove)
     setLength1(0)
     setLength2(0)
 
@@ -175,80 +173,6 @@ export function usePlacementShapeDrawing(id) {
     }
   }
 
-/*
-mouseMove
- */
-  const roofs = canvas?.getObjects().filter((obj) => obj.name === POLYGON_TYPE.ROOF)
-  const roofAdsorptionPoints = useRef([])
-  const intersectionPoints = useRef([])
-  const { getAdsorptionPoints } = useAdsorptionPoint()
-
-  const mouseMove = (e) => {
-    removeMouseLine();
-    const pointer = canvas.getPointer(e.e)
-    const roofsPoints = roofs.map((roof) => roof.points).flat()
-    roofAdsorptionPoints.current = [...roofsPoints]
-
-    const auxiliaryLines = canvas.getObjects().filter((obj) => obj.name === 'auxiliaryLine' && !obj.isFixed)
-    const otherAdsorptionPoints = []
-
-    auxiliaryLines.forEach((line1) => {
-      auxiliaryLines.forEach((line2) => {
-        if (line1 === line2) {
-          return
-        }
-
-        const intersectionPoint = calculateIntersection(line1, line2)
-        if (!intersectionPoint || intersectionPoints.current.some((point) => point.x === intersectionPoint.x && point.y === intersectionPoint.y)) {
-          return
-        }
-        otherAdsorptionPoints.push(intersectionPoint)
-      })
-    })
-
-    let innerLinePoints = []
-    canvas
-      .getObjects()
-      .filter((obj) => obj.innerLines)
-      .forEach((polygon) => {
-        polygon.innerLines.forEach((line) => {
-          innerLinePoints.push({ x: line.x1, y: line.y1 })
-          innerLinePoints.push({ x: line.x2, y: line.y2 })
-        })
-      })
-
-    const adsorptionPoints = [
-      ...getAdsorptionPoints(),
-      ...roofAdsorptionPoints.current,
-      ...otherAdsorptionPoints,
-      ...intersectionPoints.current,
-      ...innerLinePoints,
-    ]
-
-    let arrivalPoint = { x: pointer.x, y: pointer.y }
-    let adsorptionPoint = findClosestPoint(pointer, adsorptionPoints)
-
-    if (adsorptionPoint && distanceBetweenPoints(pointer, adsorptionPoint) <= adsorptionRange) {
-      arrivalPoint = { ...adsorptionPoint }
-    }
-    const horizontalLine = new fabric.Line([-1 * canvas.width, arrivalPoint.y, 2 * canvas.width, arrivalPoint.y], {
-      stroke: 'red',
-      strokeWidth: 1,
-      selectable: false,
-      name: 'mouseLine',
-    })
-
-    const verticalLine = new fabric.Line([arrivalPoint.x, -1 * canvas.height, arrivalPoint.x, 2 * canvas.height], {
-      stroke: 'red',
-      strokeWidth: 1,
-      selectable: false,
-      name: 'mouseLine',
-    })
-    canvas?.add(horizontalLine, verticalLine)
-    canvas?.renderAll()
-
-  }
-
   useEffect(() => {
     canvas
       ?.getObjects()

src/hooks/useCanvasEvent.js

@@ -206,7 +206,6 @@ export function useCanvasEvent() {
         selected.forEach((obj) => {
           if (obj.type === 'QPolygon' && currentMenu !== MENU.MODULE_CIRCUIT_SETTING.BASIC_SETTING) {
             obj.set({ stroke: 'red' })
-            obj.bringToFront()
           }
         })
         canvas.renderAll()
@@ -244,7 +243,6 @@ export function useCanvasEvent() {
         selected.forEach((obj) => {
           if (obj.type === 'QPolygon' && currentMenu !== MENU.MODULE_CIRCUIT_SETTING.BASIC_SETTING) {
             obj.set({ stroke: 'red' })
-            obj.bringToFront()
           }
         })
       }