From 565a8944a09518c0522bf31476743459f79c65db Mon Sep 17 00:00:00 2001
From: seorang42 <seorang42@naver.com>
Date: Wed, 19 Feb 2025 18:27:13 +0900
Subject: [PATCH 1/4] =?UTF-8?q?:bug:=20[fix]=20:=20=ED=94=84=EB=A1=9C?=
 =?UTF-8?q?=ED=95=84=20=EC=82=AC=EC=A7=84=20=EC=88=98=EC=A0=95=20=EC=99=84?=
 =?UTF-8?q?=EB=A3=8C=20=ED=9B=84,=20=ED=8E=98=EC=9D=B4=EC=A7=80=20?=
 =?UTF-8?q?=EC=9D=B4=EB=8F=99=20=EA=B2=BD=EA=B3=A0=20=ED=8C=9D=EC=97=85=20?=
 =?UTF-8?q?=ED=91=9C=EC=8B=9C=EB=90=98=EB=8A=94=20=EC=98=A4=EB=A5=98=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/EditInformation.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/common/EditInformation.vue b/src/components/common/EditInformation.vue
index 7e4cdd7..c64d844 100644
--- a/src/components/common/EditInformation.vue
+++ b/src/components/common/EditInformation.vue
@@ -199,6 +199,7 @@ const validateName = () => {
 
 const checkChange = () => {
   if (
+    imageDelete.value ||
     selectedFile.value ||
     info.value.name != name.value ||
     info.value.notificationSettingInfo.kakaoWork != kakaoWorkCheck.value ||
@@ -312,6 +313,8 @@ const handleSubmit = async () => {
 
     try {
       await patchEditInfo(formData)
+      selectedFile.value = null
+      imageDelete.value = false
       isModalVisible.value = false
       isSuccessModalVisible.value = true
       await memberStore.updateMemberInfoWithToken()

From f708765e35d5e49a1757dfb47b41e38885dac7c2 Mon Sep 17 00:00:00 2001
From: seorang42 <seorang42@naver.com>
Date: Wed, 19 Feb 2025 18:48:34 +0900
Subject: [PATCH 2/4] =?UTF-8?q?:bug:=20[fix]=20:=20=EA=B0=99=EC=9D=80=20?=
 =?UTF-8?q?=EA=B0=92=EC=9C=BC=EB=A1=9C=20=EA=B5=AC=EB=B6=84=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=20=EC=8B=9C=20=EC=A4=91=EB=B3=B5=20=EC=98=A4=EB=A5=98?=
 =?UTF-8?q?=20=ED=91=9C=EC=8B=9C=EB=90=98=EB=8A=94=20=ED=98=84=EC=83=81=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task-management/LabelManagementLine.vue        | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/components/task-management/LabelManagementLine.vue b/src/components/task-management/LabelManagementLine.vue
index 12db921..5df7d72 100644
--- a/src/components/task-management/LabelManagementLine.vue
+++ b/src/components/task-management/LabelManagementLine.vue
@@ -103,9 +103,16 @@ const editValue = ref<LabelDataTypes>({
   labelId: 0
 })
 
-const handleEdit = () => (isEdit.value = !isEdit.value)
+const handleEdit = () => {
+  isEdit.value = !isEdit.value
+  if (!isEdit.value) {
+    prevName.value = ''
+  }
+}
 
+const prevName = ref('')
 const startEdit = async (label: LabelDataTypes) => {
+  prevName.value = label.labelName
   await nextTick()
   handleEdit()
   editValue.value = { ...label }
@@ -135,6 +142,11 @@ const updateLabelColor = (color: LabelColorTypes) => {
 }
 
 const finishEdit = async () => {
+  if (editValue.value.labelName === prevName.value) {
+    prevName.value = ''
+    handleEdit()
+    return
+  }
   if (editValue.value.labelName !== '' && editValue.value.labelName.length <= 10) {
     await patchLabelAdmin(editValue.value)
     emit('updateLabels')

From eec996bda7c759cec9ee3fc12a4faf979acb3afc Mon Sep 17 00:00:00 2001
From: seorang42 <seorang42@naver.com>
Date: Wed, 19 Feb 2025 18:57:25 +0900
Subject: [PATCH 3/4] =?UTF-8?q?:bug:=20[fix]=20:=20=EC=9A=94=EC=B2=AD=20?=
 =?UTF-8?q?=EC=8A=B9=EC=9D=B8=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EB=8B=B4?=
 =?UTF-8?q?=EB=8B=B9=EC=9E=90=20=EB=B3=80=EA=B2=BD=20->=20=EB=8B=B4?=
 =?UTF-8?q?=EB=8B=B9=EC=9E=90=20=EC=9B=8C=EB=94=A9=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/request-approve/ManagerDropdown.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/request-approve/ManagerDropdown.vue b/src/components/request-approve/ManagerDropdown.vue
index c98c25a..9f727d4 100644
--- a/src/components/request-approve/ManagerDropdown.vue
+++ b/src/components/request-approve/ManagerDropdown.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="flex text-xs gap-x-1 mb-2">
-      <p class="text-disabled font-semibold">담당자 변경</p>
+      <p class="text-disabled font-semibold">담당자</p>
       <p class="text-red-1">*</p>
       <p
         v-if="isInvalidateState === 'manager'"

From a32bda6621f05754b88c3df7c6ee8341be1c2415 Mon Sep 17 00:00:00 2001
From: seorang42 <seorang42@naver.com>
Date: Wed, 19 Feb 2025 20:12:19 +0900
Subject: [PATCH 4/4] =?UTF-8?q?:bug:=20[fix]=20:=20FilterBar=20z-index=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/member-management/MemberManagementFilterBar.vue | 2 +-
 src/components/my-task/MyTaskFilterBar.vue                     | 2 +-
 src/components/request-history/RequestHistoryFilterBar.vue     | 2 +-
 src/components/requested/RequestedFilterBar.vue                | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/member-management/MemberManagementFilterBar.vue b/src/components/member-management/MemberManagementFilterBar.vue
index b4d0e77..51a72c9 100644
--- a/src/components/member-management/MemberManagementFilterBar.vue
+++ b/src/components/member-management/MemberManagementFilterBar.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="flex gap-4">
+  <div class="flex gap-4 z-40">
     <FilterInput
       title="이름"
       :value="params.name"
diff --git a/src/components/my-task/MyTaskFilterBar.vue b/src/components/my-task/MyTaskFilterBar.vue
index 883fe12..a98aa52 100644
--- a/src/components/my-task/MyTaskFilterBar.vue
+++ b/src/components/my-task/MyTaskFilterBar.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="flex gap-4">
+  <div class="flex gap-4 z-40">
     <FilterDropdown
       title="조회 기간"
       :option-list="TERM_LIST"
diff --git a/src/components/request-history/RequestHistoryFilterBar.vue b/src/components/request-history/RequestHistoryFilterBar.vue
index 8fc54f2..617954c 100644
--- a/src/components/request-history/RequestHistoryFilterBar.vue
+++ b/src/components/request-history/RequestHistoryFilterBar.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="flex gap-4">
+  <div class="flex gap-4 z-40">
     <FilterDropdown
       title="조회 기간"
       :option-list="TERM_LIST"
diff --git a/src/components/requested/RequestedFilterBar.vue b/src/components/requested/RequestedFilterBar.vue
index 62f80fd..a2daba8 100644
--- a/src/components/requested/RequestedFilterBar.vue
+++ b/src/components/requested/RequestedFilterBar.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="flex gap-4">
+  <div class="flex gap-4 z-40">
     <FilterDropdown
       title="조회 기간"
       :option-list="TERM_LIST"