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

src/components/management/StuffDetail.jsx

@@ -1625,17 +1625,6 @@ export default function StuffDetail() {
     input.value = input.value.replace(/[^0-9]/g, '')
   }
 
-  //자동완성 옵션 없을때 메세지 컴포넌트..
-  const NoOptionsMessage = (props) => {
-    return (
-      <components.NoOptionsMessage {...props}>
-        <span style={{ background: 'red' }} className="custom-css-class">
-          TEXTTTTTTT
-        </span>
-      </components.NoOptionsMessage>
-    )
-  }
-
   // 그리드 더블 클릭 해당플랜의 도면작성 화면으로 이동
   const getCellDoubleClicked = (params) => {
     if (managementState?.createSaleStoreId === 'T01') {
@@ -1653,7 +1642,13 @@ export default function StuffDetail() {
           pid: planNo,
           objectNo: objectNo,
         }
-        setSelectedMenu(null)
+        // 견적서 생성 여부에 따라 selectedMenu 셋팅
+        if (params?.data?.estimateDate) {
+          setSelectedMenu('module')
+        } else {
+          setSelectedMenu('surface')
+        }
+
         const url = `/floor-plan?${queryStringFormatter(param)}`
         router.push(url)
       }
@@ -1946,7 +1941,6 @@ export default function StuffDetail() {
                         <div className="select-wrap mr5" style={{ width: '567px' }}>
                           <Select
                             id="long-value-select2"
-                            // components={{ NoOptionsMessage }}
                             instanceId="long-value-select2"
                             className="react-select-custom"
                             classNamePrefix="custom"

src/components/management/StuffSubHeader.jsx

@@ -55,7 +55,20 @@ export default function StuffSubHeader({ type }) {
       objectNo: objectNo,
     }
 
-    setSelectedMenu(null)
+    /**
+     * 도면작성은 플랜1번의 도면작성화면으로 이동하기 때문에
+     * 1.물건작성하고 바로 -> planList 생성전. surface
+     * 2.물건이 여러건있을때 1번 플랜의 estimateDate 여부로 selectedMenu 셋팅
+     */
+    if (managementState?.planList.length === 0) {
+      setSelectedMenu('surface')
+    } else {
+      if (managementState?.planList[0].estimateDate) {
+        setSelectedMenu('module')
+      } else {
+        setSelectedMenu('surface')
+      }
+    }
     const url = `/floor-plan?${queryStringFormatter(param)}`
 
     router.push(url)

src/hooks/module/useModule.js

@@ -223,6 +223,7 @@ export function useModule() {
             length: module.length,
             points: module.points,
             surfaceId: module.surfaceId,
+            moduleInfo: module.moduleInfo,
             left,
             top,
             id: uuidv4(),
@@ -279,6 +280,7 @@ export function useModule() {
           length: module.length,
           points: module.points,
           surfaceId: module.surfaceId,
+          moduleInfo: module.moduleInfo,
           left,
           top,
           id: uuidv4(),
@@ -356,6 +358,7 @@ export function useModule() {
           type: module.type,
           length: module.length,
           points: module.points,
+          moduleInfo: module.moduleInfo,
           surfaceId: module.surfaceId,
           left,
           top,
@@ -680,6 +683,7 @@ export function useModule() {
           type: module.type,
           length: module.length,
           points: module.points,
+          moduleInfo: module.moduleInfo,
           surfaceId: module.surfaceId,
           left,
           top,
@@ -776,6 +780,7 @@ export function useModule() {
           length: module.length,
           points: module.points,
           surfaceId: module.surfaceId,
+          moduleInfo: module.moduleInfo,
           fill: module.fill,
           left,
           top,
@@ -949,16 +954,16 @@ export function useModule() {
     let left = target.left
 
     if (direction === 'up') {
-      top = Number(target.top) - Number(length)
+      top = Number(target.top) - Number(length) / 10
       top = hasMargin ? top - Number(target.height) : top
     } else if (direction === 'down') {
-      top = Number(target.top) + Number(length)
+      top = Number(target.top) + Number(length) / 10
       top = hasMargin ? top + Number(target.height) : top
     } else if (direction === 'left') {
-      left = Number(target.left) - Number(length)
+      left = Number(target.left) - Number(length) / 10
       left = hasMargin ? left - Number(target.width) : left
     } else if (direction === 'right') {
-      left = Number(target.left) + Number(length)
+      left = Number(target.left) + Number(length) / 10
       left = hasMargin ? left + Number(target.width) : left
     }
     return { top, left }