Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/components/common/EditInformation.vue
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@ const validateName = () => {

const checkChange = () => {
if (
imageDelete.value ||
selectedFile.value ||
info.value.name != name.value ||
info.value.notificationSettingInfo.kakaoWork != kakaoWorkCheck.value ||
Expand Down Expand Up @@ -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()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div class="flex gap-4">
<div class="flex gap-4 z-40">
<FilterInput
title="이름"
:value="params.name"
Expand Down
2 changes: 1 addition & 1 deletion src/components/my-task/MyTaskFilterBar.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div class="flex gap-4">
<div class="flex gap-4 z-40">
<FilterDropdown
title="조회 기간"
:option-list="TERM_LIST"
Expand Down
2 changes: 1 addition & 1 deletion src/components/request-approve/ManagerDropdown.vue
Original file line number Diff line number Diff line change
@@ -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'"
Expand Down
2 changes: 1 addition & 1 deletion src/components/request-history/RequestHistoryFilterBar.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div class="flex gap-4">
<div class="flex gap-4 z-40">
<FilterDropdown
title="조회 기간"
:option-list="TERM_LIST"
Expand Down
2 changes: 1 addition & 1 deletion src/components/requested/RequestedFilterBar.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div class="flex gap-4">
<div class="flex gap-4 z-40">
<FilterDropdown
title="조회 기간"
:option-list="TERM_LIST"
Expand Down
14 changes: 13 additions & 1 deletion src/components/task-management/LabelManagementLine.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down Expand Up @@ -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')
Expand Down