From 6324e79aba2393dc96c9e5dfd0349282cebd2444 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Wed, 5 Jan 2022 15:04:55 +0800
Subject: [PATCH] no message

---
 .../js/pages/manage/components/TaskDetail.vue      |  2 +-
 .../assets/js/pages/manage/components/TaskRow.vue  |  6 +++---
 .../js/pages/manage/components/TeamManagement.vue  |  3 +++
 resources/assets/js/pages/manage/dashboard.vue     |  2 +-
 resources/assets/js/store/getters.js               | 14 +++++++-------
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/resources/assets/js/pages/manage/components/TaskDetail.vue b/resources/assets/js/pages/manage/components/TaskDetail.vue
index 713794da..a3ab8ea7 100644
--- a/resources/assets/js/pages/manage/components/TaskDetail.vue
+++ b/resources/assets/js/pages/manage/components/TaskDetail.vue
@@ -572,7 +572,7 @@ export default {
                 return [];
             }
             return this.tasks.filter(({parent_id}) => {
-                return parent_id > 0 && parent_id == this.taskId
+                return parent_id == this.taskId
             }).sort((a, b) => {
                 return a.id - b.id;
             });
diff --git a/resources/assets/js/pages/manage/components/TaskRow.vue b/resources/assets/js/pages/manage/components/TaskRow.vue
index 2214f232..163419d6 100644
--- a/resources/assets/js/pages/manage/components/TaskRow.vue
+++ b/resources/assets/js/pages/manage/components/TaskRow.vue
@@ -5,7 +5,7 @@
                 <em v-if="item.p_name" class="priority-color" :style="{backgroundColor:item.p_color}"></em>
                 <Col span="12" :class="['row-name', item.complete_at ? 'complete' : '']">
                     <Icon
-                        v-if="(item.sub_num > 0 && item.sub_top !== true) || (item.parent_id===0 && fastAddTask)"
+                        v-if="(item.sub_num > 0 && item.sub_top !== true) || (item.parent_id === 0 && fastAddTask)"
                         :class="['sub-icon', taskOpen[item.id] ? 'active' : '']"
                         type="ios-arrow-forward"
                         @click="getSublist(item)"/>
@@ -41,7 +41,7 @@
                                 </div>
                             </EDropdownItem>
                             <template v-if="item.parent_id === 0">
-                                <EDropdownItem v-if="item.parent_id === 0" divided disabled>{{$L('背景色')}}</EDropdownItem>
+                                <EDropdownItem divided disabled>{{$L('背景色')}}</EDropdownItem>
                                 <EDropdownItem v-for="(c, k) in $store.state.taskColorList" :key="k" :command="c">
                                     <div class="item">
                                         <i class="taskfont" :style="{color:c.color||'#f9f9f9'}" v-html="c.color == item.color ? '&#xe61d;' : '&#xe61c;'"></i>{{$L(c.name)}}
@@ -193,7 +193,7 @@ export default {
         subTask() {
             return function(task_id) {
                 return this.tasks.filter(({parent_id}) => {
-                    return parent_id > 0 && parent_id == task_id
+                    return parent_id == task_id
                 }).sort((a, b) => {
                     return a.id - b.id;
                 });
diff --git a/resources/assets/js/pages/manage/components/TeamManagement.vue b/resources/assets/js/pages/manage/components/TeamManagement.vue
index 3a49d677..11f0254e 100644
--- a/resources/assets/js/pages/manage/components/TeamManagement.vue
+++ b/resources/assets/js/pages/manage/components/TeamManagement.vue
@@ -211,6 +211,9 @@ export default {
                                 props: {
                                     command: 'delete',
                                 },
+                                style: {
+                                    color: 'red'
+                                }
                             }, [h('div', this.$L('删除'))]),
                         ])
                         const dropdownMenu = h('EDropdown', {
diff --git a/resources/assets/js/pages/manage/dashboard.vue b/resources/assets/js/pages/manage/dashboard.vue
index 9f688234..6ac588f6 100644
--- a/resources/assets/js/pages/manage/dashboard.vue
+++ b/resources/assets/js/pages/manage/dashboard.vue
@@ -70,7 +70,7 @@
                                     </div>
                                 </EDropdownItem>
                                 <template v-if="item.parent_id === 0">
-                                    <EDropdownItem v-if="item.parent_id === 0" divided disabled>{{$L('背景色')}}</EDropdownItem>
+                                    <EDropdownItem divided disabled>{{$L('背景色')}}</EDropdownItem>
                                     <EDropdownItem v-for="(c, k) in $store.state.taskColorList" :key="k" :command="c">
                                         <div class="item">
                                             <i class="taskfont" :style="{color:c.color||'#f9f9f9'}" v-html="c.color == item.color ? '&#xe61d;' : '&#xe61c;'"></i>{{$L(c.name)}}
diff --git a/resources/assets/js/store/getters.js b/resources/assets/js/store/getters.js
index 8db4bf5f..44fdf429 100644
--- a/resources/assets/js/store/getters.js
+++ b/resources/assets/js/store/getters.js
@@ -72,13 +72,7 @@ export default {
                 }
                 return true;
             }).map(task => {
-                if (task.parent_id <= 0) {
-                    // 主任务
-                    return Object.assign({}, task, {
-                        sub_top: false,
-                        sub_my: list.filter(({parent_id}) => parent_id == task.id),
-                    });
-                } else {
+                if (task.parent_id > 0) {
                     // 子任务
                     const data = state.tasks.find(({id}) => id == task.parent_id);
                     if (data) {
@@ -99,6 +93,12 @@ export default {
                             sub_my: [],
                         });
                     }
+                } else {
+                    // 主任务
+                    return Object.assign({}, task, {
+                        sub_top: false,
+                        sub_my: list.filter(({parent_id}) => parent_id == task.id),
+                    });
                 }
             })
         }