mirror of
https://github.com/kuaifan/dootask.git
synced 2026-01-02 17:28:17 +00:00
fix: 项目-任务列表tab优化
This commit is contained in:
parent
f68226f4b4
commit
bf46881e3b
3
resources/assets/js/functions/web.js
vendored
3
resources/assets/js/functions/web.js
vendored
@ -66,8 +66,7 @@
|
||||
return {
|
||||
project_id,
|
||||
card: true,
|
||||
menu: false,
|
||||
gantt: false,
|
||||
menuType: 'card',
|
||||
cardInit: false,
|
||||
chat: false,
|
||||
showMy: true,
|
||||
|
||||
@ -82,14 +82,14 @@
|
||||
</Cascader>
|
||||
</div>
|
||||
<div class="project-switch-button">
|
||||
<div @click="tabTypeChange('card')" :class="{ 'active': projectParameter('card')}"><i class="taskfont"></i></div>
|
||||
<div @click="tabTypeChange('menu')" :class="{ 'active': projectParameter('menu')}"><i class="taskfont"></i></div>
|
||||
<div @click="tabTypeChange('gantt')" :class="{ 'active': projectParameter('gantt')}"><i class="taskfont"></i></div>
|
||||
<div @click="tabTypeChange('card')" :class="{ 'active': projectParameter('menuType') === 'card'}"><i class="taskfont"></i></div>
|
||||
<div @click="tabTypeChange('menu')" :class="{ 'active': projectParameter('menuType') === 'menu'}"><i class="taskfont"></i></div>
|
||||
<div @click="tabTypeChange('gantt')" :class="{ 'active': projectParameter('menuType') === 'gantt'}"><i class="taskfont"></i></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div v-if="projectParameter('card')" class="project-column">
|
||||
<div v-if="projectParameter('menuType') === 'card'" class="project-column">
|
||||
<Draggable
|
||||
:list="columnList"
|
||||
:animation="150"
|
||||
@ -225,7 +225,7 @@
|
||||
</li>
|
||||
</Draggable>
|
||||
</div>
|
||||
<div v-if="projectParameter('menu')" class="project-table overlay-y">
|
||||
<div v-if="projectParameter('menuType') === 'menu'" class="project-table overlay-y">
|
||||
<div class="project-table-head">
|
||||
<Row class="task-row">
|
||||
<Col span="12"># {{$L('任务名称')}}</Col>
|
||||
@ -312,7 +312,7 @@
|
||||
<TaskRow v-if="projectParameter('showCompleted')" :list="completedList" open-key="completed" @on-priority="addTaskOpen" showCompleteAt/>
|
||||
</div>
|
||||
</div>
|
||||
<div v-if="projectParameter('gantt')" class="project-table overlay-y" style="position: relative">
|
||||
<div v-if="projectParameter('menuType') === 'gantt'" class="project-table overlay-y" style="position: relative">
|
||||
<!-- 甘特图 -->
|
||||
<ProjectGantt :lineData="ganttColumnList[0].tasks"
|
||||
:projectLabel="ganttColumnList"
|
||||
@ -1401,31 +1401,25 @@ export default {
|
||||
tabTypeChange(type) {
|
||||
switch (type) {
|
||||
case "card":
|
||||
this.$store.dispatch('toggleProjectParameter', 'card');
|
||||
if (this.projectParameter('card')) {
|
||||
this.projectParameter('menu') ? this.$store.dispatch('toggleProjectParameter', 'menu') : '';
|
||||
this.projectParameter('gantt') ? this.$store.dispatch('toggleProjectParameter', 'gantt') : '';
|
||||
} else {
|
||||
this.$store.dispatch('toggleProjectParameter', 'card');
|
||||
}
|
||||
this.$store.dispatch('toggleProjectParameter', {
|
||||
project_id: this.projectId,
|
||||
key: 'menuType',
|
||||
value: 'card'
|
||||
});
|
||||
break;
|
||||
case "menu":
|
||||
this.$store.dispatch('toggleProjectParameter', 'menu');
|
||||
if (this.projectParameter('menu')) {
|
||||
this.projectParameter('card') ? this.$store.dispatch('toggleProjectParameter', 'card') : '';
|
||||
this.projectParameter('gantt') ? this.$store.dispatch('toggleProjectParameter', 'gantt') : '';
|
||||
} else {
|
||||
this.$store.dispatch('toggleProjectParameter', 'menu');
|
||||
}
|
||||
this.$store.dispatch('toggleProjectParameter', {
|
||||
project_id: this.projectId,
|
||||
key: 'menuType',
|
||||
value: 'menu'
|
||||
});
|
||||
break;
|
||||
case "gantt":
|
||||
this.$store.dispatch('toggleProjectParameter', 'gantt');
|
||||
if (this.projectParameter('gantt')) {
|
||||
this.projectParameter('menu') ? this.$store.dispatch('toggleProjectParameter', 'menu') : '';
|
||||
this.projectParameter('card') ? this.$store.dispatch('toggleProjectParameter', 'card') : '';
|
||||
} else {
|
||||
this.$store.dispatch('toggleProjectParameter', 'gantt');
|
||||
}
|
||||
this.$store.dispatch('toggleProjectParameter', {
|
||||
project_id: this.projectId,
|
||||
key: 'menuType',
|
||||
value: 'gantt'
|
||||
});
|
||||
break;
|
||||
}
|
||||
},
|
||||
|
||||
7
resources/assets/js/store/actions.js
vendored
7
resources/assets/js/store/actions.js
vendored
@ -148,9 +148,11 @@ export default {
|
||||
$A.execMainDispatch("toggleProjectParameter", data)
|
||||
//
|
||||
let key = data;
|
||||
let value = null;
|
||||
let project_id = state.projectId;
|
||||
if ($A.isJson(data)) {
|
||||
key = data.key;
|
||||
value = data.value;
|
||||
project_id = data.project_id;
|
||||
}
|
||||
if (project_id) {
|
||||
@ -160,9 +162,12 @@ export default {
|
||||
index = state.cacheProjectParameter.findIndex(item => item.project_id == project_id)
|
||||
}
|
||||
const cache = state.cacheProjectParameter[index];
|
||||
if (!$A.isJson(key)) {
|
||||
if (!$A.isJson(key) && !value) {
|
||||
key = {[key]: !cache[key]};
|
||||
}
|
||||
if (value) {
|
||||
key = {[key]: value};
|
||||
}
|
||||
state.cacheProjectParameter.splice(index, 1, Object.assign(cache, key))
|
||||
setTimeout(() => {
|
||||
$A.setStorage("cacheProjectParameter", state.cacheProjectParameter);
|
||||
|
||||
2
resources/assets/js/store/getters.js
vendored
2
resources/assets/js/store/getters.js
vendored
@ -34,7 +34,7 @@ export default {
|
||||
cache = $A.projectParameterTemplate(state.projectId)
|
||||
state.cacheProjectParameter.push(cache);
|
||||
}
|
||||
return cache && !!cache[key];
|
||||
return cache[key];
|
||||
}
|
||||
},
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user