From eb8cae5eaefa6d802f6d21b386855ba04e4eb532 Mon Sep 17 00:00:00 2001
From: xhir <syh1508@163.com>
Date: Mon, 1 Jul 2024 23:19:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BC=B9=E7=AA=97=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD=E6=97=B6=E6=8E=A7=E5=88=B6=E5=8F=B0=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=20#28?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AddHandleDate.vue | 14 +++++++++-----
 src/components/TaskFilter.vue    | 12 ++++++++----
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/components/AddHandleDate.vue b/src/components/AddHandleDate.vue
index f7879c4..708f9c4 100644
--- a/src/components/AddHandleDate.vue
+++ b/src/components/AddHandleDate.vue
@@ -1,12 +1,13 @@
 <template>
   <div class="plugin-task-list__add-handle-date-dialog-wrap">
     <el-dialog
-      v-model="visible"
-      :show-close="false"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
+      v-model="dialogVisible"
+      show-close
+      close-on-click-modal
+      close-on-press-escape
       :title="i18n.addHandleDate"
       width="500"
+      @close="close"
     >
       <div>
         <DatePicker
@@ -51,9 +52,12 @@ const props = withDefaults(defineProps<Props>(), {
   taskId: '',
 })
 
+const dialogVisible = ref<boolean>(false)
+
 watch(
   () => props.visible,
   (val) => {
+    dialogVisible.value = val
     if (val) {
       init()
     }
@@ -107,7 +111,7 @@ const close = () => {
   emit('close')
 }
 const submit = async () => {
-  emit('close')
+  close()
   let handleData: string = date.formatHandleDateToStorage({
     dateParam: handleDate.value,
   })
diff --git a/src/components/TaskFilter.vue b/src/components/TaskFilter.vue
index 9f244a4..db14b0b 100644
--- a/src/components/TaskFilter.vue
+++ b/src/components/TaskFilter.vue
@@ -1,12 +1,13 @@
 <template>
   <el-dialog
-    v-model="visible"
-    :show-close="false"
-    :close-on-click-modal="false"
-    :close-on-press-escape="false"
+    v-model="dialogVisible"
+    show-close
+    close-on-click-modal
+    close-on-press-escape
     class="plugin-task-list__task-filter-dialog-wrap"
     :title="i18n.filterConfig.title"
     width="700"
+    @close="close"
   >
     <!-- 是否显示周视图 -->
     <div class="setting-item setting-item__horizontal">
@@ -172,6 +173,8 @@ const props = withDefaults(defineProps<Props>(), {
   taskId: '',
 })
 
+const dialogVisible = ref<boolean>(false)
+
 const datePickerPopover = ref<any>({
   visibility: 'click',
   placement: 'right',
@@ -192,6 +195,7 @@ const init = () => {
 watch(
   () => props.visible,
   (val) => {
+    dialogVisible.value = val
     if (val) {
       init()
     }