Merge pull request #1819 from SevanNerse/master

dropzone component is arranged
This commit is contained in:
Cüneyt Şentürk 2021-01-30 22:14:42 +03:00 committed by GitHub
commit c08106418c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 78 additions and 14 deletions

View File

@ -227,8 +227,10 @@ class Document extends Model
public function delete_attachment()
{
foreach ($this->attachment as $file) {
MediaModel::where('id', $file->id)->delete();
if ($attachments = $this->attachment) {
foreach ($attachments as $file) {
MediaModel::where('id', $file->id)->delete();
}
}
}

View File

@ -1,5 +1,5 @@
<template>
<div class="dropzone mb-3 dz-clickable" :class="[preview == 'single' ? 'dropzone-single': 'dropzone-multiple']">
<div id="dropzone" class="dropzone mb-3 dz-clickable" :class="[preview == 'single' ? 'dropzone-single': 'dropzone-multiple']">
<div class="fallback">
<div class="custom-file">
<input type="file" class="custom-file-input" :id="'projectCoverUploads' + _uid" :multiple="multiple">
@ -33,6 +33,9 @@
<button data-dz-remove="true" class="btn btn-danger btn-sm">
<i class="fas fa-trash"></i>
</button>
<a href="#" type="button" class="btn btn-sm btn-info text-white d-none" data-dz-download>
<i class="fas fa-file-download"></i>
</a>
</div>
</div>
</li>
@ -80,6 +83,10 @@ export default {
return this.multiple ? 'multiple' : 'single'
},
},
attachments: {
type: Array,
default: () => ([])
},
},
model: {
@ -89,9 +96,7 @@ export default {
data() {
return {
currentFile: null,
files: [],
showList: false,
configurations: this.options,
}
},
@ -112,14 +117,15 @@ export default {
let finalOptions = {
...self.configurations,
url: this.url,
thumbnailWidth: null,
thumbnailHeight: null,
previewsContainer: preview,
previewTemplate: preview.innerHTML,
dictDefaultMessage: this.textDropFile,
autoProcessQueue: false,
init: function () {
this.on('addedfile', function (file) {
let dropzone = this
dropzone.on('addedfile', function (file) {
self.files.push(file);
if (self.configurations.maxFiles == 1) {
@ -129,8 +135,8 @@ export default {
}
}),
this.on('removedfile', function (file) {
let index = self.files.findIndex(f => f.upload.uuid === file.upload.uuid);
dropzone.on('removedfile', function (file) {
let index = self.files.findIndex(f => f.name === file.name)
if (index !== -1) {
self.files.splice(index, 1);
@ -143,22 +149,42 @@ export default {
}
}),
this.on('maxfilesexceeded', function(file) {
dropzone.on('maxfilesexceeded', function(file) {
this.removeAllFiles('notCancel');
this.addFile(file);
}),
this.on('maxfilesreached', function(file) {
dropzone.on('maxfilesreached', function(file) {
if (self.multiple) {
this.disable();
}
})
setTimeout(() => {
self.attachments.forEach(async (attachment) => {
let blob = await self.getAttachmentContent(attachment.path)
let file = new File([blob], attachment.name, { type: blob.type })
dropzone.displayExistingFile(file, attachment.path, () => {
file.previewElement.querySelector("[data-dz-download]").href = attachment.downloadPath
file.previewElement.querySelector("[data-dz-download]").classList.remove("d-none")
})
})
if (self.preview == 'single' && self.attachments.length == 1)
document.querySelector("#dropzone").classList.add("dz-max-files-reached");
}, 750)
}
};
this.dropzone = new Dropzone(this.$el, finalOptions);
preview.innerHTML = '';
},
async getAttachmentContent(imageUrl) {
return await axios.get(imageUrl, { responseType: 'blob' }).then(function (response) {
return response.data
});
}
},

View File

@ -32,7 +32,7 @@
{{ Form::textareaGroup('address', trans('general.address')) }}
{{ Form::fileGroup('logo', trans('companies.logo'), '', ['dropzone-class' => 'form-file']) }}
{{ Form::fileGroup('logo', trans('companies.logo'), '', ['dropzone-class' => 'form-file'], $company->company_logo) }}
{{ Form::radioGroup('enabled', trans('general.enabled'), $company->enabled) }}
</div>

View File

@ -30,7 +30,7 @@
{{ Form::selectRemoteAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, $item->category_id, ['path' => route('modals.categories.create') . '?type=item', 'remote_action' => route('categories.index'). '?search=type:item']) }}
{{ Form::fileGroup('picture', trans_choice('general.pictures', 1), '', ['dropzone-class' => 'form-file']) }}
{{ Form::fileGroup('picture', trans_choice('general.pictures', 1), '', ['dropzone-class' => 'form-file'], $item->picture) }}
{{ Form::radioGroup('enabled', trans('general.enabled'), $item->enabled) }}
</div>

View File

@ -36,6 +36,42 @@
url="{{ $attributes['url'] }}"
@endif
@if (!empty($value))
@php
$attachments = [];
@endphp
@if (is_array($value))
@foreach($value as $attachment)
@php
$attachments[] = [
'name' => $attachment->filename . '.' . $attachment->extension,
'path' => route('uploads.get', $attachment->id),
'downloadPath' => route('uploads.download', $attachment->id)
];
@endphp
@endforeach
@elseif ($value instanceof \Plank\Mediable\Media)
@php
$attachments[] = [
'name' => $value->filename . '.' . $value->extension,
'path' => route('uploads.get', $value->id)
];
@endphp
@else
@php
$attachment = \Plank\Mediable\Media::find($value);
$attachments[] = [
'name' => $attachment->filename . '.' . $attachment->extension,
'path' => route('uploads.get', $attachment->id)
];
@endphp
@endif
:attachments="{{ json_encode($attachments) }}"
@endif
v-model="{{ !empty($attributes['v-model']) ? $attributes['v-model'] : (!empty($attributes['data-field']) ? 'form.' . $attributes['data-field'] . '.'. $name : 'form.' . $name) }}"
></akaunting-dropzone-file-upload>
</div>