Merge branch 'qcast-pub' into dev

src/components/floor-plan/CanvasFrame.jsx

@@ -13,7 +13,7 @@ import { useContextMenu } from '@/hooks/useContextMenu'
 import { useCanvasConfigInitialize } from '@/hooks/common/useCanvasConfigInitialize'
 import { currentMenuState } from '@/store/canvasAtom'
 import { totalDisplaySelector } from '@/store/settingAtom'
-import { MENU } from '@/common/common'
+import { MENU, POLYGON_TYPE } from '@/common/common'
 import { FloorPlanContext } from '@/app/floor-plan/FloorPlanProvider'
 import { QcastContext } from '@/app/QcastProvider'
 import {
@@ -27,6 +27,7 @@ import {
 } from '@/store/circuitTrestleAtom'
 import { useCanvasPopupStatusController } from '@/hooks/common/useCanvasPopupStatusController'
 import { useCanvasSetting } from '@/hooks/option/useCanvasSetting'
+import { useCanvasMenu } from '@/hooks/common/useCanvasMenu'
 
 export default function CanvasFrame() {
   const canvasRef = useRef(null)
@@ -47,6 +48,7 @@ export default function CanvasFrame() {
   const resetPcsCheckState = useResetRecoilState(pcsCheckState)
   const { handleModuleSelectionTotal } = useCanvasPopupStatusController()
   const { fetchBasicSettings } = useCanvasSetting()
+  const { setSelectedMenu } = useCanvasMenu()
 
   const loadCanvas = () => {
     if (!canvas) return
@@ -58,6 +60,10 @@ export default function CanvasFrame() {
         canvas?.loadFromJSON(JSON.parse(plan.canvasStatus), function () {
           canvasLoadInit() //config된 상태로 캔버스 객체를 그린다
           canvas?.renderAll() // 캔버스를 다시 그립니다.
+
+          if (canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE).length > 0) {
+            setSelectedMenu('module')
+          }
         })
       }
     }

src/components/floor-plan/modal/roofAllocation/ContextRoofAllocationSetting.jsx

@@ -85,7 +85,7 @@ export default function ContextRoofAllocationSetting(props) {
                   }}
                 >
                   <i className="edit-ico"></i>
-                  {getMessage('modal.common.add')}
+                  {getMessage('modal.roof.alloc.add.roof.material')}
                 </button>
               </div>
               <div className="grid-option-overflow">

src/components/floor-plan/modal/roofAllocation/RoofAllocationSetting.jsx

@@ -85,7 +85,7 @@ export default function RoofAllocationSetting(props) {
                   }}
                 >
                   <i className="edit-ico"></i>
-                  {getMessage('modal.common.add')}
+                  {getMessage('modal.roof.alloc.add.roof.material')}
                 </button>
               </div>
               <div className="grid-option-overflow">

src/locales/ja.json

@@ -174,6 +174,7 @@
   "modal.roof.alloc.info": "※配置面初期設定で保存した[基本屋根材]を変更したり、屋根材を追加して割り当てることができます。",
   "modal.roof.alloc.default.roof.material": "基本屋根材",
   "modal.roof.alloc.select.roof.material": "屋根材の選択",
+  "modal.roof.alloc.add.roof.material": "지붕재 추가(JA)",
   "modal.roof.alloc.select.parallel": "筋配置",
   "modal.roof.alloc.select.stairs": "千鳥配置",
   "modal.roof.alloc.apply": "選択した屋根材として割り当て",

src/locales/ko.json

@@ -174,6 +174,7 @@
   "modal.roof.alloc.info": "※ 배치면 초기설정에서 저장한 [기본 지붕재]를 변경하거나  지붕재를 추가하여 할당할 수 있습니다.",
   "modal.roof.alloc.default.roof.material": "기본 지붕재",
   "modal.roof.alloc.select.roof.material": "지붕재 선택",
+  "modal.roof.alloc.add.roof.material": "지붕재 추가",
   "modal.roof.alloc.select.parallel": "병렬식",
   "modal.roof.alloc.select.stairs": "계단식",
   "modal.roof.alloc.apply": "선택한 지붕재로 할당",