diff --git a/src/components/floor-plan/modal/auxiliary/AuxiliaryDrawing.jsx b/src/components/floor-plan/modal/auxiliary/AuxiliaryDrawing.jsx index ee0f304b..64759f8c 100644 --- a/src/components/floor-plan/modal/auxiliary/AuxiliaryDrawing.jsx +++ b/src/components/floor-plan/modal/auxiliary/AuxiliaryDrawing.jsx @@ -133,6 +133,11 @@ export default function AuxiliaryDrawing({ id, pos = { x: 50, y: 230 } }) { } const onClickButton = (button) => { + if (buttonAct === button.id || type === button.type) { + setButtonAct(null) + setType(null) + return + } setButtonAct(button.id) setType(button.type) } diff --git a/src/components/floor-plan/modal/setting01/SettingModal01.jsx b/src/components/floor-plan/modal/setting01/SettingModal01.jsx index 71c19a83..b3e6a0df 100644 --- a/src/components/floor-plan/modal/setting01/SettingModal01.jsx +++ b/src/components/floor-plan/modal/setting01/SettingModal01.jsx @@ -10,9 +10,7 @@ import { adsorptionPointAddModeState, canGridOptionSeletor, tempGridModeState } import { useRecoilState, useRecoilValue } from 'recoil' import { usePopup } from '@/hooks/usePopup' import { useCanvasSetting } from '@/hooks/option/useCanvasSetting' -import { useTempGrid } from '@/hooks/useTempGrid' import { settingModalGridOptionsState } from '@/store/settingAtom' -import { useEvent } from '@/hooks/useEvent' export default function SettingModal01(props) { const { id } = props @@ -102,11 +100,11 @@ export default function SettingModal01(props) { - {canGridOptionSeletorValue && ( + {/*{canGridOptionSeletorValue && ( - )} + )}*/} {buttonAct === 1 && } {buttonAct === 2 && } diff --git a/src/hooks/roofcover/useAuxiliaryDrawing.js b/src/hooks/roofcover/useAuxiliaryDrawing.js index ed16ae58..bbf3628a 100644 --- a/src/hooks/roofcover/useAuxiliaryDrawing.js +++ b/src/hooks/roofcover/useAuxiliaryDrawing.js @@ -77,6 +77,13 @@ export function useAuxiliaryDrawing(id, isUseEffect = true) { useEffect(() => { typeRef.current = type clear() + if (type === null) { + initEvent() + return + } + initEvent() + addCanvasMouseEventListener('mouse:move', mouseMove) + addCanvasMouseEventListener('mouse:down', mouseDown) addDocumentEventListener('keydown', document, keydown[type]) }, [type]) @@ -133,7 +140,7 @@ export function useAuxiliaryDrawing(id, isUseEffect = true) { // roofs의 innerLines에서 object와 같은 것을 찾아서 제거 const roofs = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.ROOF) roofs.forEach((roof) => { - roof.innerLines = roof.innerLines.filter(inner => inner !== object) + roof.innerLines = roof.innerLines.filter((inner) => inner !== object) }) canvas.remove(object) diff --git a/src/hooks/roofcover/useRoofAllocationSetting.js b/src/hooks/roofcover/useRoofAllocationSetting.js index ac1f3da7..2703fc30 100644 --- a/src/hooks/roofcover/useRoofAllocationSetting.js +++ b/src/hooks/roofcover/useRoofAllocationSetting.js @@ -334,6 +334,9 @@ export function useRoofAllocationSetting(id) { name: 'originRoofOuterLine', visible: outlineDisplay, }) + wallLine.texts.forEach((text) => { + canvas.remove(text) + }) }) canvas.renderAll() } @@ -556,11 +559,6 @@ export function useRoofAllocationSetting(id) { canvas.remove(roofBase) }) - /** 벽면 삭제 */ - wallLines.forEach((wallLine) => { - canvas.remove(wallLine) - }) - /** 데이터 설정 */ const newRoofList = currentRoofList.map((roof, idx) => { return { ...roof, index: idx, ...basicInfo, raft: roof.raft ? roof.raft : roof.raftBaseCd }