From eff37a1cdf61f1057aafe78a9cd5ee3aa411be76 Mon Sep 17 00:00:00 2001 From: "hyojun.choi" Date: Fri, 7 Mar 2025 16:09:09 +0900 Subject: [PATCH] =?UTF-8?q?=EC=99=B8=EB=B2=BD=EC=84=A0=20=EC=86=8D?= =?UTF-8?q?=EC=84=B1=20=EC=84=A4=EC=A0=95=20=EC=A2=85=EB=A3=8C=EC=8B=9C=20?= =?UTF-8?q?=EB=AC=B8=EA=B5=AC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hooks/roofcover/usePropertiesSetting.js | 33 ++++++++++++--------- src/locales/ja.json | 3 +- src/locales/ko.json | 3 +- 3 files changed, 23 insertions(+), 16 deletions(-) diff --git a/src/hooks/roofcover/usePropertiesSetting.js b/src/hooks/roofcover/usePropertiesSetting.js index 4cd75bf6..dd5ca91a 100644 --- a/src/hooks/roofcover/usePropertiesSetting.js +++ b/src/hooks/roofcover/usePropertiesSetting.js @@ -178,23 +178,28 @@ export function usePropertiesSetting(id) { } const closeModal = (fn) => { - if (!confirm('외벽선 속성 설정을 종료 하시겠습니까?')) { - return - } + swalFire({ + text: getMessage('outerLine.property.fix'), + type: 'confirm', + confirmFn: async () => { + const lines = canvas.getObjects().filter((obj) => obj.name === 'outerLine') - const lines = canvas.getObjects().filter((obj) => obj.name === 'outerLine') + lines.forEach((line) => { + line.set({ + attributes: { offset: 0, type: LINE_TYPE.WALLLINE.WALL }, + stroke: '#000000', + strokeWidth: 4, + }) + }) - lines.forEach((line) => { - line.set({ - attributes: { offset: 0, type: LINE_TYPE.WALLLINE.WALL }, - stroke: '#000000', - strokeWidth: 4, - }) + canvas.renderAll() + setPoints([]) + closePopup(id) + }, + denyFn: async () => { + return + }, }) - - canvas.renderAll() - setPoints([]) - closePopup(id) } return { handleSetEaves, handleSetGable, handleRollback, handleFix, closeModal } diff --git a/src/locales/ja.json b/src/locales/ja.json index b9ff2970..6f6592b7 100644 --- a/src/locales/ja.json +++ b/src/locales/ja.json @@ -1031,5 +1031,6 @@ "length.direction.is.required": "長さと方向を入力します。", "canvas.infomation.text": "数字は [半角] 入力のみ可能です。", "roof.exceed.count": "屋根材は4つまで選択可能です。", - "outerLine.property.fix": "外壁線の属性設定 を完了しますか?" + "outerLine.property.fix": "外壁線の属性設定 を完了しますか?", + "outerLine.property.close": "外壁線の属性設定 を終了しますか?" } diff --git a/src/locales/ko.json b/src/locales/ko.json index 66a59ba4..5c5dfe03 100644 --- a/src/locales/ko.json +++ b/src/locales/ko.json @@ -1031,5 +1031,6 @@ "length.direction.is.required": "길이와 방향을 입력하세요.", "canvas.infomation.text": "숫자는 [반각] 입력만 가능합니다.", "roof.exceed.count": "지붕재는 4개까지 선택 가능합니다.", - "outerLine.property.fix": "외벽선 속성 설정을 완료하시겠습니까?" + "outerLine.property.fix": "외벽선 속성 설정을 완료하시겠습니까?", + "outerLine.property.close": "외벽선 속성 설정을 종료하시겠습니까?" }