Export compatible with swoole

never615 · Jun 15, 2019 · c3de646 · c3de646
1 parent deb7373
commit c3de646
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/config/admin.php b/config/admin.php
@@ -345,6 +345,14 @@
     */
     'enable_menu_search' => true,
 
+
+    /*
+    |--------------------------------------------------------------------------
+    | If your are using swoole, set it to `true`.
+    |--------------------------------------------------------------------------
+    */
+    'swoole'                    => env("SWOOLE", false),
+
     /*
     |--------------------------------------------------------------------------
     | Extension Directory

diff --git a/src/Grid.php b/src/Grid.php
@@ -187,7 +187,9 @@ public function __construct(Eloquent $model, Closure $builder = null)
 
         $this->initialize();
 
-        $this->handleExportRequest();
+        if (!config('admin.swoole')) {
+            $this->handleExportRequest();
+        }
 
         $this->callInitCallbacks();
     }
@@ -234,8 +236,9 @@ protected function callInitCallbacks()
      * Handle export request.
      *
      * @param bool $forceExport
+     * @return mixed
      */
-    protected function handleExportRequest($forceExport = false)
+    public function handleExportRequest($forceExport = false)
     {
         if (!$scope = request(Exporter::$queryName)) {
             return;
@@ -251,11 +254,11 @@ protected function handleExportRequest($forceExport = false)
         if ($this->builder) {
             call_user_func($this->builder, $this);
 
-            $this->getExporter($scope)->export();
+            return $this->getExporter($scope)->export();
         }
 
         if ($forceExport) {
-            $this->getExporter($scope)->export();
+            return $this->getExporter($scope)->export();
         }
     }
 
@@ -363,7 +366,7 @@ protected function addColumn($column = '', $label = '')
         $column->setGrid($this);
 
         return tap($column, function ($value) {
-            $this->columns->push($value);
+            $this->columns->put($value->getName(), $value);
         });
     }