From f1f1d784ffe8161be1627bc38b595a72bbb4a73a Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Sat, 1 Jan 2022 15:03:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=88=91=E7=9A=84=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/assets/js/pages/manage/calendar.vue |  4 +++-
 resources/assets/js/store/getters.js          | 10 ++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/resources/assets/js/pages/manage/calendar.vue b/resources/assets/js/pages/manage/calendar.vue
index 61599597..9052f885 100644
--- a/resources/assets/js/pages/manage/calendar.vue
+++ b/resources/assets/js/pages/manage/calendar.vue
@@ -79,7 +79,9 @@ export default {
         ...mapGetters(['ownerTask']),
 
         list() {
-            const datas = $A.cloneJSON(this.ownerTask);
+            const datas = $A.cloneJSON(this.ownerTask.filter(({end_at}) => {
+                return end_at;
+            }));
             return datas.map(data => {
                 let isAllday = $A.rightExists(data.start_at, "00:00:00") && $A.rightExists(data.end_at, "23:59:59")
                 let task = {
diff --git a/resources/assets/js/store/getters.js b/resources/assets/js/store/getters.js
index b27b9196..ba5b12b7 100644
--- a/resources/assets/js/store/getters.js
+++ b/resources/assets/js/store/getters.js
@@ -74,7 +74,6 @@ export default {
         }
     },
 
-
     ownerTask(state) {
         return state.tasks.filter(({complete_at, parent_id, end_at, owner}) => {
             if (parent_id > 0) {
@@ -97,9 +96,6 @@ export default {
             if (complete_at) {
                 return false;
             }
-            if (!end_at) {
-                return false;
-            }
             return owner;
         }).map(task => {
             if (task.parent_id > 0) {
@@ -125,11 +121,17 @@ export default {
             todayEnd = $A.Date($A.formatDate("Y-m-d 23:59:59")),
             todayNow = $A.Date($A.formatDate("Y-m-d H:i:s"));
         const todayTasks = getters.ownerTask.filter(task => {
+            if (!task.end_at) {
+                return false;
+            }
             const start = $A.Date(task.start_at),
                 end = $A.Date(task.end_at);
             return (start <= todayStart && todayStart <= end) || (start <= todayEnd && todayEnd <= end) || (start > todayStart && todayEnd > end);
         })
         const overdueTasks = getters.ownerTask.filter(task => {
+            if (!task.end_at) {
+                return false;
+            }
             return $A.Date(task.end_at) <= todayNow;
         })
         return {