Merge branch 'feature/sketon_cha' of https://git.hanasys.jp/qcast3/qcast-front into feature/ysCha

# Conflicts:
#	src/util/skeleton-utils.js

src/components/fabric/QPolygon.js

@@ -6,6 +6,8 @@ import { calculateAngle, drawRidgeRoof, drawShedRoof, toGeoJSON } from '@/util/q
 import * as turf from '@turf/turf'
 import { LINE_TYPE, POLYGON_TYPE } from '@/common/common'
 import Big from 'big.js'
+import { drawSkeletonRidgeRoof, drawSkeletonWithTransformedEdges } from '@/util/skeleton-utils'
+import { logger } from '@/util/logger'
 
 export const QPolygon = fabric.util.createClass(fabric.Polygon, {
   type: 'QPolygon',
@@ -242,6 +244,12 @@ export const QPolygon = fabric.util.createClass(fabric.Polygon, {
    * @param settingModalFirstOptions
    */
   drawHelpLine(settingModalFirstOptions) {
+    // canvas에 skeleton 상태 저장 객체 초기화
+    if (!this.canvas.skeletonStates) {
+      this.canvas.skeletonStates = {};
+      this.canvas.skeletonLines = [];
+    }
+
     /* innerLines 초기화 */
     this.canvas
       .getObjects()
@@ -318,7 +326,10 @@ export const QPolygon = fabric.util.createClass(fabric.Polygon, {
         drawRidgeRoof(this.id, this.canvas, textMode)
       }
     } else {
-      drawRidgeRoof(this.id, this.canvas, textMode)
+
+        drawSkeletonRidgeRoof(this.id, this.canvas, textMode)
+        //drawRidgeRoof(this.id, this.canvas, textMode)
+
     }
   },
 

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

@@ -21,6 +21,7 @@ const Trestle = forwardRef((props, ref) => {
   const [isAutoSelecting, setIsAutoSelecting] = useState(false) // 자동 선택 중인지 상태
   const [autoSelectTimeout, setAutoSelectTimeout] = useState(null) // 타임아웃 참조
   const autoSelectTimeoutRef = useRef(null)
+
   // 공통 타임아웃 설정 (밀리초)
   const AUTO_SELECT_TIMEOUT = 700 // API 호출 완료 대기 시간
   const {
@@ -467,7 +468,8 @@ const Trestle = forwardRef((props, ref) => {
             ...selectedRoofBase,
           },
           construction: {
-            ...constructionList.find((data) => newAddedRoofs[index].construction.constTp === data.constTp),
+            //...constructionList.find((data) => newAddedRoofs[index].construction.constTp === data.constTp),
+            ...constructionList.find((data) => trestleState.constTp === data.constTp),
             cvrYn,
             snowGdPossYn,
             cvrChecked,