Merge pull request '외벽선 확정 시 확인 다이얼로그 추가 (버튼/Enter 키)' (#797) from dev into dev-deploy

Reviewed-on: #797

src/components/floor-plan/modal/outerlinesetting/WallLineSetting.jsx

@@ -10,6 +10,7 @@ import Angle from '@/components/floor-plan/modal/lineTypes/Angle'
 import DoublePitch from '@/components/floor-plan/modal/lineTypes/DoublePitch'
 import Diagonal from '@/components/floor-plan/modal/lineTypes/Diagonal'
 import { usePopup } from '@/hooks/usePopup'
+import { useSwal } from '@/hooks/useSwal'
 import { useState } from 'react'
 import Image from 'next/image'
 import { v4 as uuidv4 } from 'uuid'
@@ -18,6 +19,7 @@ export default function WallLineSetting(props) {
   const { id } = props
   const { addPopup, closePopup } = usePopup()
   const { getMessage } = useMessage()
+  const { swalFire } = useSwal()
   const [propertiesId, setPropertiesId] = useState(uuidv4())
   const [useCalcPad, setUseCalcPad] = useState(false)
   const {
@@ -182,10 +184,11 @@ export default function WallLineSetting(props) {
           <button
             className="btn-frame modal act"
             onClick={() => {
-              handleFix()
-              // closePopup(id)
-
-              // setShowPropertiesSettingModal(true)
+              swalFire({
+                type: 'confirm',
+                text: getMessage('modal.cover.outline.fix.confirm'),
+                confirmFn: handleFix,
+              })
             }}
           >
             {getMessage('modal.cover.outline.fix')}

src/hooks/roofcover/useOuterLineWall.js

@@ -30,6 +30,8 @@ import { calculateAngle } from '@/util/qpolygon-utils'
 import { fabric } from 'fabric'
 import { outlineDisplaySelector } from '@/store/settingAtom'
 import { usePopup } from '@/hooks/usePopup'
+import { useSwal } from '@/hooks/useSwal'
+import { useMessage } from '@/hooks/useMessage'
 import Big from 'big.js'
 import RoofShapeSetting from '@/components/floor-plan/modal/roofShape/RoofShapeSetting'
 import { useObject } from '@/hooks/useObject'
@@ -84,6 +86,8 @@ export function useOuterLineWall(id, propertiesId) {
   const arrow1Ref = useRef(arrow1)
   const arrow2Ref = useRef(arrow2)
   const { addPopup, closePopup } = usePopup()
+  const { swalFire } = useSwal()
+  const { getMessage } = useMessage()
 
   const setOuterLineFix = useSetRecoilState(outerLineFixState)
 
@@ -929,7 +933,11 @@ export function useOuterLineWall(id, propertiesId) {
 
   const enterCheck = (e) => {
     if (e.key === 'Enter') {
-      handleFix()
+      swalFire({
+        type: 'confirm',
+        text: getMessage('modal.cover.outline.fix.confirm'),
+        confirmFn: handleFix,
+      })
     }
   }
 

src/locales/ja.json

@@ -70,6 +70,7 @@
   "modal.cover.outline.length": "長さ(mm)",
   "modal.cover.outline.arrow": "方向（矢印)",
   "modal.cover.outline.fix": "外壁線確定",
+  "modal.cover.outline.fix.confirm": "本当に確定しますか？確定後は修正できません。",
   "modal.cover.outline.rollback": "前に戻る",
   "modal.cover.outline.finish": "設定完了",
   "common.setting.finish": "設定完了",

src/locales/ko.json

@@ -70,6 +70,7 @@
   "modal.cover.outline.length": "길이(mm)",
   "modal.cover.outline.arrow": "방향(화살표)",
   "modal.cover.outline.fix": "외벽선 확정",
+  "modal.cover.outline.fix.confirm": "정말로 확정하시겠습니까? 확정 후에는 수정할 수 없습니다.",
   "modal.cover.outline.rollback": "일변전으로 돌아가기",
   "modal.cover.outline.finish": "설정완료",
   "common.setting.finish": "설정완료",