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

no message

Browse Source
This commit is contained in:
kuaifan 2021-06-08 17:48:58 +08:00
parent e306a17023
commit 3eeaa5752a
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
resources/assets/js/pages/manage/components/DialogWrapper.vue
View File

@ -2,8 +2,8 @@
<div <div
class="dialog-wrapper" class="dialog-wrapper"
@drop.prevent="chatPasteDrag($event, 'drag')" @drop.prevent="chatPasteDrag($event, 'drag')"
@dragover.prevent="chatDragOver(true)" @dragover.prevent="chatDragOver(true, $event)"
@dragleave.prevent="chatDragOver(false)"> @dragleave.prevent="chatDragOver(false, $event)">
<slot name="head"> <slot name="head">
<div class="dialog-title"> <div class="dialog-title">
<h2>{{dialogDetail.name}}</h2> <h2>{{dialogDetail.name}}</h2>
@ -156,7 +156,7 @@ export default {
} }
}, },
chatDragOver(show) { chatDragOver(show, e) {
let random = (this.__dialogDrag = $A.randomString(8)); let random = (this.__dialogDrag = $A.randomString(8));
if (!show) { if (!show) {
setTimeout(() => { setTimeout(() => {
@ -165,7 +165,10 @@ export default {
} }
}, 150); }, 150);
} else { } else {
this.dialogDrag = show; if (e.dataTransfer.effectAllowed === 'move') {
return;
}
this.dialogDrag = true;
} }
}, },

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

@ -68,11 +68,11 @@
:class="['column-head', column.color ? 'custom-color' : '']" :class="['column-head', column.color ? 'custom-color' : '']"
:style="column.color ? {backgroundColor: column.color}:null"> :style="column.color ? {backgroundColor: column.color}:null">
<div class="column-head-title"> <div class="column-head-title">
<span><AutoTip>{{column.name}}{{column.name}}{{column.name}}{{column.name}}{{column.name}}{{column.name}}</AutoTip></span> <AutoTip>{{column.name}}</AutoTip>
<em>({{column.project_task.length}})</em> <em>({{column.project_task.length}})</em>
</div> </div>
<div class="column-head-icon"> <div class="column-head-icon">
<Poptip> <Poptip :ref="'poptip_' + column.id">
<Icon type="ios-more" /> <Icon type="ios-more" />
<div class="more-content" slot="content"> <div class="more-content" slot="content">
<ul> <ul>
@ -736,7 +736,8 @@ export default {
} }
return true; return true;
} }
}) });
this.$refs['poptip_' + column.id][0].handleClose();
}, },
removeColumn(column) { removeColumn(column) {
@ -767,6 +768,7 @@ export default {
}); });
} }
}); });
this.$refs['poptip_' + column.id][0].handleClose();
}, },
saveColumn(column, name, color) { saveColumn(column, name, color) {
@ -794,6 +796,7 @@ export default {
} }
} }
}); });
this.$refs['poptip_' + column.id][0].handleClose();
}, },
onSetting() { onSetting() {

3
resources/assets/sass/project-list.scss vendored
View File

@ -217,9 +217,6 @@
font-weight: 500; font-weight: 500;
> span { > span {
font-size: 15px; font-size: 15px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
} }
> em { > em {
color: #888888; color: #888888;