Merge branch 'dev' of https://git.hanasys.jp/qcast3/qcast-front into dev_ysCha

src/components/fabric/QPolygon.js

@@ -2,7 +2,7 @@ import { fabric } from 'fabric'
 import { v4 as uuidv4 } from 'uuid'
 import { QLine } from '@/components/fabric/QLine'
 import { distanceBetweenPoints, findTopTwoIndexesByDistance, getDirectionByPoint, sortedPointLessEightPoint, sortedPoints } from '@/util/canvas-util'
-import { calculateAngle, drawGableRoof, drawRidgeRoof, drawShedRoof, toGeoJSON } from '@/util/qpolygon-utils'
+import { calculateAngle, drawGableRoof, drawRoofByAttribute, drawShedRoof, toGeoJSON } from '@/util/qpolygon-utils'
 import * as turf from '@turf/turf'
 import { LINE_TYPE, POLYGON_TYPE } from '@/common/common'
 import Big from 'big.js'
@@ -314,14 +314,18 @@ export const QPolygon = fabric.util.createClass(fabric.Polygon, {
       }
 
       const getParallelEavesLines = function (shedLines, lines) {
-        const eavesLines = lines.filter((line) => line.attributes?.type === LINE_TYPE.WALLLINE.EAVES)
-
         const referenceAngle = calculateAngle(shedLines[0].startPoint, shedLines[0].endPoint)
-
+        const otherSideLines = lines.filter((line) => {
-        return eavesLines.filter((line) => {
+          const lineAngle = calculateAngle(line.startPoint, line.endPoint)
-          const eavesAngle = calculateAngle(line.startPoint, line.endPoint)
+          return Math.abs(referenceAngle - lineAngle) === 180
-          return Math.abs(referenceAngle - eavesAngle) === 180
         })
+        const containNotEaves = otherSideLines.filter((line) => line.attributes?.type !== LINE_TYPE.WALLLINE.EAVES)
+
+        if (containNotEaves.length === 0) {
+          return otherSideLines
+        } else {
+          return []
+        }
       }
 
       const parallelEaves = getParallelEavesLines(shedLines, lines)
@@ -337,7 +341,7 @@ export const QPolygon = fabric.util.createClass(fabric.Polygon, {
       // 용마루 -- straight-skeleton
       console.log('용마루 지붕')
       ///drawRidgeRoof(this.id, this.canvas, textMode)
-      drawSkeletonRidgeRoof(this.id, this.canvas, textMode);
+      drawSkeletonRidgeRoof(this.id, this.canvas, textMode)
     } else if (isGableRoof(types)) {
       // A형, B형 박공 지붕
       console.log('패턴 지붕')
@@ -347,7 +351,7 @@ export const QPolygon = fabric.util.createClass(fabric.Polygon, {
       drawShedRoof(this.id, this.canvas, textMode)
     } else {
       console.log('변별로 설정')
-      drawRidgeRoof(this.id, this.canvas, textMode)
+      drawRoofByAttribute(this.id, this.canvas, textMode)
     }
   },
 

src/hooks/roofcover/useEavesGableEdit.js

@@ -116,6 +116,7 @@ export function useEavesGableEdit(id) {
 
   useEffect(() => {
     typeRef.current = type
+    radioTypeRef.current = '1'
   }, [type])
 
   const mouseOverEvent = (e) => {