From 020dd73e46cfa151347f010214f804b582631123 Mon Sep 17 00:00:00 2001 From: darkwind Date: Wed, 26 May 2021 22:30:12 +0800 Subject: [PATCH 1/3] fix file upload isn't cleared after create --- .../forms/resources/views/components/file-upload.blade.php | 4 ++++ src/Resources/Pages/CreateRecord.php | 2 ++ src/Resources/RelationManager/CreateRecord.php | 2 ++ 3 files changed, 8 insertions(+) diff --git a/packages/forms/resources/views/components/file-upload.blade.php b/packages/forms/resources/views/components/file-upload.blade.php index 23be018fb7..914c347dba 100644 --- a/packages/forms/resources/views/components/file-upload.blade.php +++ b/packages/forms/resources/views/components/file-upload.blade.php @@ -119,6 +119,10 @@ styleProgressIndicatorPosition: '{{ $formComponent->getUploadProgressIndicatorPosition() }}', }) + this.addEventListener('pondReset', e => { + pond.removeFiles(); + }) + $watch('value', () => { @this.getUploadedFileUrl(name, disk).then((uploadedFileUrl) => { if (uploadedFileUrl) { diff --git a/src/Resources/Pages/CreateRecord.php b/src/Resources/Pages/CreateRecord.php index b9cf49429d..848d90411a 100644 --- a/src/Resources/Pages/CreateRecord.php +++ b/src/Resources/Pages/CreateRecord.php @@ -54,6 +54,8 @@ class CreateRecord extends Page return; } + $this->dispatchBrowserEvent('pondReset'); + $this->redirect($this->getResource()::generateUrl(static::$showRoute, [ 'record' => $this->record, ])); diff --git a/src/Resources/RelationManager/CreateRecord.php b/src/Resources/RelationManager/CreateRecord.php index cbc598044a..4a1739f507 100644 --- a/src/Resources/RelationManager/CreateRecord.php +++ b/src/Resources/RelationManager/CreateRecord.php @@ -55,6 +55,8 @@ class CreateRecord extends Component return; } + + $this->dispatchBrowserEvent('pondReset'); $this->dispatchBrowserEvent('close', "{$manager}RelationManagerCreateModal"); } From 6c05e96c342ef7e484372d8b0420b41c97322063 Mon Sep 17 00:00:00 2001 From: Dan Harrin Date: Thu, 3 Jun 2021 21:22:29 +0100 Subject: [PATCH 2/3] wip --- .../resources/views/components/file-upload.blade.php | 8 ++++---- src/Resources/Pages/CreateRecord.php | 2 -- src/Resources/RelationManager/CreateRecord.php | 2 -- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/packages/forms/resources/views/components/file-upload.blade.php b/packages/forms/resources/views/components/file-upload.blade.php index 914c347dba..cb73a289c8 100644 --- a/packages/forms/resources/views/components/file-upload.blade.php +++ b/packages/forms/resources/views/components/file-upload.blade.php @@ -119,11 +119,11 @@ styleProgressIndicatorPosition: '{{ $formComponent->getUploadProgressIndicatorPosition() }}', }) - this.addEventListener('pondReset', e => { - pond.removeFiles(); - }) - $watch('value', () => { + if (! value) { + pond.removeFiles() + } + @this.getUploadedFileUrl(name, disk).then((uploadedFileUrl) => { if (uploadedFileUrl) { pond.files = [{ diff --git a/src/Resources/Pages/CreateRecord.php b/src/Resources/Pages/CreateRecord.php index 848d90411a..b9cf49429d 100644 --- a/src/Resources/Pages/CreateRecord.php +++ b/src/Resources/Pages/CreateRecord.php @@ -54,8 +54,6 @@ class CreateRecord extends Page return; } - $this->dispatchBrowserEvent('pondReset'); - $this->redirect($this->getResource()::generateUrl(static::$showRoute, [ 'record' => $this->record, ])); diff --git a/src/Resources/RelationManager/CreateRecord.php b/src/Resources/RelationManager/CreateRecord.php index 4a1739f507..cbc598044a 100644 --- a/src/Resources/RelationManager/CreateRecord.php +++ b/src/Resources/RelationManager/CreateRecord.php @@ -55,8 +55,6 @@ class CreateRecord extends Component return; } - - $this->dispatchBrowserEvent('pondReset'); $this->dispatchBrowserEvent('close', "{$manager}RelationManagerCreateModal"); } From 88e8551b9ca2c1275363255fa4379a19d407d711 Mon Sep 17 00:00:00 2001 From: Dan Harrin Date: Thu, 3 Jun 2021 21:25:29 +0100 Subject: [PATCH 3/3] wip --- packages/forms/resources/views/components/select.blade.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/forms/resources/views/components/select.blade.php b/packages/forms/resources/views/components/select.blade.php index cfae7588ca..481b5bf0f6 100644 --- a/packages/forms/resources/views/components/select.blade.php +++ b/packages/forms/resources/views/components/select.blade.php @@ -130,6 +130,8 @@ this.$watch('value', () => { if (this.value in this.options) { this.displayValue = this.options[this.value] + } else if (! this.value) { + this.clearValue() } }) },