diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue index 71bca822..f6f1a331 100644 --- a/resources/assets/js/pages/manage/components/DialogWrapper.vue +++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue @@ -2,8 +2,8 @@
+ @dragover.prevent="chatDragOver(true, $event)" + @dragleave.prevent="chatDragOver(false, $event)">

{{dialogDetail.name}}

@@ -156,7 +156,7 @@ export default { } }, - chatDragOver(show) { + chatDragOver(show, e) { let random = (this.__dialogDrag = $A.randomString(8)); if (!show) { setTimeout(() => { @@ -165,7 +165,10 @@ export default { } }, 150); } else { - this.dialogDrag = show; + if (e.dataTransfer.effectAllowed === 'move') { + return; + } + this.dialogDrag = true; } }, diff --git a/resources/assets/js/pages/manage/components/ProjectList.vue b/resources/assets/js/pages/manage/components/ProjectList.vue index b96a2a70..28716bf5 100644 --- a/resources/assets/js/pages/manage/components/ProjectList.vue +++ b/resources/assets/js/pages/manage/components/ProjectList.vue @@ -68,11 +68,11 @@ :class="['column-head', column.color ? 'custom-color' : '']" :style="column.color ? {backgroundColor: column.color}:null">
- {{column.name}}{{column.name}}{{column.name}}{{column.name}}{{column.name}}{{column.name}} + {{column.name}} ({{column.project_task.length}})
- +
    @@ -736,7 +736,8 @@ export default { } return true; } - }) + }); + this.$refs['poptip_' + column.id][0].handleClose(); }, removeColumn(column) { @@ -767,6 +768,7 @@ export default { }); } }); + this.$refs['poptip_' + column.id][0].handleClose(); }, saveColumn(column, name, color) { @@ -794,6 +796,7 @@ export default { } } }); + this.$refs['poptip_' + column.id][0].handleClose(); }, onSetting() { diff --git a/resources/assets/sass/project-list.scss b/resources/assets/sass/project-list.scss index d8ceb44c..56806f4e 100644 --- a/resources/assets/sass/project-list.scss +++ b/resources/assets/sass/project-list.scss @@ -217,9 +217,6 @@ font-weight: 500; > span { font-size: 15px; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; } > em { color: #888888;