From 05dd069e537351ac5169ad274ea7648d34fa1390 Mon Sep 17 00:00:00 2001
From: "hyojun.choi" <chlgkwk123@nate.com>
Date: Thu, 20 Mar 2025 10:02:09 +0900
Subject: [PATCH 01/15] =?UTF-8?q?modified=20=EC=8B=9C=20lines=20=EC=9C=84?=
 =?UTF-8?q?=EC=B9=98=20=EC=83=88=EB=A1=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/fabric/QPolygon.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/fabric/QPolygon.js b/src/components/fabric/QPolygon.js
index f19687aa..4b15d687 100644
--- a/src/components/fabric/QPolygon.js
+++ b/src/components/fabric/QPolygon.js
@@ -119,10 +119,12 @@ export const QPolygon = fabric.util.createClass(fabric.Polygon, {
     this.addLengthText()
 
     this.on('moving', () => {
+      this.initLines()
       this.addLengthText()
     })
 
     this.on('modified', (e) => {
+      this.initLines()
       this.addLengthText()
     })
 
@@ -183,7 +185,7 @@ export const QPolygon = fabric.util.createClass(fabric.Polygon, {
 
     this.lines = []
 
-    this.points.forEach((point, i) => {
+    this.getCurrentPoints().forEach((point, i) => {
       const nextPoint = this.points[(i + 1) % this.points.length]
       const line = new QLine([point.x, point.y, nextPoint.x, nextPoint.y], {
         stroke: this.stroke,

From e7410e53731f79d4c967586a66197b90fc54950b Mon Sep 17 00:00:00 2001
From: basssy <basssy@interplug.co.kr>
Date: Thu, 20 Mar 2025 13:35:06 +0900
Subject: [PATCH 02/15] =?UTF-8?q?=EA=B2=AC=EC=A0=81=EC=84=9C=20=EC=9D=BC?=
 =?UTF-8?q?=EB=B3=B8=EC=96=B4=20=EB=B3=80=EA=B2=BD=20=EB=88=84=EB=9D=BD?=
 =?UTF-8?q?=EB=B6=84=20=EC=9E=AC=EB=B0=98=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/estimate/Estimate.jsx     | 4 ++--
 src/components/floor-plan/CanvasMenu.jsx | 2 +-
 src/locales/ja.json                      | 4 ++--
 src/locales/ko.json                      | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/components/estimate/Estimate.jsx b/src/components/estimate/Estimate.jsx
index 06df265d..532d6364 100644
--- a/src/components/estimate/Estimate.jsx
+++ b/src/components/estimate/Estimate.jsx
@@ -387,6 +387,8 @@ export default function Estimate({}) {
         if (isNotEmptyArray(res?.data)) {
           setStorePriceList(res.data)
         }
+
+        setItemChangeYn(true)
       })
 
       if (estimateContextState.estimateType === 'YJSS') {
@@ -416,8 +418,6 @@ export default function Estimate({}) {
           handlePricing('UNIT_PRICE')
         }
       }
-
-      setItemChangeYn(true)
     }
   }, [estimateContextState?.estimateType])
 
diff --git a/src/components/floor-plan/CanvasMenu.jsx b/src/components/floor-plan/CanvasMenu.jsx
index 0d9ddc0a..a268604e 100644
--- a/src/components/floor-plan/CanvasMenu.jsx
+++ b/src/components/floor-plan/CanvasMenu.jsx
@@ -634,7 +634,7 @@ export default function CanvasMenu(props) {
                   onClick={() => setEstimatePopupOpen(true)}
                 >
                   <span className="ico ico01"></span>
-                  <span className="name">{getMessage('plan.menu.estimate.docDown')}</span>
+                  <span className="name">{getMessage('plan.menu.estimate.docDownload')}</span>
                 </button>
                 <button type="button" style={{ display: saveButtonStyle }} className="btn-frame gray ico-flx" onClick={handleEstimateSubmit}>
                   <span className="ico ico02"></span>
diff --git a/src/locales/ja.json b/src/locales/ja.json
index e91861ac..b0c7f8c4 100644
--- a/src/locales/ja.json
+++ b/src/locales/ja.json
@@ -178,7 +178,7 @@
   "modal.roof.alloc.select.parallel": "筋配置",
   "modal.roof.alloc.select.stairs": "千鳥配置",
   "modal.roof.alloc.apply": "選択した屋根材として割り当て",
-  "plan.menu.estimate.docDown": "各種資料ダウンロード",
+  "plan.menu.estimate.docDownload": "見積書出力",
   "plan.menu.estimate.save": "保存",
   "plan.menu.estimate.reset": "初期化",
   "plan.menu.estimate.copy": "見積書のコピー",
@@ -887,7 +887,7 @@
   "estimate.detail.drawingEstimateCreateDate": "登録日",
   "estimate.detail.lastEditDatetime": "変更日時",
   "estimate.detail.saleStoreId": "一次販売店名",
-  "estimate.detail.estimateDate": "見積日",
+  "estimate.detail.estimateDate": "見積作成日",
   "estimate.detail.otherSaleStoreId": "二次販売店名",
   "estimate.detail.noOtherSaleStoreId": "二次店なし",
   "estimate.detail.receiveUser": "担当者",
diff --git a/src/locales/ko.json b/src/locales/ko.json
index be5154ac..9a3bc8f0 100644
--- a/src/locales/ko.json
+++ b/src/locales/ko.json
@@ -178,7 +178,7 @@
   "modal.roof.alloc.select.parallel": "병렬식",
   "modal.roof.alloc.select.stairs": "계단식",
   "modal.roof.alloc.apply": "선택한 지붕재로 할당",
-  "plan.menu.estimate.docDown": "문서 다운로드",
+  "plan.menu.estimate.docDownload": "문서 다운로드",
   "plan.menu.estimate.save": "저장",
   "plan.menu.estimate.reset": "초기화",
   "plan.menu.estimate.copy": "견적서 복사",
@@ -887,7 +887,7 @@
   "estimate.detail.drawingEstimateCreateDate": "등록일",
   "estimate.detail.lastEditDatetime": "변경일시",
   "estimate.detail.saleStoreId": "1차 판매점명",
-  "estimate.detail.estimateDate": "견적일",
+  "estimate.detail.estimateDate": "견적작성일",
   "estimate.detail.otherSaleStoreId": "2차 판매점명",
   "estimate.detail.noOtherSaleStoreId": "2차점 없음",
   "estimate.detail.receiveUser": "담당자",

From e624aa0de01dfc794ce0d4e991af6898a8cd06c8 Mon Sep 17 00:00:00 2001
From: "hyojun.choi" <chlgkwk123@nate.com>
Date: Thu, 20 Mar 2025 13:42:07 +0900
Subject: [PATCH 03/15] =?UTF-8?q?=EB=A9=94=EC=8B=9C=EC=A7=80=20=EB=82=B4?=
 =?UTF-8?q?=EC=9A=A9=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/locales/ja.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/locales/ja.json b/src/locales/ja.json
index e91861ac..76617be0 100644
--- a/src/locales/ja.json
+++ b/src/locales/ja.json
@@ -1035,7 +1035,7 @@
   "roof.exceed.count": "屋根材は4つまで選択可能です。",
   "outerLine.property.fix": "外壁線の属性設定 を完了しますか？",
   "outerLine.property.close": "外壁線の属性設定 を終了しますか？",
-  "want.to.complete.auxiliary.creation": "보補助線の作成を完了しますか?",
+  "want.to.complete.auxiliary.creation": "補助線の作成を完了しますか?",
   "modal.placement.initial.setting.plan.drawing.only.number": "(※数字は[半角]入力のみ可能です。)",
   "wall.line.not.found": "外壁がありません",
   "roof.line.not.found": "屋根形状がありません"

From 39d48e61f3c419bda11c84e56a10150c721dbb11 Mon Sep 17 00:00:00 2001
From: yoosangwook <swyoo@interplug.co.kr>
Date: Thu, 20 Mar 2025 13:48:07 +0900
Subject: [PATCH 04/15] test: push test

---
 ecosystem.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ecosystem.config.js b/ecosystem.config.js
index 97676e2e..295b7871 100644
--- a/ecosystem.config.js
+++ b/ecosystem.config.js
@@ -2,7 +2,7 @@ module.exports = {
   apps: [
     {
       name: 'qcast-front-production',
-      script: 'npm run start',
+      script: 'npm run start:dev',
       instance: 2,
       exec_mode: 'cluster',
     },

From c4d17d21476caf2eeeca024e885f8803c7bd2730 Mon Sep 17 00:00:00 2001
From: yjnoh <lelalela@daum.net>
Date: Thu, 20 Mar 2025 15:30:03 +0900
Subject: [PATCH 05/15] =?UTF-8?q?=EB=B0=B0=EC=B9=98=EB=A9=B4=20=EB=9D=BC?=
 =?UTF-8?q?=EC=9D=B8=20=ED=83=80=EC=9E=85=20=ED=8C=9D=EC=97=85=20=EC=82=AD?=
 =?UTF-8?q?=EC=A0=9C=20=EB=B0=8F=20=EB=A1=9C=EC=A7=81=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../flowDirection/FlowDirectionSetting.jsx    |  4 +
 src/hooks/surface/usePlacementShapeDrawing.js | 16 ++--
 src/hooks/surface/useSurfaceShapeBatch.js     | 74 +++++++++++++++++--
 3 files changed, 81 insertions(+), 13 deletions(-)

diff --git a/src/components/floor-plan/modal/flowDirection/FlowDirectionSetting.jsx b/src/components/floor-plan/modal/flowDirection/FlowDirectionSetting.jsx
index 910a2f02..673e4bd9 100644
--- a/src/components/floor-plan/modal/flowDirection/FlowDirectionSetting.jsx
+++ b/src/components/floor-plan/modal/flowDirection/FlowDirectionSetting.jsx
@@ -7,6 +7,7 @@ import { useMessage } from '@/hooks/useMessage'
 import { usePopup } from '@/hooks/usePopup'
 import { canvasState } from '@/store/canvasAtom'
 import { usePolygon } from '@/hooks/usePolygon'
+import { useSurfaceShapeBatch } from '@/hooks/surface/useSurfaceShapeBatch'
 
 const FLOW_DIRECTION_TYPE = {
   EIGHT_AZIMUTH: 'eightAzimuth',
@@ -19,6 +20,8 @@ export default function FlowDirectionSetting(props) {
   const canvas = useRecoilValue(canvasState)
   const { getMessage } = useMessage()
 
+  const { changeSurfaceLineType } = useSurfaceShapeBatch({})
+
   useEffect(() => {
     return () => {
       canvas?.discardActiveObject()
@@ -53,6 +56,7 @@ export default function FlowDirectionSetting(props) {
     })
     drawDirectionArrow(roof)
     canvas?.renderAll()
+    changeSurfaceLineType(roof)
     closePopup(id)
   }
 
diff --git a/src/hooks/surface/usePlacementShapeDrawing.js b/src/hooks/surface/usePlacementShapeDrawing.js
index b1e92f90..db0859cf 100644
--- a/src/hooks/surface/usePlacementShapeDrawing.js
+++ b/src/hooks/surface/usePlacementShapeDrawing.js
@@ -32,6 +32,7 @@ import {
 import { usePolygon } from '@/hooks/usePolygon'
 import { POLYGON_TYPE } from '@/common/common'
 import { usePopup } from '@/hooks/usePopup'
+import { useSurfaceShapeBatch } from './useSurfaceShapeBatch'
 
 import { roofDisplaySelector } from '@/store/settingAtom'
 import { useRoofFn } from '@/hooks/common/useRoofFn'
@@ -50,6 +51,8 @@ export function usePlacementShapeDrawing(id) {
   const { addPolygonByLines, drawDirectionArrow } = usePolygon()
   const { tempGridMode } = useTempGrid()
   const { setSurfaceShapePattern } = useRoofFn()
+  const { changeSurfaceLineType } = useSurfaceShapeBatch({})
+
   const canvasSetting = useRecoilValue(canvasSettingState)
   const verticalHorizontalMode = useRecoilValue(verticalHorizontalModeState)
   const adsorptionPointAddMode = useRecoilValue(adsorptionPointAddModeState)
@@ -253,11 +256,14 @@ export function usePlacementShapeDrawing(id) {
         setPoints([])
         canvas?.renderAll()
 
-        if (+canvasSetting?.roofSizeSet === 3) {
-          closePopup(id)
-          return
-        }
-        addPopup(id, 1, <PlacementSurfaceLineProperty id={id} roof={roof} />, false)
+        // if (+canvasSetting?.roofSizeSet === 3) {
+        //   closePopup(id)
+        //   return
+        // }
+        // addPopup(id, 1, <PlacementSurfaceLineProperty id={id} roof={roof} />, false)
+
+        changeSurfaceLineType(roof)
+        closePopup(id)
       }
 
       if (points.length < 3) {
diff --git a/src/hooks/surface/useSurfaceShapeBatch.js b/src/hooks/surface/useSurfaceShapeBatch.js
index 1b0597b6..52c35b02 100644
--- a/src/hooks/surface/useSurfaceShapeBatch.js
+++ b/src/hooks/surface/useSurfaceShapeBatch.js
@@ -3,7 +3,7 @@
 import { useEffect } from 'react'
 import { useRecoilState, useRecoilValue, useResetRecoilState } from 'recoil'
 import { canvasSettingState, canvasState, currentCanvasPlanState, globalPitchState } from '@/store/canvasAtom'
-import { MENU, POLYGON_TYPE } from '@/common/common'
+import { MENU, POLYGON_TYPE, LINE_TYPE } from '@/common/common'
 import { getIntersectionPoint, toFixedWithoutRounding } from '@/util/canvas-util'
 import { degreesToRadians } from '@turf/turf'
 import { QPolygon } from '@/components/fabric/QPolygon'
@@ -111,7 +111,7 @@ export function useSurfaceShapeBatch({ isHidden, setIsHidden }) {
           lockScalingX: true, // X 축 크기 조정 잠금
           lockScalingY: true, // Y 축 크기 조정 잠금
           name: MENU.BATCH_CANVAS.SURFACE_SHAPE_BATCH_TEMP,
-          flipX: xInversion !== yInversion,
+          // flipX: xInversion !== yInversion,
           // angle: xInversion && yInversion ? Math.abs((rotate + 180) % 360) : Math.abs(rotate),
           // angle: rotate,
           originX: 'center',
@@ -120,6 +120,7 @@ export function useSurfaceShapeBatch({ isHidden, setIsHidden }) {
         }
 
         obj = new QPolygon(points, options)
+
         let imageRotate = 0
         if (xInversion && !yInversion) {
           if (rotate % 180 === 0 || rotate < 0) {
@@ -148,7 +149,7 @@ export function useSurfaceShapeBatch({ isHidden, setIsHidden }) {
         } else {
           imageRotate = (rotate + 360) % 360
         }
-        obj.set({ angle: imageRotate })
+        obj.set({ angle: imageRotate, flipX: xInversion !== yInversion })
         obj.setCoords() //좌표 변경 적용
 
         canvas?.add(obj)
@@ -201,13 +202,15 @@ export function useSurfaceShapeBatch({ isHidden, setIsHidden }) {
         setSurfaceShapePattern(batchSurface, roofDisplay.column)
         drawDirectionArrow(batchSurface)
 
-        // if (setIsHidden) setIsHidden(false)
-
         // closePopup(id)
         initEvent()
-        if (+canvasSetting?.roofSizeSet === 3) return
-        const popupId = uuidv4()
-        addPopup(popupId, 2, <PlacementSurfaceLineProperty roof={batchSurface} id={popupId} setIsHidden={setIsHidden} />)
+        // if (+canvasSetting?.roofSizeSet === 3) return
+        // const popupId = uuidv4()
+        // addPopup(popupId, 2, <PlacementSurfaceLineProperty roof={batchSurface} id={popupId} setIsHidden={setIsHidden} />)
+
+        changeSurfaceLineType(batchSurface)
+
+        if (setIsHidden) setIsHidden(false)
       })
     } else {
       if (setIsHidden) setIsHidden(false)
@@ -1066,6 +1069,60 @@ export function useSurfaceShapeBatch({ isHidden, setIsHidden }) {
     canvas?.renderAll()
   }
 
+  const changeSurfaceLineType = (polygon) => {
+    polygon.lines.forEach((line) => {
+      line.attributes.type = LINE_TYPE.WALLLINE.GABLE
+    })
+
+    const directionConfig = {
+      south: { evaesDirection: 'right', ridgeDirection: 'left', coord1: 'y1', coord2: 'y2' },
+      north: { evaesDirection: 'left', ridgeDirection: 'right', coord1: 'y1', coord2: 'y2' },
+      east: { evaesDirection: 'top', ridgeDirection: 'bottom', coord1: 'x1', coord2: 'x2' },
+      west: { evaesDirection: 'bottom', ridgeDirection: 'top', coord1: 'x1', coord2: 'x2' },
+    }
+
+    const { evaesDirection, ridgeDirection, coord1, coord2 } = directionConfig[polygon.direction] || directionConfig.west
+
+    polygon.lines.forEach((line) => {
+      if (line[coord1] === line[coord2]) {
+        if (line.direction === evaesDirection) {
+          line.attributes.type = LINE_TYPE.WALLLINE.EAVES
+          line.stroke = 'rgb(47, 0, 255)'
+        } else if (line.direction === ridgeDirection) {
+          line.attributes.type = LINE_TYPE.SUBLINE.RIDGE
+          line.stroke = 'rgb(44, 255, 2)'
+        }
+      }
+    })
+
+    const maxLine = polygon.lines
+      .filter((line) => line[coord1] === line[coord2])
+      .sort(
+        (a, b) =>
+          (polygon.direction === 'south' || polygon.direction === 'east' ? b : a)[coord1] -
+          (polygon.direction === 'south' || polygon.direction === 'east' ? a : b)[coord1],
+      )[0]
+
+    console.log(maxLine)
+
+    if (maxLine) {
+      if (
+        (polygon.direction === 'south' && maxLine.direction === 'left') ||
+        (polygon.direction === 'north' && maxLine.direction === 'right') ||
+        (polygon.direction === 'east' && maxLine.direction === 'bottom') ||
+        (polygon.direction === 'west' && maxLine.direction === 'top')
+      ) {
+        polygon.lines.forEach((line) => {
+          if (line.attributes.type === LINE_TYPE.WALLLINE.EAVES) {
+            line.attributes.type = LINE_TYPE.SUBLINE.RIDGE
+          } else if (line.attributes.type === LINE_TYPE.SUBLINE.RIDGE) {
+            line.attributes.type = LINE_TYPE.WALLLINE.EAVES
+          }
+        })
+      }
+    }
+  }
+
   const updateFlippedPoints = (polygon) => {
     if (!(polygon instanceof fabric.Polygon)) {
       console.error('The object is not a Polygon.')
@@ -1115,5 +1172,6 @@ export function useSurfaceShapeBatch({ isHidden, setIsHidden }) {
     changeSurfaceLinePropertyEvent,
     changeSurfaceLineProperty,
     changeSurfaceLinePropertyReset,
+    changeSurfaceLineType,
   }
 }

From 79d873c135a9bae5105cc7cb1e10a1b4543382a8 Mon Sep 17 00:00:00 2001
From: yjnoh <lelalela@daum.net>
Date: Thu, 20 Mar 2025 16:00:02 +0900
Subject: [PATCH 06/15] =?UTF-8?q?=EC=A7=84=EC=A7=9C=20=EC=B2=98=EB=A7=88?=
 =?UTF-8?q?=EB=A9=B4=EC=9D=B8=EC=A7=80=20=ED=99=95=EC=9D=B8=ED=95=98?=
 =?UTF-8?q?=EB=8A=94=20=EB=A1=9C=EC=A7=81=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/surface/useSurfaceShapeBatch.js | 30 +++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/hooks/surface/useSurfaceShapeBatch.js b/src/hooks/surface/useSurfaceShapeBatch.js
index 52c35b02..4658e75a 100644
--- a/src/hooks/surface/useSurfaceShapeBatch.js
+++ b/src/hooks/surface/useSurfaceShapeBatch.js
@@ -1069,6 +1069,11 @@ export function useSurfaceShapeBatch({ isHidden, setIsHidden }) {
     canvas?.renderAll()
   }
 
+  /**
+   * 면형상 작도시 라인 속성 넣는 로직
+   *
+   * @param { } polygon
+   */
   const changeSurfaceLineType = (polygon) => {
     polygon.lines.forEach((line) => {
       line.attributes.type = LINE_TYPE.WALLLINE.GABLE
@@ -1103,8 +1108,6 @@ export function useSurfaceShapeBatch({ isHidden, setIsHidden }) {
           (polygon.direction === 'south' || polygon.direction === 'east' ? a : b)[coord1],
       )[0]
 
-    console.log(maxLine)
-
     if (maxLine) {
       if (
         (polygon.direction === 'south' && maxLine.direction === 'left') ||
@@ -1121,6 +1124,29 @@ export function useSurfaceShapeBatch({ isHidden, setIsHidden }) {
         })
       }
     }
+
+    /**
+     * 진짜 처마 라인인지 확인하는 로직 -> 특정 모양에 따라 처마가 없는 경우가 있는데 위에 로직으로는
+     * 용마루도 처마로 만들어서 재보정
+     */
+    const maxLineCoord = polygon.lines.sort(
+      (a, b) =>
+        (polygon.direction === 'south' || polygon.direction === 'east' ? b : a)[coord1] -
+        (polygon.direction === 'south' || polygon.direction === 'east' ? a : b)[coord1],
+    )[0]
+
+    const isRealEavesLine = polygon.lines.find((line) => line.attributes.type === LINE_TYPE.WALLLINE.EAVES)
+    if (isRealEavesLine) {
+      if (polygon.direction === 'south' || polygon.direction === 'north') {
+        if (maxLineCoord.y1 !== isRealEavesLine.y1) {
+          isRealEavesLine.attributes.type = LINE_TYPE.SUBLINE.RIDGE
+        }
+      } else if (polygon.direction === 'east' || polygon.direction === 'west') {
+        if (maxLineCoord.x1 !== isRealEavesLine.x1) {
+          isRealEavesLine.attributes.type = LINE_TYPE.SUBLINE.RIDGE
+        }
+      }
+    }
   }
 
   const updateFlippedPoints = (polygon) => {

From 6919dac8f1c707caa5489b5c493e8f68010f3df8 Mon Sep 17 00:00:00 2001
From: "hyojun.choi" <chlgkwk123@nate.com>
Date: Thu, 20 Mar 2025 16:48:35 +0900
Subject: [PATCH 07/15] =?UTF-8?q?getCurrentPoints=EB=A1=9C=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/fabric/QPolygon.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/fabric/QPolygon.js b/src/components/fabric/QPolygon.js
index 4b15d687..396ae6af 100644
--- a/src/components/fabric/QPolygon.js
+++ b/src/components/fabric/QPolygon.js
@@ -186,7 +186,7 @@ export const QPolygon = fabric.util.createClass(fabric.Polygon, {
     this.lines = []
 
     this.getCurrentPoints().forEach((point, i) => {
-      const nextPoint = this.points[(i + 1) % this.points.length]
+      const nextPoint = this.getCurrentPoints()[(i + 1) % this.points.length]
       const line = new QLine([point.x, point.y, nextPoint.x, nextPoint.y], {
         stroke: this.stroke,
         strokeWidth: this.strokeWidth,

From 414d6fa0c5ca5884684e44ad378a7240f83d6448 Mon Sep 17 00:00:00 2001
From: yjnoh <lelalela@daum.net>
Date: Thu, 20 Mar 2025 17:59:58 +0900
Subject: [PATCH 08/15] =?UTF-8?q?=EC=B2=98=EB=A7=88=20=EC=9A=A9=EB=A7=88?=
 =?UTF-8?q?=EB=A3=A8=20=EB=B0=A9=ED=96=A5=EC=97=90=20=EB=94=B0=EB=A5=B8=20?=
 =?UTF-8?q?=ED=83=80=EC=9E=85=20=EC=9E=91=EC=97=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/surface/useSurfaceShapeBatch.js | 75 ++++++++++++++---------
 1 file changed, 45 insertions(+), 30 deletions(-)

diff --git a/src/hooks/surface/useSurfaceShapeBatch.js b/src/hooks/surface/useSurfaceShapeBatch.js
index 4658e75a..6b239b03 100644
--- a/src/hooks/surface/useSurfaceShapeBatch.js
+++ b/src/hooks/surface/useSurfaceShapeBatch.js
@@ -1100,20 +1100,22 @@ export function useSurfaceShapeBatch({ isHidden, setIsHidden }) {
       }
     })
 
-    const maxLine = polygon.lines
-      .filter((line) => line[coord1] === line[coord2])
-      .sort(
-        (a, b) =>
-          (polygon.direction === 'south' || polygon.direction === 'east' ? b : a)[coord1] -
-          (polygon.direction === 'south' || polygon.direction === 'east' ? a : b)[coord1],
-      )[0]
+    //직선 찾는 로직
+    const maxLine = polygon.lines.filter((line) => line[coord1] === line[coord2])
+
+    if (maxLine.length > 0) {
+      const maxLineSorted = maxLine.reduce((a, b) => {
+        return (polygon.direction === 'south' || polygon.direction === 'east' ? b : a)[coord1] >
+          (polygon.direction === 'south' || polygon.direction === 'east' ? a : b)[coord1]
+          ? b
+          : a
+      })
 
-    if (maxLine) {
       if (
-        (polygon.direction === 'south' && maxLine.direction === 'left') ||
-        (polygon.direction === 'north' && maxLine.direction === 'right') ||
-        (polygon.direction === 'east' && maxLine.direction === 'bottom') ||
-        (polygon.direction === 'west' && maxLine.direction === 'top')
+        (polygon.direction === 'south' && maxLineSorted.direction === 'left') ||
+        (polygon.direction === 'north' && maxLineSorted.direction === 'right') ||
+        (polygon.direction === 'east' && maxLineSorted.direction === 'bottom') ||
+        (polygon.direction === 'west' && maxLineSorted.direction === 'top')
       ) {
         polygon.lines.forEach((line) => {
           if (line.attributes.type === LINE_TYPE.WALLLINE.EAVES) {
@@ -1123,30 +1125,43 @@ export function useSurfaceShapeBatch({ isHidden, setIsHidden }) {
           }
         })
       }
+
+      if (maxLine.length === 1) {
+        const maxLineCoord = polygon.lines.reduce((a, b) => {
+          return (polygon.direction === 'south' || polygon.direction === 'east' ? b : a)[coord1] >
+            (polygon.direction === 'south' || polygon.direction === 'east' ? a : b)[coord1]
+            ? b
+            : a
+        })
+
+        const isRealEavesLine = polygon.lines.find((line) => line.attributes.type === LINE_TYPE.WALLLINE.EAVES)
+        if (isRealEavesLine) {
+          if (polygon.direction === 'south' || polygon.direction === 'north') {
+            const targetCoord =
+              polygon.direction === 'south' ? Math.max(maxLineCoord.y1, maxLineCoord.y2) : Math.min(maxLineCoord.y1, maxLineCoord.y2)
+            const realLineCoord =
+              polygon.direction === 'south' ? Math.max(isRealEavesLine.y1, isRealEavesLine.y2) : Math.min(isRealEavesLine.y1, isRealEavesLine.y2)
+
+            if (targetCoord !== realLineCoord) {
+              isRealEavesLine.attributes.type = LINE_TYPE.SUBLINE.RIDGE
+            }
+          } else if (polygon.direction === 'east' || polygon.direction === 'west') {
+            const targetCoord = polygon.direction === 'east' ? Math.max(maxLineCoord.x1, maxLineCoord.x2) : Math.min(maxLineCoord.x1, maxLineCoord.x2)
+            const realLineCoord =
+              polygon.direction === 'east' ? Math.max(isRealEavesLine.x1, isRealEavesLine.x2) : Math.min(isRealEavesLine.x1, isRealEavesLine.x2)
+
+            if (targetCoord !== realLineCoord) {
+              isRealEavesLine.attributes.type = LINE_TYPE.SUBLINE.RIDGE
+            }
+          }
+        }
+      }
     }
 
     /**
      * 진짜 처마 라인인지 확인하는 로직 -> 특정 모양에 따라 처마가 없는 경우가 있는데 위에 로직으로는
      * 용마루도 처마로 만들어서 재보정
      */
-    const maxLineCoord = polygon.lines.sort(
-      (a, b) =>
-        (polygon.direction === 'south' || polygon.direction === 'east' ? b : a)[coord1] -
-        (polygon.direction === 'south' || polygon.direction === 'east' ? a : b)[coord1],
-    )[0]
-
-    const isRealEavesLine = polygon.lines.find((line) => line.attributes.type === LINE_TYPE.WALLLINE.EAVES)
-    if (isRealEavesLine) {
-      if (polygon.direction === 'south' || polygon.direction === 'north') {
-        if (maxLineCoord.y1 !== isRealEavesLine.y1) {
-          isRealEavesLine.attributes.type = LINE_TYPE.SUBLINE.RIDGE
-        }
-      } else if (polygon.direction === 'east' || polygon.direction === 'west') {
-        if (maxLineCoord.x1 !== isRealEavesLine.x1) {
-          isRealEavesLine.attributes.type = LINE_TYPE.SUBLINE.RIDGE
-        }
-      }
-    }
   }
 
   const updateFlippedPoints = (polygon) => {

From 88bcf27bfbfeaa13643493f941df25238af0714f Mon Sep 17 00:00:00 2001
From: yjnoh <lelalela@daum.net>
Date: Thu, 20 Mar 2025 18:09:40 +0900
Subject: [PATCH 09/15] =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/surface/useSurfaceShapeBatch.js | 55 ++++-------------------
 1 file changed, 8 insertions(+), 47 deletions(-)

diff --git a/src/hooks/surface/useSurfaceShapeBatch.js b/src/hooks/surface/useSurfaceShapeBatch.js
index 6b239b03..296632a7 100644
--- a/src/hooks/surface/useSurfaceShapeBatch.js
+++ b/src/hooks/surface/useSurfaceShapeBatch.js
@@ -1071,9 +1071,12 @@ export function useSurfaceShapeBatch({ isHidden, setIsHidden }) {
 
   /**
    * 면형상 작도시 라인 속성 넣는 로직
-   *
+   * 폴리곤으로 보면 직선방향에 따라 아래쪽인지 윗쪽인지 판단이 가능하다고 생각하여
+   * south -> 밑면은 무조건 right direction이라 가정하고 작업함 좌우반전시 반대로 그려지는 경우도 생기지만 그럴땐 흐름방향에 따라 최대값(최소값)을 찾아
+   * 해당 하는 흐름에 맞게 변경함
    * @param { } polygon
    */
+
   const changeSurfaceLineType = (polygon) => {
     polygon.lines.forEach((line) => {
       line.attributes.type = LINE_TYPE.WALLLINE.GABLE
@@ -1100,6 +1103,10 @@ export function useSurfaceShapeBatch({ isHidden, setIsHidden }) {
       }
     })
 
+    /**
+     * 진짜 처마 라인인지 확인하는 로직 -> 특정 모양에 따라 처마가 없는 경우가 있는데 위에 로직으로는
+     * 용마루도 처마로 만들어서 재보정
+     */
     //직선 찾는 로직
     const maxLine = polygon.lines.filter((line) => line[coord1] === line[coord2])
 
@@ -1157,52 +1164,6 @@ export function useSurfaceShapeBatch({ isHidden, setIsHidden }) {
         }
       }
     }
-
-    /**
-     * 진짜 처마 라인인지 확인하는 로직 -> 특정 모양에 따라 처마가 없는 경우가 있는데 위에 로직으로는
-     * 용마루도 처마로 만들어서 재보정
-     */
-  }
-
-  const updateFlippedPoints = (polygon) => {
-    if (!(polygon instanceof fabric.Polygon)) {
-      console.error('The object is not a Polygon.')
-      return
-    }
-
-    const { flipX, flipY, width, height, points, left, top, scaleX, scaleY } = polygon
-
-    // 현재 points의 사본 가져오기
-    const newPoints = points.map((point) => {
-      let x = point.x
-      let y = point.y
-
-      // flipX 적용
-      if (flipX) {
-        x = width - x
-      }
-
-      // flipY 적용
-      if (flipY) {
-        y = height - y
-      }
-
-      // 스케일 및 전역 좌표 고려
-      x = (x - width / 2) * scaleX + width / 2
-      y = (y - height / 2) * scaleY + height / 2
-
-      return { x, y }
-    })
-
-    // flipX, flipY를 초기화
-    polygon.flipX = false
-    polygon.flipY = false
-
-    // points 업데이트
-    polygon.set({ points: newPoints })
-    polygon.setCoords()
-
-    return polygon
   }
 
   return {

From 786c35e65632babd5f883d7085f716f4ca0baa4a Mon Sep 17 00:00:00 2001
From: "hyojun.choi" <chlgkwk123@nate.com>
Date: Fri, 21 Mar 2025 09:57:51 +0900
Subject: [PATCH 10/15] =?UTF-8?q?intersection=20=EA=B2=80=EC=83=89=20?=
 =?UTF-8?q?=EB=B2=94=EC=9C=84=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/util/canvas-util.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/util/canvas-util.js b/src/util/canvas-util.js
index 1146afa7..60725183 100644
--- a/src/util/canvas-util.js
+++ b/src/util/canvas-util.js
@@ -348,15 +348,15 @@ export const calculateIntersection = (line1, line2) => {
   }
 
   // Determine the min and max for line1 and line2 for both x and y
-  const line1MinX = Math.min(line1.x1, line1.x2)
-  const line1MaxX = Math.max(line1.x1, line1.x2)
-  const line2MinX = Math.min(line2.x1, line2.x2)
-  const line2MaxX = Math.max(line2.x1, line2.x2)
+  const line1MinX = Math.min(line1.x1, line1.x2) - 5
+  const line1MaxX = Math.max(line1.x1, line1.x2) + 5
+  const line2MinX = Math.min(line2.x1, line2.x2) - 5
+  const line2MaxX = Math.max(line2.x1, line2.x2) + 5
 
-  const line1MinY = Math.min(line1.y1, line1.y2)
-  const line1MaxY = Math.max(line1.y1, line1.y2)
-  const line2MinY = Math.min(line2.y1, line2.y2)
-  const line2MaxY = Math.max(line2.y1, line2.y2)
+  const line1MinY = Math.min(line1.y1, line1.y2) - 5
+  const line1MaxY = Math.max(line1.y1, line1.y2) + 5
+  const line2MinY = Math.min(line2.y1, line2.y2) - 5
+  const line2MaxY = Math.max(line2.y1, line2.y2) + 5
 
   // Check if the intersection X and Y are within the range of both lines
   if (

From f2a083f0226209f7726ee56a335e985fe72e7774 Mon Sep 17 00:00:00 2001
From: "hyojun.choi" <chlgkwk123@nate.com>
Date: Fri, 21 Mar 2025 10:23:46 +0900
Subject: [PATCH 11/15] =?UTF-8?q?=EC=A7=80=EB=B6=95=EC=9E=AC=20=ED=95=A0?=
 =?UTF-8?q?=EB=8B=B9=20=EC=88=98=EC=A0=95=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../roofcover/useRoofAllocationSetting.js     | 27 +++++++++++++++++++
 src/locales/ja.json                           |  3 ++-
 src/locales/ko.json                           |  3 ++-
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/src/hooks/roofcover/useRoofAllocationSetting.js b/src/hooks/roofcover/useRoofAllocationSetting.js
index fb7d2114..cfc73b81 100644
--- a/src/hooks/roofcover/useRoofAllocationSetting.js
+++ b/src/hooks/roofcover/useRoofAllocationSetting.js
@@ -261,6 +261,15 @@ export function useRoofAllocationSetting(id) {
    * 지붕재 삭제
    */
   const onDeleteRoofMaterial = (idx) => {
+    const roofs = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.ROOF)
+
+    for (let i = 0; i < roofs.length; i++) {
+      if (roofs[i].roofMaterial.index === idx) {
+        swalFire({ type: 'alert', icon: 'error', text: getMessage('roof.material.can.not.delete') })
+        return
+      }
+    }
+
     const isSelected = currentRoofList[idx].selected
     const newRoofList = JSON.parse(JSON.stringify(currentRoofList)).filter((_, index) => index !== idx)
     if (isSelected) {
@@ -300,6 +309,7 @@ export function useRoofAllocationSetting(id) {
     })
 
     setRoofList(newRoofList)
+    setRoofMaterials(newRoofList)
     const selectedRoofMaterial = newRoofList.find((roof) => roof.selected)
     setSurfaceShapePattern(currentObject, roofDisplay.column, false, selectedRoofMaterial, true)
     drawDirectionArrow(currentObject)
@@ -308,6 +318,21 @@ export function useRoofAllocationSetting(id) {
     basicSettingSave()
   }
 
+  /**
+   * 기존 세팅된 지붕에 지붕재 내용을 바뀐 내용으로 수정
+   * @param newRoofMaterials
+   */
+  const setRoofMaterials = (newRoofMaterials) => {
+    const roofs = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.ROOF)
+    newRoofMaterials.forEach((roofMaterial) => {
+      const index = roofMaterial.index
+      const tempRoofs = roofs.filter((roof) => roof.roofMaterial?.index === index)
+      tempRoofs.forEach((roof) => {
+        setSurfaceShapePattern(roof, roofDisplay.column, false, roofMaterial)
+      })
+    })
+  }
+
   /**
    * 지붕면 할당
    */
@@ -411,6 +436,8 @@ export function useRoofAllocationSetting(id) {
       drawDirectionArrow(roof)
     })
 
+    setRoofMaterials(newRoofList)
+
     /** 외곽선 삭제 */
     const removeTargets = canvas.getObjects().filter((obj) => obj.name === 'outerLinePoint' || obj.name === 'outerLine')
     removeTargets.forEach((obj) => {
diff --git a/src/locales/ja.json b/src/locales/ja.json
index 356e6199..8aede254 100644
--- a/src/locales/ja.json
+++ b/src/locales/ja.json
@@ -1038,5 +1038,6 @@
   "want.to.complete.auxiliary.creation": "補助線の作成を完了しますか?",
   "modal.placement.initial.setting.plan.drawing.only.number": "(※数字は[半角]入力のみ可能です。)",
   "wall.line.not.found": "外壁がありません",
-  "roof.line.not.found": "屋根形状がありません"
+  "roof.line.not.found": "屋根形状がありません",
+  "roof.material.can.not.delete" : "割り当てられた配置面があります。"
 }
diff --git a/src/locales/ko.json b/src/locales/ko.json
index 9a3bc8f0..27ba2da2 100644
--- a/src/locales/ko.json
+++ b/src/locales/ko.json
@@ -1038,5 +1038,6 @@
   "want.to.complete.auxiliary.creation": "보조선 작성을 완료하시겠습니까?",
   "modal.placement.initial.setting.plan.drawing.only.number": "(※ 숫자는 [반각]입력만 가능합니다.)",
   "wall.line.not.found": "외벽선이 없습니다.",
-  "roof.line.not.found": "지붕형상이 없습니다."
+  "roof.line.not.found": "지붕형상이 없습니다.",
+  "roof.material.can.not.delete" : "할당된 배치면이 있습니다."
 }

From 1bb92a975e2e7972487b7d4d83b2006c167a11ee Mon Sep 17 00:00:00 2001
From: yjnoh <lelalela@daum.net>
Date: Fri, 21 Mar 2025 11:23:58 +0900
Subject: [PATCH 12/15] =?UTF-8?q?=EB=A7=88=EC=9A=B0=EC=8A=A4=20=EC=9A=B0?=
 =?UTF-8?q?=ED=81=B4=EB=A6=AD=20=EC=9D=B4=EB=B2=A4=ED=8A=B8=20=EC=A1=B0?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/context-menu/QContextMenu.jsx      | 85 +++++--------------
 src/hooks/module/useModulePlace.js            | 35 --------
 src/hooks/useContextMenu.js                   |  6 +-
 3 files changed, 26 insertions(+), 100 deletions(-)
 delete mode 100644 src/hooks/module/useModulePlace.js

diff --git a/src/components/common/context-menu/QContextMenu.jsx b/src/components/common/context-menu/QContextMenu.jsx
index cd8b9e2b..eec45f41 100644
--- a/src/components/common/context-menu/QContextMenu.jsx
+++ b/src/components/common/context-menu/QContextMenu.jsx
@@ -6,29 +6,19 @@ import { contextMenuListState, contextMenuState } from '@/store/contextMenu'
 import { useTempGrid } from '@/hooks/useTempGrid'
 import { useContextMenu } from '@/hooks/useContextMenu'
 import { useEvent } from '@/hooks/useEvent'
-import { canvasState } from '@/store/canvasAtom'
+import { canvasState, currentObjectState } from '@/store/canvasAtom'
 
 export default function QContextMenu(props) {
   const canvas = useRecoilValue(canvasState)
   const { contextRef, canvasProps } = props
   const [contextMenu, setContextMenu] = useRecoilState(contextMenuState)
   const contextMenuList = useRecoilValue(contextMenuListState)
-  const activeObject = canvasProps?.getActiveObject() //액티브된 객체를 가져옴
+  const currentObject = useRecoilValue(currentObjectState)
   const { tempGridMode, setTempGridMode } = useTempGrid()
   const { handleKeyup } = useContextMenu()
   const { addDocumentEventListener, removeDocumentEvent } = useEvent()
   // const { addDocumentEventListener, removeDocumentEvent } = useContext(EventContext)
 
-  let contextType = ''
-
-  if (activeObject) {
-    if (activeObject.initOptions && activeObject.initOptions.name) {
-      //이건 바뀔 가능성이 있음
-      if (activeObject.initOptions?.name?.indexOf('guide') > -1) {
-        contextType = 'surface' //면형상
-      }
-    }
-  }
   const getYPosition = (e) => {
     const contextLength = contextMenuList.reduce((acc, cur, index) => {
       return acc + cur.length
@@ -36,11 +26,13 @@ export default function QContextMenu(props) {
     return e?.clientY - (contextLength * 25 + contextMenuList.length * 2 * 17)
   }
 
-  useEffect(() => {
-    if (!contextRef.current) return
+  const handleContextMenu = (e) => {
+    // e.preventDefault() //기존 contextmenu 막고
+
+    if (currentObject) {
+      const isArray = currentObject.hasOwnProperty('arrayData')
+      if (isArray && currentObject.arrayData.length === 0) return
 
-    const handleContextMenu = (e) => {
-      e.preventDefault() //기존 contextmenu 막고
       if (tempGridMode) return
       const position = {
         x: window.innerWidth / 2 < e.pageX ? e.pageX - 240 : e.pageX,
@@ -48,21 +40,24 @@ export default function QContextMenu(props) {
       }
       setContextMenu({ visible: true, ...position, currentMousePos: canvasProps.getPointer(e) })
       addDocumentEventListener('keyup', document, handleKeyup)
-      canvasProps?.upperCanvasEl.removeEventListener('contextmenu', handleContextMenu) //한번 노출 후 이벤트 삭제
     }
+  }
 
-    const handleClick = (e) => {
-      // e.preventDefault()
+  const handleClick = (e) => {
+    // e.preventDefault()
+    setContextMenu({ ...contextMenu, visible: false })
+  }
+
+  const handleOutsideClick = (e) => {
+    // e.preventDefault()
+    if (contextMenu.visible) {
       setContextMenu({ ...contextMenu, visible: false })
+      removeDocumentEvent('keyup')
     }
+  }
 
-    const handleOutsideClick = (e) => {
-      // e.preventDefault()
-      if (contextMenu.visible) {
-        setContextMenu({ ...contextMenu, visible: false })
-        removeDocumentEvent('keyup')
-      }
-    }
+  useEffect(() => {
+    if (!contextRef.current) return
 
     canvasProps?.upperCanvasEl.addEventListener('contextmenu', handleContextMenu)
     document.addEventListener('click', handleClick)
@@ -72,43 +67,9 @@ export default function QContextMenu(props) {
       removeDocumentEvent('keyup')
       document.removeEventListener('click', handleClick)
       document.removeEventListener('click', handleOutsideClick)
+      canvasProps?.upperCanvasEl.removeEventListener('contextmenu', handleContextMenu) //한번 노출 후 이벤트 삭제
     }
-  }, [contextRef, contextMenuList])
-
-  const handleObjectMove = () => {
-    activeObject.set({
-      lockMovementX: false, // X 축 이동 잠금
-      lockMovementY: false, // Y 축 이동 잠금
-    })
-
-    canvasProps?.on('object:modified', function (e) {
-      activeObject.set({
-        lockMovementX: true, // X 축 이동 잠금
-        lockMovementY: true, // Y 축 이동 잠금
-      })
-    })
-  }
-
-  const handleObjectDelete = () => {
-    if (confirm('삭제하실거?')) {
-      canvasProps.remove(activeObject)
-    }
-  }
-
-  const handleObjectCopy = () => {
-    activeObject.clone((cloned) => {
-      cloned.set({
-        left: activeObject.left + activeObject.width + 20,
-        initOptions: { ...activeObject.initOptions },
-        lockMovementX: true, // X 축 이동 잠금
-        lockMovementY: true, // Y 축 이동 잠금
-        lockRotation: true, // 회전 잠금
-        lockScalingX: true, // X 축 크기 조정 잠금
-        lockScalingY: true, // Y 축 크기 조정 잠금
-      })
-      canvasProps?.add(cloned)
-    })
-  }
+  }, [contextRef, contextMenuList, currentObject])
 
   return (
     <>
diff --git a/src/hooks/module/useModulePlace.js b/src/hooks/module/useModulePlace.js
deleted file mode 100644
index 38e628a0..00000000
--- a/src/hooks/module/useModulePlace.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import { useEffect, useState } from 'react'
-import { useRecoilValue, useSetRecoilState } from 'recoil'
-import { moduleSelectionDataState, selectedModuleState } from '@/store/selectedModuleOptions'
-import { useMasterController } from '@/hooks/common/useMasterController'
-import { canvasSettingState, canvasState, currentCanvasPlanState, moduleSetupSurfaceState } from '@/store/canvasAtom'
-import { POLYGON_TYPE, BATCH_TYPE } from '@/common/common'
-import { useRoofFn } from '@/hooks/common/useRoofFn'
-import { roofDisplaySelector } from '@/store/settingAtom'
-import offsetPolygon from '@/util/qpolygon-utils'
-import { v4 as uuidv4 } from 'uuid'
-import { QPolygon } from '@/components/fabric/QPolygon'
-import { useEvent } from '@/hooks/useEvent'
-import { useSwal } from '@/hooks/useSwal'
-import { useMessage } from '@/hooks/useMessage'
-
-export function useModulePlace() {
-  const canvas = useRecoilValue(canvasState)
-  const moduleSelectionData = useRecoilValue(moduleSelectionDataState)
-  const [trestleDetailParams, setTrestleDetailParams] = useState([])
-  const [trestleDetailList, setTrestleDetailList] = useState([])
-  const selectedModules = useRecoilValue(selectedModuleState)
-  const { getTrestleDetailList } = useMasterController()
-  const canvasSetting = useRecoilValue(canvasSettingState)
-  const { setSurfaceShapePattern } = useRoofFn()
-  const roofDisplay = useRecoilValue(roofDisplaySelector)
-  const { addTargetMouseEventListener } = useEvent()
-  const setModuleSetupSurface = useSetRecoilState(moduleSetupSurfaceState)
-  const [saleStoreNorthFlg, setSaleStoreNorthFlg] = useState(false)
-  const { swalFire } = useSwal()
-  const { getMessage } = useMessage()
-
-  return {
-    selectedModules,
-  }
-}
diff --git a/src/hooks/useContextMenu.js b/src/hooks/useContextMenu.js
index 8eb4d69e..fe6d800e 100644
--- a/src/hooks/useContextMenu.js
+++ b/src/hooks/useContextMenu.js
@@ -81,9 +81,9 @@ export function useContextMenu() {
     switch (selectedMenu) {
       case 'outline':
         break
-      default:
-        setContextMenu([])
-        break
+      // default:
+      //   setContextMenu([])
+      //   break
     }
   }
 

From 26047df3c8c8f7bfc351a9f04b58d354441c5252 Mon Sep 17 00:00:00 2001
From: yoosangwook <swyoo@interplug.co.kr>
Date: Fri, 21 Mar 2025 11:28:16 +0900
Subject: [PATCH 13/15] =?UTF-8?q?feat:=20=ED=95=AB=ED=82=A4=20=EC=9D=B4?=
 =?UTF-8?q?=EB=B2=A4=ED=8A=B8=20=EB=93=B1=EB=A1=9D=20=EC=83=98=ED=94=8C=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/floor-plan/CanvasFrame.jsx | 33 +++++++++++++++++++++++
 src/store/hotkeyAtom.js                   |  6 +++++
 2 files changed, 39 insertions(+)
 create mode 100644 src/store/hotkeyAtom.js

diff --git a/src/components/floor-plan/CanvasFrame.jsx b/src/components/floor-plan/CanvasFrame.jsx
index ddce32a6..1167bd97 100644
--- a/src/components/floor-plan/CanvasFrame.jsx
+++ b/src/components/floor-plan/CanvasFrame.jsx
@@ -30,6 +30,7 @@ import { useCanvasSetting } from '@/hooks/option/useCanvasSetting'
 import { useCanvasMenu } from '@/hooks/common/useCanvasMenu'
 import { useEvent } from '@/hooks/useEvent'
 import { compasDegAtom } from '@/store/orientationAtom'
+import { hotkeyStore } from '@/store/hotkeyAtom'
 
 export default function CanvasFrame() {
   const canvasRef = useRef(null)
@@ -110,6 +111,38 @@ export default function CanvasFrame() {
     resetPcsCheckState()
   }
 
+  /**
+   * 캔버스가 있을 경우 핫키 이벤트 처리
+   * hotkeyStore에 핫키 이벤트 리스너 추가
+   * 
+   * const hotkeys = [
+      { key: 'c', fn: () => asdf() },
+      { key: 'v', fn: () => qwer() },
+    ]
+    setHotkeyStore(hotkeys)
+   */
+  const [hotkeyState, setHotkeyState] = useRecoilState(hotkeyStore)
+  const hotkeyHandlerRef = useRef(null)
+
+  useEffect(() => {
+    hotkeyHandlerRef.current = (e) => {
+      hotkeyState.forEach((hotkey) => {
+        if (e.key === hotkey.key) {
+          hotkey.fn()
+        }
+      })
+    }
+
+    document.addEventListener('keyup', hotkeyHandlerRef.current)
+
+    return () => {
+      if (hotkeyHandlerRef.current) {
+        document.removeEventListener('keyup', hotkeyHandlerRef.current)
+      }
+    }
+  }, [hotkeyState])
+  /** 핫키 이벤트 처리 끝 */
+
   return (
     <div className="canvas-frame">
       <canvas ref={canvasRef} id="canvas" style={{ position: 'relative' }}></canvas>
diff --git a/src/store/hotkeyAtom.js b/src/store/hotkeyAtom.js
new file mode 100644
index 00000000..1ad0d43c
--- /dev/null
+++ b/src/store/hotkeyAtom.js
@@ -0,0 +1,6 @@
+import { atom } from 'recoil'
+
+export const hotkeyStore = atom({
+  key: 'hotkeyState',
+  default: [],
+})

From 5979555bcbf45fbc1e857d6711688f453f803875 Mon Sep 17 00:00:00 2001
From: basssy <basssy@interplug.co.kr>
Date: Fri, 21 Mar 2025 13:26:14 +0900
Subject: [PATCH 14/15] =?UTF-8?q?=EA=B2=AC=EC=A0=81=EC=84=9C=20=EB=B3=B5?=
 =?UTF-8?q?=EC=82=AC=20=EC=8B=A4=ED=8C=A8=20=EB=A9=94=EC=84=B8=EC=A7=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../estimate/useEstimateController.js         | 40 +++++++++++--------
 src/locales/ja.json                           |  3 +-
 src/locales/ko.json                           |  3 +-
 3 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/src/hooks/floorPlan/estimate/useEstimateController.js b/src/hooks/floorPlan/estimate/useEstimateController.js
index d509a1e0..e50572b8 100644
--- a/src/hooks/floorPlan/estimate/useEstimateController.js
+++ b/src/hooks/floorPlan/estimate/useEstimateController.js
@@ -462,24 +462,30 @@ export const useEstimateController = (planNo, flag) => {
     }
 
     setIsGlobalLoading(true)
-    await promisePost({ url: '/api/estimate/save-estimate-copy', data: params }).then((res) => {
-      setIsGlobalLoading(false)
-      if (res.status === 201) {
-        if (isObjectNotEmpty(res.data)) {
-          let newObjectNo = res.data.objectNo
-          swalFire({
-            text: getMessage('estimate.detail.estimateCopyPopup.copy.alertMessage'),
-            type: 'alert',
-            confirmFn: () => {
-              setEstimateCopyPopupOpen(false) //팝업닫고
-              router.push(`/management/stuff/detail?objectNo=${newObjectNo.toString()}`, { scroll: false })
-            },
-          })
-        }
-      } else {
+    await promisePost({ url: '/api/estimate/save-estimate-copy', data: params })
+      .then((res) => {
         setIsGlobalLoading(false)
-      }
-    })
+        if (res.status === 201) {
+          if (isObjectNotEmpty(res.data)) {
+            let newObjectNo = res.data.objectNo
+            swalFire({
+              text: getMessage('estimate.detail.estimateCopyPopup.copy.alertMessage'),
+              type: 'alert',
+              confirmFn: () => {
+                setEstimateCopyPopupOpen(false) //팝업닫고
+                router.push(`/management/stuff/detail?objectNo=${newObjectNo.toString()}`, { scroll: false })
+              },
+            })
+          }
+        } else {
+          setIsGlobalLoading(false)
+        }
+      })
+      .catch((e) => {
+        console.error('캔버스 복사 중 오류 발생')
+        swalFire({ text: getMessage('estimate.detail.estimateCopyPopup.copy.alertMessageError'), type: 'alert', icon: 'error' })
+        setIsGlobalLoading(false)
+      })
   }
 
   const checkLength = (value) => {
diff --git a/src/locales/ja.json b/src/locales/ja.json
index 8aede254..abc9b5cf 100644
--- a/src/locales/ja.json
+++ b/src/locales/ja.json
@@ -958,6 +958,7 @@
   "estimate.detail.estimateCopyPopup.close": "閉じる",
   "estimate.detail.estimateCopyPopup.copyBtn": "見積コピー",
   "estimate.detail.estimateCopyPopup.copy.alertMessage": "見積書がコピーされました。コピーした見積情報に移動します。",
+  "estimate.detail.estimateCopyPopup.copy.alertMessageError": "キャンバスのコピー中にエラーが発生しました.",
   "estimate.detail.productFeaturesPopup.title": "製品特異事項",
   "estimate.detail.productFeaturesPopup.close": "閉じる",
   "estimate.detail.productFeaturesPopup.requiredStoreId": "一次販売店は必須です。",
@@ -1039,5 +1040,5 @@
   "modal.placement.initial.setting.plan.drawing.only.number": "(※数字は[半角]入力のみ可能です。)",
   "wall.line.not.found": "外壁がありません",
   "roof.line.not.found": "屋根形状がありません",
-  "roof.material.can.not.delete" : "割り当てられた配置面があります。"
+  "roof.material.can.not.delete": "割り当てられた配置面があります。"
 }
diff --git a/src/locales/ko.json b/src/locales/ko.json
index 27ba2da2..3ea284e2 100644
--- a/src/locales/ko.json
+++ b/src/locales/ko.json
@@ -958,6 +958,7 @@
   "estimate.detail.estimateCopyPopup.close": "닫기",
   "estimate.detail.estimateCopyPopup.copyBtn": "견적복사",
   "estimate.detail.estimateCopyPopup.copy.alertMessage": "견적서가 복사되었습니다. 복사된 물건정보로 이동합니다.",
+  "estimate.detail.estimateCopyPopup.copy.alertMessageError": "캔버스 복사 중 오류 발생.",
   "estimate.detail.productFeaturesPopup.title": "제품특이사항",
   "estimate.detail.productFeaturesPopup.close": "닫기",
   "estimate.detail.productFeaturesPopup.requiredStoreId": "1차 판매점은 필수값 입니다.",
@@ -1039,5 +1040,5 @@
   "modal.placement.initial.setting.plan.drawing.only.number": "(※ 숫자는 [반각]입력만 가능합니다.)",
   "wall.line.not.found": "외벽선이 없습니다.",
   "roof.line.not.found": "지붕형상이 없습니다.",
-  "roof.material.can.not.delete" : "할당된 배치면이 있습니다."
+  "roof.material.can.not.delete": "할당된 배치면이 있습니다."
 }

From f2470b346c3d45e9e9790e84d021adef589b8a37 Mon Sep 17 00:00:00 2001
From: yoosangwook <swyoo@interplug.co.kr>
Date: Fri, 21 Mar 2025 14:23:46 +0900
Subject: [PATCH 15/15] =?UTF-8?q?feat:=20=ED=95=AB=ED=82=A4=20=EC=9D=B4?=
 =?UTF-8?q?=EB=B2=A4=ED=8A=B8=20=EB=93=B1=EB=A1=9D=EC=8B=9C=20=EA=B5=AC?=
 =?UTF-8?q?=EB=AC=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/floor-plan/CanvasFrame.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/floor-plan/CanvasFrame.jsx b/src/components/floor-plan/CanvasFrame.jsx
index 1167bd97..4f957598 100644
--- a/src/components/floor-plan/CanvasFrame.jsx
+++ b/src/components/floor-plan/CanvasFrame.jsx
@@ -121,7 +121,7 @@ export default function CanvasFrame() {
     ]
     setHotkeyStore(hotkeys)
    */
-  const [hotkeyState, setHotkeyState] = useRecoilState(hotkeyStore)
+  const hotkeyState = useRecoilValue(hotkeyStore)
   const hotkeyHandlerRef = useRef(null)
 
   useEffect(() => {