bulk-operations v0.3 issues solved

This commit is contained in:
Milos Holba
2020-12-04 10:56:27 +01:00
parent aff2594ef2
commit 441f911560
5 changed files with 63 additions and 81 deletions

View File

@@ -25,6 +25,10 @@ import {events} from '@/bus'
if(this.fileInfoDetail.length > 1 && this.fileInfoDetail.includes(this.draggedItem) ) {
return this.fileInfoDetail.length + ' ' + this.$tc('file_detail.items', this.fileInfoDetail.length)
}
if((this.fileInfoDetail.length < 2 || !this.fileInfoDetail.includes(this.draggedItem)) && this.draggedItem ) {
return '.'+this.draggedItem.mimetype
}
},
},
data () {

View File

@@ -187,24 +187,25 @@
dragFinish(data, event) {
if (event.dataTransfer.items.length == 0) {
// Prevent to drop on file or image
if (data.type !== 'folder' || this.draggingId === data) return
//Prevent move selected folder to folder if in beteewn selected folders
if(this.fileInfoDetail.find(item => item === data)) return
if(this.fileInfoDetail.find(item => item === data && this.fileInfoDetail.length > 1)) return
// Move folder to new parent
//Move item if is not included in selected items
if(!this.fileInfoDetail.includes(this.draggingId)){
this.$store.dispatch('moveItem', {to_item:data ,noSelectedItem:this.draggingId})
}
//Move selected items to folder
if(this.fileInfoDetail.length > 0 && this.fileInfoDetail.includes(this.draggingId)){
this.$store.dispatch('moveItem', {to_item:data ,noSelectedItem: null})
}
//Move item if is not included in selected items
if(this.fileInfoDetail.length === 0 || !this.fileInfoDetail.includes(this.draggingId)){
this.$store.dispatch('moveItem', {to_item:data ,noSelectedItem:this.draggingId})
}
} else {
@@ -285,6 +286,7 @@
.mobile-multi-select {
bottom: 50px !important;
top: 0px;
}
.button-upload {

View File

@@ -401,6 +401,7 @@ export default {
//If emit to show menu coming from MediaFullPreview dont reset data
this.isVisible = false;
this.showFromMediaPreview = false;
events.$emit('hide:mobile-navigation')
},
},
created() {

View File

@@ -88,13 +88,13 @@
//Move no selected item
if(!this.fileInfoDetail.includes(this.draggedItem[0])) {
this.$store.dispatch('moveItem', {to_item: this.nodes ,noSelectedItem:this.draggedItem[0]})
this.draggedItem = []
}
//Move all selected items
if(this.fileInfoDetail.includes(this.draggedItem[0])) {
this.$store.dispatch('moveItem', {to_item: this.nodes ,noSelectedItem:null})
this.draggedItem = []
}
this.draggedItem = []
this.area = false
events.$emit('drop')
@@ -155,7 +155,7 @@
}
.is-dragenter {
border: 2px dashed $theme;
border: 2px dashed $theme !important;
border-radius: 8px;
}
@@ -167,6 +167,7 @@
position: relative;
white-space: nowrap;
width: 100%;
border: 2px dashed transparent ;
.icon {
line-height: 0;