Merge pull request #77 from BBS-Lab/develop

fix(flexible): fix flexible support
oneduo · Sep 9, 2022 · 03f6b08 · 03f6b08
2 parents e03f3af + df4534e
commit 03f6b08
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 7 deletions.
diff --git a/dist/js/tool.js b/dist/js/tool.js
diff --git a/resources/js/fields/FormField.vue b/resources/js/fields/FormField.vue
@@ -167,11 +167,11 @@ export default {
                 initialFiles: this.value,
                 multiple: this.field.multiple ?? false,
                 limit: this.field.limit ?? null,
-                resource: this.resourceName,
-                resourceId: this.resourceId,
+                resource: this.resourceName ?? null,
+                resourceId: this.resourceId ?? null,
                 attribute: this.flexibleGroup.length ? this.field.sortableUriKey : this.field.attribute,
-                customDisk: this.field.customDisk,
-                permissions: this.field.permissions,
+                customDisk: this.field.customDisk ?? false,
+                permissions: this.field.permissions ?? {},
                 flexibleGroup: this.flexibleGroup,
                 callback: selection => {
                     this.value = selection.map(f => this.mapEntity(f))

diff --git a/resources/js/store/actions.js b/resources/js/store/actions.js
@@ -7,7 +7,9 @@ const buildPayload = (state, params) => {
         ...params,
         attribute: state.attribute,
         resource: state.resource,
-        resourceId: state.resourceId,
+        ...(state.resourceId && {
+            resourceId: state.resourceId,
+        }),
         fieldMode: state.isFieldMode ? 1 : 0,
         ...(!state.customDisk && {
             disk: state.disk,

diff --git a/src/FileManager.php b/src/FileManager.php
@@ -11,6 +11,7 @@
 use JsonException;
 use Laravel\Nova\Fields\Field;
 use Laravel\Nova\Http\Requests\NovaRequest;
+use stdClass;
 
 class FileManager extends Field implements InteractsWithFilesystem
 {
@@ -113,6 +114,10 @@ protected function resolveAttribute($resource, $attribute = null): ?array
             $value = collect([$value]);
         }
 
+        if ($value instanceof stdClass) {
+            $value = (array) $value;
+        }
+
         if (is_array($value)) {
             if ($this->multiple) {
                 $value = collect($value)->map(fn (array $asset) => new Asset(...$asset));

diff --git a/src/Http/Requests/BaseRequest.php b/src/Http/Requests/BaseRequest.php
@@ -51,7 +51,7 @@ public function element(): ?InteractsWithFilesystem
 
     public function resolveField(): ?InteractsWithFilesystem
     {
-        $resource = $this->resourceId ? $this->findResourceOrFail() : $this->newResource();
+        $resource = !(empty($this->resourceId)) ? $this->findResourceOrFail() : $this->newResource();
 
         $fields = $this->has('flexible')
             ? $this->flexibleAvailableFields($resource)