From 8de8416160b822ae4b142dab68e2cb3b2a380158 Mon Sep 17 00:00:00 2001
From: yjnoh <yjnoh@interplug.co.kr>
Date: Wed, 23 Apr 2025 10:10:57 +0900
Subject: [PATCH 1/2] =?UTF-8?q?managementStateLoaded=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modal/circuitTrestle/CircuitTrestleSetting.jsx |  3 ---
 .../step/type/PassivityCircuitAllocation.jsx       |  4 +---
 src/hooks/useEstimate.js                           | 14 ++++++++------
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx
index a836044e..501302e3 100644
--- a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx
+++ b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx
@@ -83,9 +83,6 @@ export default function CircuitTrestleSetting({ id }) {
   } = useCircuitTrestle()
   // const { trigger: moduleSelectedDataTrigger } = useCanvasPopupStatusController(2)
   useEffect(() => {
-    if (!managementState) {
-      setManagementState(managementStateLoaded)
-    }
     // setCircuitData({
     //   makers,
     //   selectedMaker,
diff --git a/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx b/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx
index e009a864..3c53b94f 100644
--- a/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx
+++ b/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx
@@ -37,9 +37,7 @@ export default function PassivityCircuitAllocation(props) {
   const circuitNumberText = useRecoilValue(fontSelector('circuitNumberText'))
   useEffect(() => {
     setModuleStatisticsData()
-    if (!managementState) {
-      setManagementState(managementStateLoaded)
-    }
+
     canvas
       .getObjects()
       .filter((obj) => obj.name === POLYGON_TYPE.MODULE)
diff --git a/src/hooks/useEstimate.js b/src/hooks/useEstimate.js
index fae0b558..3536fda9 100644
--- a/src/hooks/useEstimate.js
+++ b/src/hooks/useEstimate.js
@@ -13,7 +13,7 @@ import { useTrestle } from '@/hooks/module/useTrestle'
 import { usePlan } from '@/hooks/usePlan'
 
 export function useEstimate() {
-  const { managementStateLoaded } = useContext(GlobalDataContext)
+  const { managementState } = useContext(GlobalDataContext)
   const { setIsGlobalLoading } = useContext(QcastContext)
   const router = useRouter()
   const loginUserState = useRecoilValue(loginUserStore)
@@ -31,16 +31,18 @@ export function useEstimate() {
    * @param {Object} estimateParam - 견적서 저장 데이터
    */
   const saveEstimate = async (estimateParam) => {
+    console.log('managementState', managementState)
+
     const userId = loginUserState.userId
-    const saleStoreId = managementStateLoaded.saleStoreId
+    const saleStoreId = managementState.saleStoreId
     const objectNo = currentCanvasPlan.objectNo
     const planNo = currentCanvasPlan.planNo
     const slope = estimateParam.roofSurfaceList[0].slope
     const angle = estimateParam.roofSurfaceList[0].angle
-    const surfaceType = managementStateLoaded.surfaceType
-    const setupHeight = managementStateLoaded.installHeight
-    const standardWindSpeedId = managementStateLoaded.standardWindSpeedId
-    const snowfall = managementStateLoaded.verticalSnowCover
+    const surfaceType = managementState.surfaceType
+    const setupHeight = managementState.installHeight
+    const standardWindSpeedId = managementState.standardWindSpeedId
+    const snowfall = managementState.verticalSnowCover
     const drawingFlg = '1'
 
     const saveEstimateData = {

From a652d09b8d7eb99f879f05d7a180d114e67bc91e Mon Sep 17 00:00:00 2001
From: yjnoh <yjnoh@interplug.co.kr>
Date: Tue, 13 May 2025 10:46:26 +0900
Subject: [PATCH 2/2] =?UTF-8?q?[1036]=20:=20[=E3=83=97=E3=83=A9=E3=83=B3?=
 =?UTF-8?q?=E3=82=92=E3=82=B3=E3=83=94=E3=83=BC/=E7=A7=BB=E5=8B=95?=
 =?UTF-8?q?=E3=81=99=E3=82=8B=E6=99=82=E3=81=AE=E8=87=AA=E5=8B=95=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E3=81=AB=E3=81=A4=E3=81=84=E3=81=A6]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[작업내용] : 탭간 이동, 복사시 저장 여부 확인 로직 추가
---
 src/components/floor-plan/CanvasLayout.jsx    |  2 +-
 .../floor-plan/modal/basic/step/Placement.jsx | 19 ++++-----
 src/hooks/useCanvasEvent.js                   | 12 +++++-
 src/hooks/usePlan.js                          | 40 +++++++++++++++----
 4 files changed, 53 insertions(+), 20 deletions(-)

diff --git a/src/components/floor-plan/CanvasLayout.jsx b/src/components/floor-plan/CanvasLayout.jsx
index 059e96aa..cce79df2 100644
--- a/src/components/floor-plan/CanvasLayout.jsx
+++ b/src/components/floor-plan/CanvasLayout.jsx
@@ -37,7 +37,7 @@ export default function CanvasLayout({ children }) {
             <button
               key={`plan-${plan.id}`}
               className={`canvas-page-box ${plan.isCurrent === true ? 'on' : ''}`}
-              onClick={() => handleCurrentPlan(plan.id)}
+              onClick={() => (plan.isCurrent ? '' : handleCurrentPlan(plan.id))}
             >
               <span>{`Plan ${plan.planNo}`}</span>
               {plans.length > 1 && !pathname.includes('/estimate') && !pathname.includes('/simulator') && (
diff --git a/src/components/floor-plan/modal/basic/step/Placement.jsx b/src/components/floor-plan/modal/basic/step/Placement.jsx
index 1d2545e6..ffb96d83 100644
--- a/src/components/floor-plan/modal/basic/step/Placement.jsx
+++ b/src/components/floor-plan/modal/basic/step/Placement.jsx
@@ -180,8 +180,8 @@ const Placement = forwardRef((props, refs) => {
                   ))}
                 </thead>
                 <tbody>
-                  {selectedModules.itemList &&
-                    selectedModules.itemList.map((item, index) => (
+                  {selectedModules?.itemList &&
+                    selectedModules?.itemList?.map((item, index) => (
                       <tr key={index}>
                         <td className="al-c">
                           <div className="d-check-box no-text pop">
@@ -329,7 +329,7 @@ const Placement = forwardRef((props, refs) => {
                 <tr>
                   <th rowSpan={2} style={{ width: '22%' }}></th>
                   {selectedModules &&
-                    selectedModules.itemList.map((item) => (
+                    selectedModules.itemList?.map((item) => (
                       // <th colSpan={colspan}>
                       <th>
                         <div className="color-wrap">
@@ -341,12 +341,13 @@ const Placement = forwardRef((props, refs) => {
                   {colspan > 1 && <th rowSpan={2}>{getMessage('modal.module.basic.setting.module.placement.max.rows.multiple')}</th>}
                 </tr>
                 <tr>
-                  {selectedModules.itemList.map((item) => (
-                    <>
-                      <th>{getMessage('modal.module.basic.setting.module.placement.max.row')}</th>
-                      {/* {colspan > 1 && <th>{getMessage('modal.module.basic.setting.module.placement.max.rows.multiple')}</th>} */}
-                    </>
-                  ))}
+                  {selectedModules &&
+                    selectedModules.itemList?.map((item) => (
+                      <>
+                        <th>{getMessage('modal.module.basic.setting.module.placement.max.row')}</th>
+                        {/* {colspan > 1 && <th>{getMessage('modal.module.basic.setting.module.placement.max.rows.multiple')}</th>} */}
+                      </>
+                    ))}
                 </tr>
               </thead>
               <tbody>
diff --git a/src/hooks/useCanvasEvent.js b/src/hooks/useCanvasEvent.js
index 22aad7cf..71140097 100644
--- a/src/hooks/useCanvasEvent.js
+++ b/src/hooks/useCanvasEvent.js
@@ -206,9 +206,17 @@ export function useCanvasEvent() {
         selected.forEach((obj) => {
           // if (obj.type === 'QPolygon' && currentMenu !== MENU.MODULE_CIRCUIT_SETTING.BASIC_SETTING) {
           if (obj.type === 'QPolygon') {
+            const originStroke = obj.stroke
             obj.set({ stroke: 'red' })
-            if (obj.name === POLYGON_TYPE.MODULE && currentMenu === MENU.MODULE_CIRCUIT_SETTING.BASIC_SETTING) {
-              obj.set({ strokeWidth: 3 })
+
+            if (currentMenu === MENU.MODULE_CIRCUIT_SETTING.BASIC_SETTING) {
+              if (obj.name === POLYGON_TYPE.MODULE) {
+                obj.set({ strokeWidth: 3 })
+              }
+              if (obj.name === POLYGON_TYPE.ROOF) {
+                canvas.discardActiveObject()
+                obj.set({ stroke: originStroke })
+              }
             }
           }
         })
diff --git a/src/hooks/usePlan.js b/src/hooks/usePlan.js
index 74c03296..15783727 100644
--- a/src/hooks/usePlan.js
+++ b/src/hooks/usePlan.js
@@ -407,12 +407,21 @@ export function usePlan(params = {}) {
           }
         })
     } else {
-      if (!currentCanvasPlan || currentCanvasPlan.id !== newCurrentId) {
-        await saveCanvas(true)
-        clearRecoilState()
-      }
-      setCurrentCanvasPlan(plans.find((plan) => plan.id === newCurrentId))
-      setPlans((plans) => plans.map((plan) => ({ ...plan, isCurrent: plan.id === newCurrentId })))
+      swalFire({
+        text: getMessage('plan.message.confirm.save'),
+        type: 'confirm',
+        confirmFn: async () => {
+          //저장 전에 플랜이 이동되어 state가 변경되는 이슈가 있음
+          await saveCanvas(true)
+          clearRecoilState()
+          setCurrentCanvasPlan(plans.find((plan) => plan.id === newCurrentId))
+          setPlans((plans) => plans.map((plan) => ({ ...plan, isCurrent: plan.id === newCurrentId })))
+        },
+        denyFn: async () => {
+          setCurrentCanvasPlan(plans.find((plan) => plan.id === newCurrentId))
+          setPlans((plans) => plans.map((plan) => ({ ...plan, isCurrent: plan.id === newCurrentId })))
+        },
+      })
     }
   }
 
@@ -447,9 +456,25 @@ export function usePlan(params = {}) {
    * @param {string} objectNo - 물건번호
    */
   const handleAddPlan = async (userId, objectNo) => {
+    let isSelected = false
+
     if (currentCanvasPlan?.id) {
-      await saveCanvas(false)
+      swalFire({
+        text: getMessage('plan.message.confirm.save'),
+        type: 'confirm',
+        confirmFn: async () => {
+          //저장 전에 플랜이 이동되어 state가 변경되는 이슈가 있음
+          await saveCanvas(true)
+          handleAddPlanCopyConfirm(userId, objectNo)
+        },
+        denyFn: async () => {
+          handleAddPlanCopyConfirm(userId, objectNo)
+        },
+      })
     }
+  }
+
+  const handleAddPlanCopyConfirm = async (userId, objectNo) => {
     if (JSON.parse(currentCanvasData()).objects.length > 0) {
       swalFire({
         text: `Plan ${currentCanvasPlan.planNo} ` + getMessage('plan.message.confirm.copy'),
@@ -471,7 +496,6 @@ export function usePlan(params = {}) {
       setIsGlobalLoading(false)
     }
   }
-
   /**
    * 물건번호(object) plan 삭제 (canvas 삭제 전 planNo 삭제)
    *