fix: Resolve conflict

src/components/floor-plan/CanvasMenu.jsx

@@ -1,20 +1,9 @@
 'use client'
-import { useState } from 'react'
-import { useRecoilState } from 'recoil'
-import { modalState } from '@/store/modalAtom'
-import { settingModalFirstOptionsState } from '@/store/settingAtom'
 import { useEffect, useState } from 'react'
 import MenuDepth01 from './MenuDepth01'
 import QSelectBox from '@/components/common/select/QSelectBox'
 import { useMessage } from '@/hooks/useMessage'
-import { post } from '@/lib/Axios'
-import { currentMenuState } from '@/store/canvasAtom'
-import { MENU } from '@/common/common'
-import RoofCoveringMenu from '@/components/floor-plan/RoofCoveringMenu'
 
-export default function CanvasMenu() {
-  const [objectNo, setObjectNo] = useState('test123240912001')
-  const [modalOption, setModalOption] = useRecoilState(modalState) //modal 열림닫힘 state
 export default function CanvasMenu(props) {
   const { setShowCanvasSettingModal, showOutlineModal, setShowOutlineModal } = props
   const [menuNumber, setMenuNumber] = useState(null)
@@ -22,64 +11,12 @@ export default function CanvasMenu(props) {
   const [type, setType] = useState('')
   const { getMessage } = useMessage()
   const SelectOption = [{ name: '瓦53A' }, { name: '瓦53A' }]
-  const [currentMenu, setCurrentMenu] = useRecoilState(currentMenuState)
-
-  const onClickNav = (menu) => {
-    setCurrentMenu(menu)
-  }
-
-  const settingsModalOptions = useRecoilState(settingModalFirstOptionsState)
-
-  // 저장버튼(btn08) 클릭 시 호출되는 함수
-  const handleSaveSettings = async () => {
-    try {
-      // 서버에 전송할 데이터
-      const dataToSend = {
-        option1: settingsModalOptions[0].option1.map((item) => ({
-          column: item.column,
-          selected: item.selected,
-        })),
-        option2: settingsModalOptions[0].option2.map((item) => ({
-          column: item.column,
-          selected: item.selected,
-        })),
-      }
-
-      const patternData = {
-        objectNo,
-        assignDisplay: dataToSend.option1[0].selected,
-        drawDisplay: dataToSend.option1[1].selected,
-        gridDisplay: dataToSend.option1[2].selected,
-        charDisplay: dataToSend.option1[3].selected,
-        flowDisplay: dataToSend.option1[4].selected,
-        hallwayDimenDisplay: dataToSend.option1[5].selected,
-        actualDimenDisplay: dataToSend.option1[6].selected,
-        noDimenDisplay: dataToSend.option1[7].selected,
-        trestleDisplay: dataToSend.option1[8].selected,
-        coordiDisplay: dataToSend.option1[9].selected,
-        drawConverDisplay: dataToSend.option1[10].selected,
-        onlyBorder: dataToSend.option2[0].selected,
-        lineHatch: dataToSend.option2[1].selected,
-        allPainted: dataToSend.option2[2].selected,
-      }
-
-      // HTTP POST 요청 보내기
-      const response = await post({ url: `/api/canvas-management/canvas-settings`, data: patternData })
-
-      // 응답 처리
-      console.log('서버 응답:', response.data)
-      alert('설정이 저장되었습니다.')
-    } catch (error) {
-      console.error('설정을 저장하는 동안 오류가 발생했습니다:', error)
-      alert('설정을 저장하는 중 오류가 발생했습니다.')
-    }
   const onClickNav = (number) => {
     setMenuNumber(number)
     if (number === 2) setType('outline')
     if (number === 3) setType('surface')
     if (number === 4) setType('module')
   }
-
   const menuProps = {
     setShowOutlineModal,
     type,
@@ -87,28 +24,21 @@ export default function CanvasMenu(props) {
   useEffect(() => {}, [menuNumber, type])
 
   return (
-    <div
+    <div className={`canvas-menu-wrap ${menuNumber === 2 || menuNumber === 3 || menuNumber === 4 ? 'active' : ''}`}>
-      className={`canvas-menu-wrap ${Object.values(MENU.ROOF_COVERING).includes(currentMenu) || menuNumber === 3 || menuNumber === 4 ? 'active' : ''}`}
-    >
       <div className="canvas-menu-inner">
         <ul className="canvas-menu-list">
-          <li className={`canvas-menu-item `} onClick={() => onClickNav(1)}>
+          <li className={`canvas-menu-item ${menuNumber === 0 ? 'active' : ''}`} onClick={() => onClickNav(0)}>
             <button>
               <span className="menu-icon con00"></span>
               {getMessage('plan.menu.plan.drawing')}
             </button>
           </li>
-          {
+          <li className={`canvas-menu-item ${menuNumber === 1 ? 'active' : ''}`} onClick={() => onClickNav(1)}>
-            <li
+            <button>
-              className={`canvas-menu-item ${currentMenu === MENU.INITIAL_CANVAS_SETTING ? 'active' : ''}`}
+              <span className="menu-icon con01"></span>
-              onClick={() => onClickNav(MENU.INITIAL_CANVAS_SETTING)}
+              {getMessage('plan.menu.placement.surface.initial.setting')}
-            >
+            </button>
-              <button>
+          </li>
-                <span className="menu-icon con01"></span>
-                {getMessage('plan.menu.placement.surface.initial.setting')}
-              </button>
-            </li>
-          }
           <li
             className={`canvas-menu-item ${menuNumber === 2 ? 'active' : ''}`}
             onClick={() => {
@@ -174,7 +104,7 @@ export default function CanvasMenu(props) {
               </div>
               <div className="btn-from">
                 <button className="btn07"></button>
-                <button className="btn08" onClick={handleSaveSettings}></button>
+                <button className="btn08"></button>
                 <button className="btn09"></button>
               </div>
             </>
@@ -218,13 +148,6 @@ export default function CanvasMenu(props) {
           )}
         </div>
       </div>
-      <div
-        className={`canvas-depth2-wrap ${Object.values(MENU.ROOF_COVERING).includes(currentMenu) || menuNumber === 3 || menuNumber === 4 ? 'active' : ''}`}
-      >
-        {Object.values(MENU.ROOF_COVERING).includes(currentMenu) && <RoofCoveringMenu />}
-        {/*{menuNumber === 2 && <MenuDepth01 />}
-        {menuNumber === 3 && <MenuDepth01 />}
-        {menuNumber === 4 && <MenuDepth01 />}*/}
       <div className={`canvas-depth2-wrap ${menuNumber === 2 || menuNumber === 3 || menuNumber === 4 ? 'active' : ''}`}>
         {menuNumber === 2 && <MenuDepth01 {...menuProps} />}
         {menuNumber === 3 && <MenuDepth01 {...menuProps} />}

src/components/floor-plan/modal/outerlinesetting/OuterLineWall.jsx

@@ -21,9 +21,6 @@ import { useLine } from '@/hooks/useLine'
 
 export default function OuterLineWall() {
   const [modalOption, setModalOption] = useRecoilState(modalState) //modal 열림닫힘 state
-export default function OuterLineWall(props) {
-  const { setShowOutlineModal } = props
-  const [buttonAct, setButtonAct] = useState(1)
   const { getMessage } = useMessage()
   const { addCanvasMouseEventListener, addDocumentEventListener, removeAllDocumentEventListeners } = useEvent()
   const { addLineText, removeLineText } = useLine()
@@ -64,8 +61,6 @@ export default function OuterLineWall(props) {
 
     setArrow1('')
     setArrow2('')
-  const HandleClickClose = () => {
-    setShowOutlineModal(false)
   }
 
   const mouseDown = (e) => {
@@ -357,8 +352,8 @@ export default function OuterLineWall(props) {
     })
   }
   return (
-    <WithDraggable isShow={true} pos={{ x: 50, y: -1000 + 50 }}>
+    <WithDraggable isShow={true}>
-      <div className={`modal-pop-wrap ssm `}>
+      <div className={`modal-pop-wrap ssm ${modalOption.outerwall ? 'mount' : ''} `}>
         <div className="modal-head">
           <h1 className="title">{getMessage('modal.cover.outline.drawing')}</h1>
           <button className="modal-close" onClick={handleClickClose}>