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

upload fix

Browse Source
This commit is contained in:
Peter Papp
2021-05-15 07:22:57 +02:00
parent d8bbfcd4d2
commit 6dc34964d8
4 changed files with 42 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/js/components/FilesView/DesktopToolbar.vue
+1 -1
View File
@@ -319,7 +319,7 @@
color: $dark_mode_text_primary;
}
.toolbar-go-back {
.location {
.location-title {
color: $dark_mode_text_primary;
}
resources/js/helpers.js
Vendored
+9 -2
View File
@@ -206,9 +206,16 @@ const Helpers = {
// Set Data
let formData = new FormData(),
uploadedSize = 0,
isNotGeneralError = true,
striped_name = item.file.name.replace(/[^A-Za-z 0-9 \.,\?""!@#\$%\^&\*\(\)-_=\+;:<>\/\\\|\}\{\[\]`~]*/g, ''),
filename = Array(16).fill(0).map(x => Math.random().toString(36).charAt(2)).join('') + '-' + striped_name + '.part'
striped_name = item.file.name
.replace(/[^A-Za-z 0-9 \.,\?""!@#\$%\^&\*\(\)-_=\+;:<>\/\\\|\}\{\[\]`~]*/g, ''),
filename = Array(16)
.fill(0)
.map(x => Math.random().toString(36).charAt(2))
.join('') + '-' + striped_name + '.part'
do {
let isLast = chunks.length === 1,
resources/js/store/modules/fileFunctions.js
Vendored
+25 -22
View File
@@ -183,7 +183,7 @@ const actions = {
'Content-Type': 'application/octet-stream'
},
onUploadProgress: event => {
var percentCompleted = Math.floor(((totalUploadedSize + event.loaded) / fileSize) * 100)
let percentCompleted = Math.floor(((totalUploadedSize + event.loaded) / fileSize) * 100);
commit('UPLOADING_FILE_PROGRESS', percentCompleted >= 100 ? 100 : percentCompleted)
@@ -195,33 +195,36 @@ const actions = {
.then(response => {
resolve(response)
commit('PROCESSING_FILE', false)
// Proceed if was returned database record
if (response.data.id) {
// Remove first file from file queue
commit('SHIFT_FROM_FILE_QUEUE')
commit('PROCESSING_FILE', false)
// Check if user is in uploading folder, if yes, than show new file
if (response.data.folder_id == getters.currentFolder.id) {
// Remove first file from file queue
commit('SHIFT_FROM_FILE_QUEUE')
// Add uploaded item into view
commit('ADD_NEW_ITEMS', response.data)
// Check if user is in uploading folder, if yes, than show new file
if (response.data.folder_id == getters.currentFolder.id) {
// Reset file progress
commit('UPLOADING_FILE_PROGRESS', 0)
// Add uploaded item into view
commit('ADD_NEW_ITEMS', response.data)
// Increase count in files in queue uploaded for 1
commit('INCREASE_FILES_IN_QUEUE_UPLOADED')
// Reset file progress
commit('UPLOADING_FILE_PROGRESS', 0)
// Increase count in files in queue uploaded for 1
commit('INCREASE_FILES_IN_QUEUE_UPLOADED')
}
// Start uploading next file if file queue is not empty
if (getters.fileQueue.length) {
Vue.prototype.$handleUploading(getters.fileQueue[0])
}
// Reset upload process
if (!getters.fileQueue.length)
commit('CLEAR_UPLOAD_PROGRESS')
}
// Start uploading next file if file queue is not empty
if (getters.fileQueue.length) {
Vue.prototype.$handleUploading(getters.fileQueue[0])
}
// Reset upload process
if (!getters.fileQueue.length)
commit('CLEAR_UPLOAD_PROGRESS')
})
.catch(error => {
reject(error)