Merge branch 'dev' of https://git.jetbrains.space/nalpari/q-cast-iii/qcast-front into dev

# Conflicts:
#	src/components/floor-plan/CanvasMenu.jsx

src/components/floor-plan/CanvasMenu.jsx

@@ -1,10 +1,13 @@
 'use client'
 
 import { useEffect, useState } from 'react'
+
+import { useRecoilState, useRecoilValue, useSetRecoilState } from 'recoil'
+
 import MenuDepth01 from './MenuDepth01'
 import QSelectBox from '@/components/common/select/QSelectBox'
+
 import { useMessage } from '@/hooks/useMessage'
-import { useRecoilState, useRecoilValue, useSetRecoilState } from 'recoil'
 import { canvasState, canvasZoomState, currentMenuState, verticalHorizontalModeState } from '@/store/canvasAtom'
 import { outerLinePointsState } from '@/store/outerLineAtom'
 import { appMessageStore, globalLocaleStore } from '@/store/localeAtom'
@@ -15,16 +18,20 @@ import JA from '@/locales/ja.json'
 
 export default function CanvasMenu(props) {
   const { setShowCanvasSettingModal, showOutlineModal, setShowOutlineModal } = props
+
   const [menuNumber, setMenuNumber] = useState(null)
-  const [verticalHorizontalMode, setVerticalHorizontalMode] = useRecoilState(verticalHorizontalModeState)
   const [type, setType] = useState('')
-  const { getMessage } = useMessage()
+
-  const [canvasZoom, setCanvasZoom] = useRecoilState(canvasZoomState)
+  const [verticalHorizontalMode, setVerticalHorizontalMode] = useRecoilState(verticalHorizontalModeState)
-  const canvas = useRecoilValue(canvasState)
+  const [appMessageState, setAppMessageState] = useRecoilState(appMessageStore)
   const setCurrentMenu = useSetRecoilState(currentMenuState)
   const setPoints = useSetRecoilState(outerLinePointsState)
+
+  const [canvasZoom, setCanvasZoom] = useRecoilState(canvasZoomState)
   const globalLocale = useRecoilValue(globalLocaleStore)
-  const [appMessageState, setAppMessageState] = useRecoilState(appMessageStore)
+  const canvas = useRecoilValue(canvasState)
+
+  const { getMessage } = useMessage()
 
   const SelectOption = [{ name: '瓦53A' }, { name: '瓦53A' }]
   const onClickNav = (number) => {
@@ -38,14 +45,6 @@ export default function CanvasMenu(props) {
     type,
   }
 
-  useEffect(() => {
-    if (globalLocale === 'ko') {
-      setAppMessageState(KO)
-    } else {
-      setAppMessageState(JA)
-    }
-  }, [menuNumber, type, globalLocale])
-
   // 저장버튼(btn08) 클릭 시 호출되는 함수
   const handleSaveSettings = async () => {}
 
@@ -61,6 +60,14 @@ export default function CanvasMenu(props) {
     canvas.renderAll()
   }
 
+  useEffect(() => {
+    if (globalLocale === 'ko') {
+      setAppMessageState(KO)
+    } else {
+      setAppMessageState(JA)
+    }
+  }, [menuNumber, type, globalLocale])
+
   return (
     <div className={`canvas-menu-wrap ${menuNumber === 2 || menuNumber === 3 || menuNumber === 4 ? 'active' : ''}`}>
       <div className="canvas-menu-inner">