Merge pull request #98 from ahmedabdel3al/1.2

Using allFields() method breaks export of relationship and computed fields

src/Actions/ExportToExcel.php

@@ -193,7 +193,7 @@ public function map($row): array
             $row->setHidden([]);
             $row = $this->replaceFieldValuesWhenOnResource(
                 $row,
-                is_array($only) ? $only : array_keys($row->attributesToArray())
+                $only
             );
         }
 

src/Concerns/Only.php

@@ -8,9 +8,9 @@
 trait Only
 {
     /**
-     * @var array|null
+     * @var array
      */
-    protected $only;
+    protected $only = [];
 
     /**
      * @var bool
@@ -50,7 +50,7 @@ public function allFields()
     }
 
     /**
-     * @return array|null
+     * @return array
      */
     public function getOnly()
     {
@@ -64,8 +64,14 @@ protected function handleOnly(ExportActionRequest $request)
     {
         // If not a specific only array, and user wants only index fields,
         // fill the only with the index fields.
-        if ($this->onlyIndexFields && (!is_array($this->only) || count($this->only) === 0)) {
-            $this->only = $request->indexFields($request->newResource());
+        $indexFields = $request->indexFields($request->newResource());
+
+        if ($this->onlyIndexFields && count($this->only) === 0) {
+            $this->only = $indexFields;
+        } elseif (!$this->onlyIndexFields) {
+            $modelAttributes = optional($request->toQuery()->first())->attributesToArray() ?: [];
+
+            $this->only = array_merge(array_keys($modelAttributes), $indexFields);
         }
     }
 }