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

src/components/estimate/Estimate.jsx

@@ -34,6 +34,9 @@ export default function Estimate({ params }) {
   //견적특이사항 접고 펼치기
   const [hidden, setHidden] = useState(false)
 
+  //아이템 자동완성 리스트
+  const [displayItemList, setDisplayItemList] = useState([])
+
   //공통코드
   const { findCommonCode } = useCommonCode()
   const [honorificCodeList, setHonorificCodeList] = useState([]) //경칭 공통코드
@@ -81,6 +84,17 @@ export default function Estimate({ params }) {
     if (code1 != null) {
       setHonorificCodeList(code1)
     }
+
+    //아이템 자동완성 목록 가져오기
+    const param = {
+      saleStoreId: session.storeId,
+    }
+    const apiUrl = `/api/display-item/item-list?${queryStringFormatter(param)}`
+    get({ url: apiUrl }).then((res) => {
+      if (res.length > 0) {
+        setDisplayItemList(res)
+      }
+    })
   }, [])
 
   useEffect(() => {
@@ -775,19 +789,19 @@ export default function Estimate({ params }) {
                             <div className="form-flex-wrap">
                               <div className="select-wrap mr5">
                                 <Select
-                                  id=""
+                                  id="long-value-select1"
-                                  instanceId=""
+                                  instanceId="long-value-select1"
                                   className="react-select-custom"
                                   classNamePrefix="custom"
                                   placeholder="Select"
-                                  options={[]}
+                                  options={displayItemList}
-                                  // getOptionLabel={(x) => x.saleStoreName}
+                                  getOptionLabel={(x) => x.itemName}
-                                  // getOptionValue={(x) => x.saleStoreId}
+                                  getOptionValue={(x) => x.itemId}
                                   isClearable={true}
                                   isDisabled={false}
-                                  // value={saleStoreList.filter(function (option) {
+                                  value={displayItemList.filter(function (option) {
-                                  //   return option.saleStoreId === selOptions
+                                    return option.itemId === item.itemId
-                                  // })}
+                                  })}
                                 />
                               </div>
                               {item?.itemChangeFlg === '1' && (

src/components/floor-plan/CanvasFrame.jsx

@@ -16,11 +16,11 @@ import PanelBatchStatistics from '@/components/floor-plan/modal/panelBatch/Panel
 
 export default function CanvasFrame() {
   const canvasRef = useRef(null)
-  const { canvas } = useCanvas('canvas')
+  const { canvas, handleBackImageLoadToCanvas } = useCanvas('canvas')
   const { canvasLoadInit, gridInit } = useCanvasConfigInitialize()
   const currentMenu = useRecoilValue(currentMenuState)
   const { contextMenu, handleClick } = useContextMenu()
-  const { selectedPlan, modifiedPlanFlag, checkCanvasObjectEvent, resetModifiedPlans } = usePlan()
+  const { selectedPlan, modifiedPlanFlag, checkCanvasObjectEvent, resetModifiedPlans, currentCanvasPlan } = usePlan()
   useEvent()
 
   const loadCanvas = () => {

src/hooks/common/useRefFiles.js

@@ -54,20 +54,20 @@ export default function useRefFiles() {
 
     const res = await get({ url: `http://localhost:3000/api/html2canvas?q=${queryRef.current.value}&fileNm=${uuidv4()}&zoom=20` })
     console.log('🚀 ~ handleMapImageDown ~ res:', res)
-    setCurrentCanvasPlan((prev) => ({ ...prev, bgFileName: res.fileNm, mapPositionAddress: queryRef.current.value }))
+    setCurrentCanvasPlan((prev) => ({ ...prev, bgImageName: res.fileNm, mapPositionAddress: queryRef.current.value }))
   }
 
   /**
    * 현재 플랜이 변경되면 플랜 상태 저장
    */
-  useEffect(() => {
+  // useEffect(() => {
-    const handleCurrentPlan = async () => {
+  //   const handleCurrentPlan = async () => {
-      await promisePut({ url: '/api/canvas-management/canvas-statuses', data: currentCanvasPlan }).then((res) => {
+  //     await promisePut({ url: '/api/canvas-management/canvas-statuses', data: currentCanvasPlan }).then((res) => {
-        console.log('🚀 ~ awaitpromisePut ~ res:', res)
+  //       console.log('🚀 ~ awaitpromisePut ~ res:', res)
-      })
+  //     })
-    }
+  //   }
-    handleCurrentPlan()
+  //   handleCurrentPlan()
-  }, [currentCanvasPlan])
+  // }, [currentCanvasPlan])
 
   /**
    * RefFile이 캐드 도면 파일일 경우 변환하여 이미지로 저장