gitee/dootask
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
kuaifan 2022-01-05 15:04:55 +08:00
parent 7a22f4b20f
commit 6324e79aba
5 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/assets/js/pages/manage/components/TaskDetail.vue
View File

@ -572,7 +572,7 @@ export default {
return []; return [];
} }
return this.tasks.filter(({parent_id}) => { return this.tasks.filter(({parent_id}) => {
return parent_id > 0 && parent_id == this.taskId return parent_id == this.taskId
}).sort((a, b) => { }).sort((a, b) => {
return a.id - b.id; return a.id - b.id;
}); });

6
resources/assets/js/pages/manage/components/TaskRow.vue
View File

@ -5,7 +5,7 @@
<em v-if="item.p_name" class="priority-color" :style="{backgroundColor:item.p_color}"></em> <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' : '']"> <Col span="12" :class="['row-name', item.complete_at ? 'complete' : '']">
<Icon <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' : '']" :class="['sub-icon', taskOpen[item.id] ? 'active' : '']"
type="ios-arrow-forward" type="ios-arrow-forward"
@click="getSublist(item)"/> @click="getSublist(item)"/>
@ -41,7 +41,7 @@
</div> </div>
</EDropdownItem> </EDropdownItem>
<template v-if="item.parent_id === 0"> <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"> <EDropdownItem v-for="(c, k) in $store.state.taskColorList" :key="k" :command="c">
<div class="item"> <div class="item">
<i class="taskfont" :style="{color:c.color||'#f9f9f9'}" v-html="c.color == item.color ? '&#xe61d;' : '&#xe61c;'"></i>{{$L(c.name)}} <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() { subTask() {
return function(task_id) { return function(task_id) {
return this.tasks.filter(({parent_id}) => { return this.tasks.filter(({parent_id}) => {
return parent_id > 0 && parent_id == task_id return parent_id == task_id
}).sort((a, b) => { }).sort((a, b) => {
return a.id - b.id; return a.id - b.id;
}); });

3
resources/assets/js/pages/manage/components/TeamManagement.vue
View File

@ -211,6 +211,9 @@ export default {
props: { props: {
command: 'delete', command: 'delete',
}, },
style: {
color: 'red'
}
}, [h('div', this.$L('删除'))]), }, [h('div', this.$L('删除'))]),
]) ])
const dropdownMenu = h('EDropdown', { const dropdownMenu = h('EDropdown', {

2
resources/assets/js/pages/manage/dashboard.vue
View File

@ -70,7 +70,7 @@
</div> </div>
</EDropdownItem> </EDropdownItem>
<template v-if="item.parent_id === 0"> <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"> <EDropdownItem v-for="(c, k) in $store.state.taskColorList" :key="k" :command="c">
<div class="item"> <div class="item">
<i class="taskfont" :style="{color:c.color||'#f9f9f9'}" v-html="c.color == item.color ? '&#xe61d;' : '&#xe61c;'"></i>{{$L(c.name)}} <i class="taskfont" :style="{color:c.color||'#f9f9f9'}" v-html="c.color == item.color ? '&#xe61d;' : '&#xe61c;'"></i>{{$L(c.name)}}

14
resources/assets/js/store/getters.js vendored
View File

@ -72,13 +72,7 @@ export default {
} }
return true; return true;
}).map(task => { }).map(task => {
if (task.parent_id <= 0) { if (task.parent_id > 0) {
// 主任务
return Object.assign({}, task, {
sub_top: false,
sub_my: list.filter(({parent_id}) => parent_id == task.id),
});
} else {
// 子任务 // 子任务
const data = state.tasks.find(({id}) => id == task.parent_id); const data = state.tasks.find(({id}) => id == task.parent_id);
if (data) { if (data) {
@ -99,6 +93,12 @@ export default {
sub_my: [], sub_my: [],
}); });
} }
} else {
// 主任务
return Object.assign({}, task, {
sub_top: false,
sub_my: list.filter(({parent_id}) => parent_id == task.id),
});
} }
}) })
} }