diff --git a/src/components/estimate/Estimate.jsx b/src/components/estimate/Estimate.jsx
index ca7059ec..8c6af884 100644
--- a/src/components/estimate/Estimate.jsx
+++ b/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 }) {
{item?.itemChangeFlg === '1' && (
diff --git a/src/components/floor-plan/CanvasFrame.jsx b/src/components/floor-plan/CanvasFrame.jsx
index ad10485c..6a48d83b 100644
--- a/src/components/floor-plan/CanvasFrame.jsx
+++ b/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 = () => {
diff --git a/src/hooks/common/useRefFiles.js b/src/hooks/common/useRefFiles.js
index 1b36a109..a5d085cc 100644
--- a/src/hooks/common/useRefFiles.js
+++ b/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(() => {
- const handleCurrentPlan = async () => {
- await promisePut({ url: '/api/canvas-management/canvas-statuses', data: currentCanvasPlan }).then((res) => {
- console.log('🚀 ~ awaitpromisePut ~ res:', res)
- })
- }
- handleCurrentPlan()
- }, [currentCanvasPlan])
+ // useEffect(() => {
+ // const handleCurrentPlan = async () => {
+ // await promisePut({ url: '/api/canvas-management/canvas-statuses', data: currentCanvasPlan }).then((res) => {
+ // console.log('🚀 ~ awaitpromisePut ~ res:', res)
+ // })
+ // }
+ // handleCurrentPlan()
+ // }, [currentCanvasPlan])
/**
* RefFile이 캐드 도면 파일일 경우 변환하여 이미지로 저장