diff --git a/src/components/main/ChangePasswordPop.jsx b/src/components/main/ChangePasswordPop.jsx
index dbc9d6e4..54075153 100644
--- a/src/components/main/ChangePasswordPop.jsx
+++ b/src/components/main/ChangePasswordPop.jsx
@@ -119,7 +119,11 @@ export default function ChangePasswordPop(props) {
},
})
} else {
- alert(res?.result?.resultMsg)
+ swalFire({
+ text: getMessage(res?.result?.resultMsg),
+ type: 'alert',
+ icon: 'error',
+ })
}
} else {
setIsGlobalLoading(false)
diff --git a/src/components/management/Stuff.jsx b/src/components/management/Stuff.jsx
index 0a3be3ee..43446209 100644
--- a/src/components/management/Stuff.jsx
+++ b/src/components/management/Stuff.jsx
@@ -75,7 +75,10 @@ export default function Stuff() {
type: 'alert',
})
} catch (err) {
- alert(getMessage('stuff.detail.header.failCopy'))
+ swalFire({
+ text: getMessage('stuff.detail.header.failCopy'),
+ type: 'alert',
+ })
} finally {
textArea.remove()
}
diff --git a/src/components/management/StuffDetail.jsx b/src/components/management/StuffDetail.jsx
index f4d7fbd4..266f1779 100644
--- a/src/components/management/StuffDetail.jsx
+++ b/src/components/management/StuffDetail.jsx
@@ -107,7 +107,6 @@ export default function StuffDetail() {
const [areaIdList, setAreaIdList] = useState([]) //발전시뮬레이션 리스트
- const [isFormValid, setIsFormValid] = useState(false) //임시저장, 진짜저장 버튼 컨트롤
const [showAddressButtonValid, setShowAddressButtonValid] = useState(false) //주소검색팝업 활성화 컨트롤
const [showDesignRequestButtonValid, setShowDesignRequestButtonValid] = useState(false) //설계의뢰팝업 활성화 컨트롤
const [showWindSpeedButtonValid, setShowWindSpeedButtonValid] = useState(false) //풍속선택팝업 활성화 컨트롤
@@ -1094,8 +1093,6 @@ export default function StuffDetail() {
if (!formData.installHeight) {
errors.installHeight = true
}
-
- setIsFormValid(Object.keys(errors).length === 0 ? true : false)
} else {
//상세일떄 폼체크
const formData = form.getValues()
@@ -1140,8 +1137,6 @@ export default function StuffDetail() {
if (!formData.installHeight) {
errors.installHeight = true
}
-
- setIsFormValid(Object.keys(errors).length === 0 ? true : false)
}
}, [
_receiveUser,
diff --git a/src/components/management/StuffHeader.jsx b/src/components/management/StuffHeader.jsx
index d669ad7a..1f68d68a 100644
--- a/src/components/management/StuffHeader.jsx
+++ b/src/components/management/StuffHeader.jsx
@@ -4,7 +4,6 @@ import { useContext, useEffect } from 'react'
import { useMessage } from '@/hooks/useMessage'
import dayjs from 'dayjs'
import { GlobalDataContext } from '@/app/GlobalDataProvider'
-// import { ManagementContext } from '@/app/management/ManagementProvider'
import { useSwal } from '@/hooks/useSwal'
export default function StuffHeader() {
const { getMessage } = useMessage()
@@ -23,7 +22,10 @@ export default function StuffHeader() {
})
})
.catch(() => {
- alert(getMessage('stuff.detail.header.failCopy'))
+ swalFire({
+ text: getMessage('stuff.detail.header.failCopy'),
+ type: 'alert',
+ })
})
} else {
// Use the 'out of viewport hidden text area' trick
@@ -44,7 +46,10 @@ export default function StuffHeader() {
type: 'alert',
})
} catch (err) {
- alert(getMessage('stuff.detail.header.failCopy'))
+ swalFire({
+ text: getMessage('stuff.detail.header.failCopy'),
+ type: 'alert',
+ })
} finally {
textArea.remove()
}
diff --git a/src/components/management/StuffSearchCondition.jsx b/src/components/management/StuffSearchCondition.jsx
index 05c00a13..c00e8bd6 100644
--- a/src/components/management/StuffSearchCondition.jsx
+++ b/src/components/management/StuffSearchCondition.jsx
@@ -18,6 +18,7 @@ import { isObjectNotEmpty } from '@/util/common-utils'
import { SessionContext } from '@/app/SessionProvider'
import { QcastContext } from '@/app/QcastProvider'
+import { useSwal } from '@/hooks/useSwal'
export default function StuffSearchCondition() {
const router = useRouter()
@@ -73,17 +74,24 @@ export default function StuffSearchCondition() {
const [otherSaleStoreId, setOtherSaleStoreId] = useState('')
const { setIsGlobalLoading } = useContext(QcastContext)
+ const { swalFire } = useSwal()
// 조회
const onSubmit = () => {
let diff = dayjs(endDate).diff(startDate, 'day')
if (diff > 366) {
- return alert(getMessage('stuff.message.periodError'))
+ return swalFire({
+ text: getMessage('stuff.message.periodError'),
+ type: 'alert',
+ })
}
if (isNaN(diff)) {
- return alert(getMessage('stuff.message.periodError'))
+ return swalFire({
+ text: getMessage('stuff.message.periodError'),
+ type: 'alert',
+ })
}
setIsGlobalLoading(true)
From 11d9d16ff89cc158400fe62982ede84c4bd92768 Mon Sep 17 00:00:00 2001
From: "hyojun.choi"
Date: Wed, 5 Mar 2025 16:29:34 +0900
Subject: [PATCH 6/6] =?UTF-8?q?texts=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/hooks/usePolygon.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/hooks/usePolygon.js b/src/hooks/usePolygon.js
index 04507c17..c9528e72 100644
--- a/src/hooks/usePolygon.js
+++ b/src/hooks/usePolygon.js
@@ -48,6 +48,7 @@ export const usePolygon = () => {
canvas.remove(text)
})
const lines = polygon.lines
+ polygon.texts = []
lines.forEach((line, i) => {
const length = line.getLength()
@@ -102,7 +103,7 @@ export const usePolygon = () => {
parent: polygon,
name: 'lengthText',
})
-
+ polygon.texts.push(text)
canvas.add(text)
})