Merge branch 'feature/yj-layoutSetup' of https://git.hanasys.jp/qcast3/qcast-front into feature/yj-layoutSetup

# Conflicts:
#	src/components/floor-plan/modal/basic/BasicSetting.jsx
#	src/components/floor-plan/modal/basic/step/Trestle.jsx

src/components/floor-plan/modal/basic/BasicSetting.jsx

@@ -1,8 +1,6 @@
 import { useMessage } from '@/hooks/useMessage'
 import WithDraggable from '@/components/common/draggable/WithDraggable'
 import { useContext, useEffect, useRef, useState } from 'react'
-import Module from '@/components/floor-plan/modal/basic/step/Module'
-import PitchModule from '@/components/floor-plan/modal/basic/step/pitch/PitchModule'
 import PitchPlacement from '@/components/floor-plan/modal/basic/step/pitch/PitchPlacement'
 import Placement from '@/components/floor-plan/modal/basic/step/Placement'
 import { useRecoilValue, useRecoilState } from 'recoil'
@@ -37,9 +35,9 @@ export default function BasicSetting({ id, pos = { x: 50, y: 230 } }) {
   const { closePopup } = usePopup()
   const [tabNum, setTabNum] = useState(1)
   const orientationRef = useRef(null)
+  const [isManualModuleSetup, setIsManualModuleSetup] = useRecoilState(isManualModuleSetupState)
+  const [isManualModuleLayoutSetup, setIsManualModuleLayoutSetup] = useRecoilState(isManualModuleLayoutSetupState)
   const trestleRef = useRef(null)
-  const { initEvent } = useEvent()
-
   const [moduleSelectionData, setModuleSelectionData] = useRecoilState(moduleSelectionDataState)
   const [addedRoofs, setAddedRoofs] = useRecoilState(addedRoofsState)
   const loginUserState = useRecoilValue(loginUserStore)
@@ -48,12 +46,10 @@ export default function BasicSetting({ id, pos = { x: 50, y: 230 } }) {
   const [basicSetting, setBasicSettings] = useRecoilState(basicSettingState)
   const [isClosePopup, setIsClosePopup] = useState({ close: false, id: 0 })
   const [checkedModules, setCheckedModules] = useRecoilState(checkedModuleState)
+  const [roofs, setRoofs] = useState(addedRoofs)
   const [manualSetupMode, setManualSetupMode] = useRecoilState(toggleManualSetupModeState)
   const [layoutSetup, setLayoutSetup] = useState([{}])
-  const [isManualModuleSetup, setIsManualModuleSetup] = useRecoilState(isManualModuleSetupState)
-  const [isManualModuleLayoutSetup, setIsManualModuleLayoutSetup] = useRecoilState(isManualModuleLayoutSetupState)
 
-  const [roofs, setRoofs] = useState(addedRoofs)
   const {
     moduleSelectionInitParams,
     selectedModules,
@@ -137,7 +133,7 @@ export default function BasicSetting({ id, pos = { x: 50, y: 230 } }) {
 
   useEffect(() => {
     if (basicSetting.roofSizeSet !== '3') {
-      manualModuleSetup(placementRef)
+      manualModuleSetup()
     } else {
       manualFlatroofModuleSetup(placementFlatRef)
     }
@@ -176,7 +172,7 @@ export default function BasicSetting({ id, pos = { x: 50, y: 230 } }) {
 
         if (!trestleRef.current.isComplete()) {
           Swal.fire({
-            title: getMessage('아직 멀었따'),
+            title: getMessage('construction.length.difference'),
             icon: 'warning',
           })
           return
@@ -305,7 +301,7 @@ export default function BasicSetting({ id, pos = { x: 50, y: 230 } }) {
   }, [checkedModules])
 
   return (
-    <WithDraggable isShow={true} pos={pos} className="ll">
+    <WithDraggable isShow={true} pos={pos} className={basicSetting.roofSizeSet && basicSetting.roofSizeSet != '3' ? 'll' : 'lx-2'}>
       <WithDraggable.Header title={getMessage('plan.menu.module.circuit.setting.default')} onClose={() => handleClosePopup(id)} />
       <WithDraggable.Body>
         <div className="roof-module-tab">
@@ -355,13 +351,12 @@ export default function BasicSetting({ id, pos = { x: 50, y: 230 } }) {
             <>
               {basicSetting.roofSizeSet && basicSetting.roofSizeSet != '3' && (
                 <>
-                  <button className="btn-frame modal mr5">{getMessage('modal.module.basic.setting.row.batch')}</button>
+                  <button className={`btn-frame modal mr5 ${isManualModuleLayoutSetup ? 'act' : ''}`} onClick={handleManualModuleLayoutSetup}>
+                    {getMessage('modal.module.basic.setting.row.batch')}
+                  </button>
                   <button className={`btn-frame modal mr5 ${isManualModuleSetup ? 'act' : ''}`} onClick={handleManualModuleSetup}>
                     {getMessage('modal.module.basic.setting.passivity.placement')}
                   </button>
-                  <button className={`btn-frame modal mr5 ${isManualModuleLayoutSetup ? 'act' : ''}`} onClick={handleManualModuleLayoutSetup}>
-                    {getMessage('modal.module.basic.setting.layoutpassivity.placement')}
-                  </button>
                   <button className="btn-frame modal act" onClick={() => autoModuleSetup()}>
                     {getMessage('modal.module.basic.setting.auto.placement')}
                   </button>

src/components/floor-plan/modal/basic/step/Trestle.jsx

@@ -172,7 +172,6 @@ const Trestle = forwardRef((props, ref) => {
           snowGdPossYn,
           cvrChecked,
           snowGdChecked,
-          trestleDetail,
         }
       }
       return { ...roof }