nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-04-18 00:02:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

bug fixes

Browse Source
This commit is contained in:
MakingCG
2020-03-16 18:23:22 +01:00
parent 850f910b96
commit 7cdf463e4e
13 changed files with 66 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/js/components/VueFileManagerComponents/FilesView/Alert.vue
View File

@@ -117,7 +117,7 @@
right: 0;
left: 0;
bottom: 0;
background: rgba(0, 0, 0, 0.25);
background: rgba(255, 255, 255, 0.5);
}
}

5
resources/js/components/VueFileManagerComponents/FilesView/DesktopToolbar.vue
View File

@@ -86,6 +86,9 @@
},
preview() {
return this.preview_type === 'list' ? 'th' : 'th-list'
},
isTrash() {
return this.currentFolder.location === 'trash' || this.currentFolder.location === 'trash-root'
}
},
data() {
@@ -112,7 +115,7 @@
events.$emit('items:delete')
},
createFolder() {
this.$createFolder()
if (! this.isTrash) this.$createFolder()
}
},
created() {

2
resources/js/components/VueFileManagerComponents/FilesView/EmptyPage.vue
View File

@@ -40,7 +40,7 @@
return this.data.length == 0
},
isTrash() {
return typeof this.currentFolder.unique_id === 'undefined'
return this.currentFolder.location === 'trash' || this.currentFolder.location === 'trash-root'
}
},
data() {

24
resources/js/components/VueFileManagerComponents/FilesView/FileItemGrid.vue
View File

@@ -48,7 +48,7 @@
@input="changeItemName"
:contenteditable="!$isMobile()"
class="name"
>{{ item.name }}</span
>{{ itemName }}</span
>
<!--Other attributes-->
@@ -106,7 +106,7 @@
return {
isClicked: false,
area: false,
item: undefined
itemName: undefined
}
},
methods: {
@@ -126,6 +126,10 @@
},
clickedItem(e) {
events.$emit('contextMenu:hide')
events.$emit('fileItem:deselect')
// Set clicked item
this.isClicked = true
// Open in mobile version on first click
if (this.$isMobile() && this.isFolder) {
@@ -165,6 +169,7 @@
}
},
changeItemName: debounce(function (e) {
// Prevent submit empty string
if (e.target.innerText === '') return
@@ -176,20 +181,17 @@
}, 300)
},
created() {
this.item = this.data
events.$on('fileItem:clicked', unique_id => {
if (this.data.unique_id == unique_id) {
this.isClicked = true
} else {
this.isClicked = false
}
})
this.itemName = this.data.name
events.$on('fileItem:deselect', () => {
// Deselect file
this.isClicked = false
})
// Change item name
events.$on('change:name', (item) => {
if (this.data.unique_id == item.unique_id) this.itemName = item.name
})
}
}
</script>

25
resources/js/components/VueFileManagerComponents/FilesView/FileItemList.vue
View File

@@ -47,8 +47,7 @@
@input="changeItemName"
:contenteditable="!$isMobile() && !$isTrashLocation()"
class="name"
>{{ item.name }}</span
>
>{{ itemName }}</span>
<!--Other attributes-->
<span v-if="isFile || isImage" class="item-size">{{ data.filesize }}, {{ timeStamp }}</span>
@@ -115,7 +114,7 @@
return {
isClicked: false,
area: false,
item: undefined,
itemName: undefined,
}
},
methods: {
@@ -137,6 +136,10 @@
},
clickedItem(e) {
events.$emit('contextMenu:hide')
events.$emit('fileItem:deselect')
// Set clicked item
this.isClicked = true
// Open in mobile version on first click
if (this.$isMobile() && this.isFolder) {
@@ -176,6 +179,7 @@
}
},
changeItemName: debounce(function (e) {
// Prevent submit empty string
if (e.target.innerText === '') return
@@ -187,20 +191,17 @@
}, 300)
},
created() {
this.item = this.data
events.$on('fileItem:clicked', unique_id => {
if (this.data.unique_id == unique_id) {
this.isClicked = true
} else {
this.isClicked = false
}
})
this.itemName = this.data.name
events.$on('fileItem:deselect', () => {
// Deselect file
this.isClicked = false
})
// Change item name
events.$on('change:name', (item) => {
if (this.data.unique_id == item.unique_id) this.itemName = item.name
})
},
}
</script>

15
resources/js/components/VueFileManagerComponents/FilesView/FilesContainer.vue
View File

@@ -28,7 +28,6 @@
<FileItemList
@dragstart="dragStart(item)"
@drop="dragFinish(item)"
@click.native="clickedFileItem(item.unique_id)"
@contextmenu.native.prevent="contextMenu($event, item)"
:data="item"
v-for="item in data"
@@ -49,7 +48,6 @@
<FileItemGrid
@dragstart="dragStart(item)"
@drop="dragFinish(item)"
@click.native="clickedFileItem(item.unique_id)"
@contextmenu.native.prevent="contextMenu($event, item)"
:data="item"
v-for="item in data"
@@ -156,16 +154,15 @@
moveTo(from_item, to_item) {
this.$store.dispatch('moveItem', [from_item, to_item])
},
clickedFileItem(unique_id) {
events.$emit('fileItem:clicked', unique_id)
},
contextMenu(event, item) {
events.$emit('contextMenu:show', event, item)
},
filesContainerClick(e) {
if (e.target.className === 'file-list grid') {
events.$emit('fileItem:deselect')
}
filesContainerClick() {
// Deselect clicked item
events.$emit('fileItem:deselect')
// Hide context menu if is opened
events.$emit('contextMenu:hide')
}
},

12
resources/js/components/VueFileManagerComponents/FilesView/MobileOptionList.vue
View File

@@ -115,11 +115,19 @@
)
if (itemName && itemName !== '') {
this.$store.dispatch('changeItemName', {
let item = {
unique_id: this.fileInfoDetail.unique_id,
type: this.fileInfoDetail.type,
name: itemName
})
}
this.$store.dispatch('changeItemName', item)
// Change item name if is mobile device or prompted
if ( this.$isMobile() ) {
events.$emit('change:name', item)
}
}
},
closeAndResetContextMenu() {