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/hooks/usePlan.js b/src/hooks/usePlan.js index ee3f0aa8..f7fa7508 100644 --- a/src/hooks/usePlan.js +++ b/src/hooks/usePlan.js @@ -49,7 +49,7 @@ export function usePlan(params = {}) { const resetOuterLinePoints = useResetRecoilState(outerLinePointsState) const resetPlacementShapeDrawingPoints = useResetRecoilState(placementShapeDrawingPointsState) - const { fetchBasicSettings, basicSettingCopySave } = useCanvasSetting(false) + const { fetchBasicSettings, basicSettingCopySave } = useCanvasSetting() const [canvasSetting, setCanvasSetting] = useRecoilState(canvasSettingState) /** diff --git a/src/locales/ja.json b/src/locales/ja.json index b9ff2970..604900d7 100644 --- a/src/locales/ja.json +++ b/src/locales/ja.json @@ -271,7 +271,7 @@ "modal.canvas.setting.wallline.properties.setting.eaves": "軒で設定", "modal.canvas.setting.wallline.properties.setting.edge": "ケラバに設定", "modal.canvas.setting.wallline.properties.setting.ridge": "용마루로 설정(JA)", - "modal.canvas.setting.roofline.properties.setting": "지붕선 속성 설정(JA)", + "modal.canvas.setting.roofline.properties.setting": "屋根線の属性設定", "modal.canvas.setting.roofline.properties.setting.info": "※ 속성을 변경할 지붕선을 선택하고 처마로 설정 또는 케라바로 설정\n 버튼을 클릭하여 설정값을 적용하십시오.\n(JA)", "modal.canvas.setting.roofline.properties.setting.not.setting": "설정하지 않은 라인이 존재합니다.(JA)", "modal.eaves.gable.edit": "軒/ケラバ変更", @@ -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": "외벽선 속성 설정을 종료하시겠습니까?" }