Merge branch '2.0' into gitee2

.env.testing

@@ -13,6 +13,8 @@ DB_DATABASE=laravel
 DB_USERNAME=root
 DB_PASSWORD=
 
+CODECOV_TOKEN=8124bc76-384b-4528-8875-a33ee1e1ee19
+
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
 QUEUE_CONNECTION=sync

.travis.yml

@@ -63,3 +63,4 @@ before_script:
 
 script:
   - php artisan dusk
+

src/Grid/Concerns/CanHidesColumns.php

@@ -205,22 +205,6 @@ trait CanHidesColumns
         })->toArray();
     }
 
-    /**
-     * Get default visible column names.
-     *
-     * @return array
-     */
-    public function getDefaultVisibleColumnNames()
-    {
-        return array_values(
-            array_diff(
-                $this->columnNames,
-                $this->hiddenColumns,
-                [Grid\Column::SELECT_COLUMN_NAME, Grid\Column::ACTION_COLUMN_NAME]
-            )
-        );
-    }
-
     protected function hasColumnSelectorRequestInput()
     {
         return $this->request->has($this->getColumnSelectorQueryName());

src/Grid/Filter/AbstractFilter.php

@@ -203,12 +203,20 @@ abstract class AbstractFilter
     /**
      * Format id.
      *
-     * @param $columns
+     * @param string|array $columns
      *
      * @return array|string
      */
     protected function formatId($columns)
     {
+        if (is_array($columns)) {
+            foreach ($columns as &$column) {
+                $column = $this->formatId($column);
+            }
+
+            return $columns;
+        }
+
         return $this->parent->grid()->makeName('filter-column-'.str_replace('.', '-', $columns));
     }
 
@@ -607,12 +615,12 @@ abstract class AbstractFilter
     protected function defaultVariables()
     {
         return array_merge([
-            'id'        => $this->id,
-            'name'      => $this->formatName($this->column),
-            'label'     => $this->label,
-            'value'     => $this->normalizeValue(),
-            'width'     => $this->width,
-            'style'     => $this->style,
+            'id'    => $this->id,
+            'name'  => $this->formatName($this->column),
+            'label' => $this->label,
+            'value' => $this->normalizeValue(),
+            'width' => $this->width,
+            'style' => $this->style,
         ], $this->presenter()->variables());
     }
 

src/Grid/Tools/ColumnSelector.php

@@ -44,20 +44,12 @@ class ColumnSelector extends AbstractTool
         $show = $this->getVisibleColumnNames();
         $all = $this->getGridColumns();
 
+        $visibleColumnNames = $this->grid->getVisibleColumnsFromQuery();
+
         $list = Checkbox::make()
             ->class('column-select-item')
             ->options($all)
-            ->check(
-                $this->getGridColumns()->filter(function ($label, $key) use ($show) {
-                    if (empty($show)) {
-                        return true;
-                    }
-
-                    return in_array($key, $show) ? true : false;
-                }
-            )
-            ->keys()
-        );
+            ->check($visibleColumnNames);
 
         $selectAll = Checkbox::make('_all_', [1 => trans('admin.all')])->check(
             $all->count() === count($show) ? 1 : null
@@ -65,7 +57,7 @@ class ColumnSelector extends AbstractTool
 
         return Admin::view('admin::grid.column-selector', [
             'checkbox'   => $list,
-            'defaults'   => $this->grid->getDefaultVisibleColumnNames(),
+            'defaults'   => $visibleColumnNames,
             'selectAll'  => $selectAll,
             'columnName' => $this->grid->getColumnSelectorQueryName(),
         ]);

src/Http/Middleware/Authenticate.php

@@ -55,7 +55,7 @@ class Authenticate
         );
 
         foreach ($excepts as $except) {
-            if ($request->routeIs($except)) {
+            if ($request->routeIs($except) || $request->routeIs(admin_route_name($except))) {
                 return true;
             }
 

src/Http/Middleware/Permission.php

@@ -107,7 +107,7 @@ class Permission
         );
 
         foreach ($excepts as $except) {
-            if ($request->routeIs($except)) {
+            if ($request->routeIs($except) || $request->routeIs(admin_route_name($except))) {
                 return true;
             }
 

src/Support/Helper.php

@@ -258,7 +258,7 @@ class Helper
         }
 
         // 判断路由名称
-        if ($request->routeIs($path)) {
+        if ($request->routeIs($path) || $request->routeIs(admin_route_name($path))) {
             return true;
         }