github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2025-12-16 14:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: 项目任务甘特图图标及优化移动逻辑

Browse Source
This commit is contained in:
韦荣超 2022-03-14 18:17:23 +08:00
parent eb2b11ed3e
commit 6cffd81540
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -299,6 +299,9 @@ export default {
if (this.mouseItem != null) { if (this.mouseItem != null) {
e.preventDefault(); e.preventDefault();
var diff = e.clientX - this.mouseBak.clientX; var diff = e.clientX - this.mouseBak.clientX;
if (diff < 0 && this.mouseItem.time.start > this.mouseItem.time.end) {
return false;
}
this.$set(this.mouseItem, this.mouseBak.type, this.mouseBak.value + diff); this.$set(this.mouseItem, this.mouseBak.type, this.mouseBak.value + diff);
} else if (this.dateMove != null) { } else if (this.dateMove != null) {
e.preventDefault(); e.preventDefault();
@ -329,6 +332,9 @@ export default {
this.$set(this.mouseItem, 'moveW', 0); this.$set(this.mouseItem, 'moveW', 0);
isM = true; isM = true;
} }
if (this.mouseItem.time && this.mouseItem.time.start > this.mouseItem.time.end) {
return false;
}
// //
if (isM) { if (isM) {
this.$emit("on-change", this.mouseItem) this.$emit("on-change", this.mouseItem)

7
resources/assets/js/pages/manage/components/ProjectList.vue
View File

@ -84,12 +84,7 @@
<div :class="['project-switch-button', !projectParameter('card') ? 'menu' : '']" @click="$store.dispatch('toggleProjectParameter', 'card')"> <div :class="['project-switch-button', !projectParameter('card') ? 'menu' : '']" @click="$store.dispatch('toggleProjectParameter', 'card')">
<div><i class="taskfont">&#xe60c;</i></div> <div><i class="taskfont">&#xe60c;</i></div>
<div><i class="taskfont">&#xe66a;</i></div> <div><i class="taskfont">&#xe66a;</i></div>
</div> <div @click="projectGanttShow=!projectGanttShow"><i class="taskfont">&#xe797;</i></div>
<div class="project-gantt-item"
:class="{active:projectGanttShow}"
@click="projectGanttShow=!projectGanttShow">
<Icon type="ios-paper-outline" size="26"/>
<label class="gantt-name">{{ $L('甘特图') }}</label>
</div> </div>
</div> </div>
</div> </div>

4
resources/assets/sass/pages/components/project-list.scss vendored
View File

@ -202,7 +202,7 @@
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
width: 50%; width: 33.3%;
height: 100%; height: 100%;
z-index: 0; z-index: 0;
color: $primary-color; color: $primary-color;
@ -230,7 +230,7 @@
} }
&.menu { &.menu {
&:before { &:before {
left: 50%; left: 33.3%;
} }
> div:first-child { > div:first-child {
color: $primary-text-color; color: $primary-text-color;