From f0ecc17dff23163a8b0f4f8abda6756c33410602 Mon Sep 17 00:00:00 2001 From: "hyojun.choi" Date: Mon, 26 Jan 2026 13:40:17 +0900 Subject: [PATCH 1/5] =?UTF-8?q?wallLine=20=EC=A0=9C=EA=B1=B0=EB=90=98?= =?UTF-8?q?=EB=8A=94=20=ED=98=84=EC=83=81=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hooks/roofcover/useRoofAllocationSetting.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/hooks/roofcover/useRoofAllocationSetting.js b/src/hooks/roofcover/useRoofAllocationSetting.js index a49e856e..a662f330 100644 --- a/src/hooks/roofcover/useRoofAllocationSetting.js +++ b/src/hooks/roofcover/useRoofAllocationSetting.js @@ -554,11 +554,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 } From b58a85b90486602d12e3f41d0031aef1a292ef38 Mon Sep 17 00:00:00 2001 From: "hyojun.choi" Date: Mon, 26 Jan 2026 13:42:10 +0900 Subject: [PATCH 2/5] =?UTF-8?q?#1424=20=EA=B7=B8=EB=A6=AC=EB=93=9C=20?= =?UTF-8?q?=EC=98=81=EC=97=AD=20=EC=9A=B0=EC=84=A0=20=EC=A3=BC=EC=84=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../floor-plan/modal/setting01/SettingModal01.jsx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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 && } From 01b1c97248582b8ce24ca23dbdeebf85edc85bdf Mon Sep 17 00:00:00 2001 From: "hyojun.choi" Date: Mon, 26 Jan 2026 13:51:21 +0900 Subject: [PATCH 3/5] =?UTF-8?q?#1418=20=EB=B3=B4=EC=A1=B0=EC=84=A0=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C=20=EC=9A=A9=EC=9D=B4=ED=95=98=EA=B2=8C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../floor-plan/modal/auxiliary/AuxiliaryDrawing.jsx | 5 +++++ src/hooks/roofcover/useAuxiliaryDrawing.js | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) 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/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) From 68005562e3658dc29a51723cb55be2b6c14569d0 Mon Sep 17 00:00:00 2001 From: "hyojun.choi" Date: Mon, 26 Jan 2026 14:04:35 +0900 Subject: [PATCH 4/5] =?UTF-8?q?wallLine=20texts=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hooks/roofcover/useRoofAllocationSetting.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/hooks/roofcover/useRoofAllocationSetting.js b/src/hooks/roofcover/useRoofAllocationSetting.js index a662f330..c31797cf 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() } From 31715aa62179d2fa1be8cfd81189765f5cc24b4d Mon Sep 17 00:00:00 2001 From: ysCha Date: Mon, 26 Jan 2026 15:01:43 +0900 Subject: [PATCH 5/5] =?UTF-8?q?=ED=98=84=EC=9D=B4=EB=8F=99=EC=A0=80?= =?UTF-8?q?=EC=9E=A5=EC=9D=B4=ED=9B=84=20=ED=95=A0=EB=8B=B9=EB=AC=B8?= =?UTF-8?q?=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/common.js | 2 ++ src/hooks/useCanvas.js | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/common/common.js b/src/common/common.js index 6ecc08fc..2e4bb98c 100644 --- a/src/common/common.js +++ b/src/common/common.js @@ -165,6 +165,8 @@ export const SAVE_KEY = [ 'text', 'pitch', 'uuid', + 'lineName', + 'roofId', 'originText', 'groupYn', 'groupName', diff --git a/src/hooks/useCanvas.js b/src/hooks/useCanvas.js index 679b17fa..9a6fb14b 100644 --- a/src/hooks/useCanvas.js +++ b/src/hooks/useCanvas.js @@ -160,7 +160,7 @@ export function useCanvas(id) { for (let key in this) { if (typeof this[key] !== 'function' && SAVE_KEY.includes(key)) { - source.key = this[key] + source[key] = this[key] } }