From b9f3b603335849fd0aa7e1ab481ddfbf041f8e9a Mon Sep 17 00:00:00 2001 From: ysCha Date: Tue, 27 Jan 2026 16:48:42 +0900 Subject: [PATCH] =?UTF-8?q?=ED=95=9C=EA=B8=80=3D>=EC=9D=BC=EB=B3=B8?= =?UTF-8?q?=EC=96=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hooks/roofcover/useRoofShapePassivitySetting.js | 13 +++++++------ src/locales/ja.json | 1 + src/locales/ko.json | 1 + 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/hooks/roofcover/useRoofShapePassivitySetting.js b/src/hooks/roofcover/useRoofShapePassivitySetting.js index ac36779c..6149ca39 100644 --- a/src/hooks/roofcover/useRoofShapePassivitySetting.js +++ b/src/hooks/roofcover/useRoofShapePassivitySetting.js @@ -48,9 +48,9 @@ export function useRoofShapePassivitySetting(id) { useEffect(() => { const outerLines = canvas.getObjects().filter((obj) => obj.name === 'outerLine') if (!canvas.outerLineFix || outerLines.length === 0) { - swalFire({ text: getMessage('wall.line.not.found') }) + swalFire({ text: getMessage('wall.line.not.found'),icon: 'warning' }) closePopup(id) - return + //return } setIsLoading(true) }, []) @@ -142,8 +142,9 @@ export function useRoofShapePassivitySetting(id) { const handleConfirm = () => { if (!currentLineRef.current) { - alert('선택된 외곽선이 없습니다.') - return + //alert('선택된 외곽선이 없습니다.') + swalFire({ text: getMessage('wall.line.not.selected'), icon: 'warning' }) + //return } let attributes const offset = Number(offsetRef.current.value) / 10 @@ -210,8 +211,8 @@ export function useRoofShapePassivitySetting(id) { }) if (!checkedAllSetting) { - swalFire({ text: '설정이 완료되지 않은 외벽선이 있습니다.', icon: 'warning' }) - return + swalFire({ text: getMessage('modal.canvas.setting.roofline.properties.setting.not.setting'), icon: 'warning' }) + //return } exceptObjs.forEach((obj) => { diff --git a/src/locales/ja.json b/src/locales/ja.json index 6f762667..debbec54 100644 --- a/src/locales/ja.json +++ b/src/locales/ja.json @@ -1111,6 +1111,7 @@ "module.layout.setup.has.zero.value": "モジュールの列数、段数を入力して下さい。", "modal.placement.initial.setting.plan.drawing.only.number": "(※数字は[半角]入力のみ可能です。)", "wall.line.not.found": "外壁がありません", + "wall.line.not.selected": "選択された外郭線がありません。", "roof.line.not.found": "屋根形状がありません", "roof.material.can.not.delete": "割り当てられた配置面があります。", "chidory.can.not.install": "千鳥配置できない工法です。", diff --git a/src/locales/ko.json b/src/locales/ko.json index 93b1a4f1..bbb2d7b1 100644 --- a/src/locales/ko.json +++ b/src/locales/ko.json @@ -1111,6 +1111,7 @@ "module.layout.setup.has.zero.value": "모듈의 열수, 단수를 입력해 주세요.", "modal.placement.initial.setting.plan.drawing.only.number": "(※ 숫자는 [반각]입력만 가능합니다.)", "wall.line.not.found": "외벽선이 없습니다.", + "wall.line.not.selected": "선택된 외곽선이 없습니다.", "roof.line.not.found": "지붕형상이 없습니다.", "roof.material.can.not.delete": "할당된 배치면이 있습니다.", "chidory.can.not.install": "치조 불가 공법입니다.",