Merge branch 'dev' into dev-yj

src/components/floor-plan/CanvasMenu.jsx

@@ -193,7 +193,7 @@ export default function CanvasMenu(props) {
                 setType('surface')
               },
               denyFn: () => {
-                setType('surface')
+                return
               },
             })
           }

src/hooks/module/useModuleBasicSetting.js

@@ -277,10 +277,23 @@ export function useModuleBasicSetting(tabNum) {
 
         //바로 들어올때
         const setupModules = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE)
+        const eaveBars = canvas.getObjects().filter((obj) => obj.name === 'eaveBar' || obj.name === 'halfEaveBar')
+        const racks = canvas.getObjects().filter((obj) => obj.name === 'rack' || obj.name === 'smartRack')
+        const brackets = canvas.getObjects().filter((obj) => obj.name === 'brackets')
         setupModules.forEach((obj) => {
           canvas.bringToFront(obj)
         })
 
+        eaveBars.forEach((obj) => {
+          canvas.bringToFront(obj)
+        })
+        racks.forEach((obj) => {
+          canvas.bringToFront(obj)
+        })
+        brackets.forEach((obj) => {
+          canvas.bringToFront(obj)
+        })
+
         //모듈설치면 클릭이벤트
         addTargetMouseEventListener('mousedown', setupSurface, function () {
           toggleSelection(setupSurface)