Merge pull request #213 from TaskFlow-CLAP/CLAP-485

CLAP-485 프로필 사진 수정 완료 후, 페이지 이동 경고 팝업 표시되는 오류 수정

Author: Minkyu0424

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()

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"

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"

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'"

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"

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"

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')