update

src/Controllers/PermissionController.php

@@ -214,7 +214,7 @@ class PermissionController extends Controller
 
         $grid->disableEditButton();
         $grid->showQuickEditButton();
-        $grid->createMode(Grid::CREATE_MODE_DIALOG);
+        $grid->enableDialogCreate();
 
         $grid->tools(function (Grid\Tools $tools) {
             $tools->batch(function (Grid\Tools\BatchActions $actions) {

src/Controllers/RoleController.php

@@ -108,7 +108,7 @@ class RoleController extends Controller
         $grid->showQuickEditButton();
         $grid->disableFilterButton();
         $grid->quickSearch(['id', 'name', 'slug']);
-        $grid->createMode(Grid::CREATE_MODE_DIALOG);
+        $grid->enableDialogCreate();
 
         $grid->actions(function (Grid\Displayers\Actions $actions) {
             $roleModel = config('admin.database.roles_model');

src/Controllers/UserController.php

@@ -120,7 +120,7 @@ class UserController extends Controller
             $grid->showQuickEditButton();
             $grid->disableFilterButton();
             $grid->quickSearch(['id', 'name', 'username']);
-            $grid->createMode(Grid::CREATE_MODE_DIALOG);
+            $grid->enableDialogCreate();
 
             $grid->actions(function (Grid\Displayers\Actions $actions) {
                 if ($actions->key() == AdministratorModel::DEFAULT_ID) {

src/Grid.php

@@ -31,7 +31,6 @@ class Grid
         Concerns\HasExporter,
         Concerns\HasMultipleHeaders,
         Concerns\HasSelector,
-        Concerns\HasRowSelector,
         Concerns\HasQuickCreate,
         Concerns\HasQuickSearch,
         Macroable {
@@ -40,7 +39,6 @@ class Grid
 
     const CREATE_MODE_DEFAULT = 'default';
     const CREATE_MODE_DIALOG = 'dialog';
-    const CREATE_MODE_QUICK = 'quick';
 
     /**
      * The grid data model instance.
@@ -149,28 +147,32 @@ class Grid
      */
     protected $tableId = 'grid-table';
 
+    /**
+     * @var Grid\Tools\RowSelector
+     */
+    protected $rowSelector;
+
     /**
      * Options for grid.
      *
      * @var array
      */
     protected $options = [
-        'show_pagination'          => true,
-        'show_filter'              => true,
-        'show_actions'             => true,
-        'show_quick_edit_button'   => false,
-        'show_edit_button'         => true,
-        'show_view_button'         => true,
-        'show_delete_button'       => true,
-        'show_row_selector'        => true,
-        'show_create_button'       => true,
-        'show_bordered'            => false,
-        'show_toolbar'             => true,
-        'show_exporter'            => false,
-        'create_mode'              => self::CREATE_MODE_DEFAULT,
-
-        'dialog_form_area'   => ['700px', '670px'],
-        'table_header_style' => 'table-header-gray',
+        'show_pagination'        => true,
+        'show_filter'            => true,
+        'show_actions'           => true,
+        'show_quick_edit_button' => false,
+        'show_edit_button'       => true,
+        'show_view_button'       => true,
+        'show_delete_button'     => true,
+        'show_row_selector'      => true,
+        'show_create_button'     => true,
+        'show_bordered'          => false,
+        'show_toolbar'           => true,
+        'show_exporter'          => false,
+        'create_mode'            => self::CREATE_MODE_DEFAULT,
+        'dialog_form_area'       => ['700px', '670px'],
+        'table_header_style'     => 'table-header-gray',
     ];
 
     /**
@@ -270,7 +272,7 @@ class Grid
      *
      * @param array $columns
      *
-     * @return Collection|null
+     * @return Collection|void
      */
     public function columns($columns = null)
     {
@@ -301,14 +303,27 @@ class Grid
      */
     protected function addColumn($field = '', $label = '')
     {
-        $column = new Column($field, $label);
-        $column->setGrid($this);
+        $column = $this->newColumn($field, $label);
 
         $this->columns->put($field, $column);
 
         return $column;
     }
 
+    /**
+     * @param string $field
+     * @param string $label
+     *
+     * @return Column
+     */
+    public function newColumn($field = '', $label = '')
+    {
+        $column = new Column($field, $label);
+        $column->setGrid($this);
+
+        return $column;
+    }
+
     /**
      * Get Grid model.
      *
@@ -407,7 +422,7 @@ class Grid
      *
      * @param Closure $callable
      *
-     * @return Collection|null
+     * @return Collection|void
      */
     public function rows(Closure $callable = null)
     {
@@ -438,13 +453,50 @@ class Grid
         );
     }
 
+    /**
+     * @param \Closure $closure
+     *
+     * @return Grid\Tools\RowSelector
+     */
+    public function rowSelector()
+    {
+        return $this->rowSelector ?: ($this->rowSelector = new Grid\Tools\RowSelector($this));
+    }
+
+    /**
+     * Prepend checkbox column for grid.
+     *
+     * @return void
+     */
+    protected function prependRowSelectorColumn()
+    {
+        if (! $this->options['show_row_selector']) {
+            return;
+        }
+
+        $rowSelector = $this->rowSelector();
+        $keyName = $this->keyName();
+
+        $column = $this->newColumn(
+            Grid\Column::SELECT_COLUMN_NAME,
+            $rowSelector->renderHeader()
+        );
+        $column->setGrid($this);
+
+        $column->display(function () use ($rowSelector, $keyName)  {
+            return $rowSelector->renderColumn($this, $this->{$keyName});
+        });
+
+        $this->columns->prepend($column, Grid\Column::SELECT_COLUMN_NAME);
+    }
+
     /**
      * @param string $width
      * @param string $height
      *
      * @return $this
      */
-    public function setModalFormDimensions(string $width, string $height)
+    public function setDialogFormDimensions(string $width, string $height)
     {
         $this->options['dialog_form_area'] = [$width, $height];
 
@@ -652,6 +704,14 @@ HTML;
         return $this->option('create_mode', $mode);
     }
 
+    /**
+     * @return $this
+     */
+    public function enableDialogCreate()
+    {
+        return $this->createMode(self::CREATE_MODE_DIALOG);
+    }
+
     /**
      * Get or set resource path.
      *

src/Grid/Concerns/HasRowSelector.php

@@ -1,53 +0,0 @@
-<?php
-
-namespace Dcat\Admin\Grid\Concerns;
-
-use Dcat\Admin\Grid;
-
-/**
- * @mixin Grid
- */
-trait HasRowSelector
-{
-    /**
-     * @var Grid\Tools\RowSelector
-     */
-    protected $_rowSelector;
-
-    /**
-     * @param \Closure $closure
-     *
-     * @return Grid\Tools\RowSelector
-     */
-    public function rowSelector()
-    {
-        return $this->_rowSelector ?: ($this->_rowSelector = new Grid\Tools\RowSelector($this));
-    }
-
-    /**
-     * Prepend checkbox column for grid.
-     *
-     * @return void
-     */
-    protected function prependRowSelectorColumn()
-    {
-        if (! $this->options['show_row_selector']) {
-            return;
-        }
-
-        $rowSelector = $this->rowSelector();
-        $keyName = $this->keyName();
-
-        $column = new Grid\Column(
-            Grid\Column::SELECT_COLUMN_NAME,
-            $rowSelector->renderHeader()
-        );
-        $column->setGrid($this);
-
-        $column->display(function () use ($rowSelector, $keyName)  {
-            return $rowSelector->render($this, $this->{$keyName});
-        });
-
-        $this->columns->prepend($column, Grid\Column::SELECT_COLUMN_NAME);
-    }
-}

src/Grid/Tools/CreateButton.php

@@ -29,27 +29,18 @@ class CreateButton implements Renderable
 
         $new = trans('admin.new');
         $url = $this->grid->createUrl();
+        $gridName = $this->grid->getName();
+        $class = 'dialog-create'.($gridName ? "-{$gridName}" : $gridName);
 
         [$width, $height] = $this->grid->option('dialog_form_area');
 
         Form::modal($new)
-            ->click(".{$this->grid->getName()}-create")
+            ->click(".{$class}")
             ->success('LA.reload()')
             ->dimensions($width, $height)
             ->render();
 
-        return "<a data-url='$url' class='btn btn-sm btn-success {$this->grid->getName()}-create'><i class='fa fa-plus'></i><span class='hidden-xs'>&nbsp; $new</span></a>";
-    }
-
-    protected function renderQuickCreateButton()
-    {
-        if ($this->mode !== Grid::CREATE_MODE_QUICK) {
-            return;
-        }
-
-        $new = trans('admin.new');
-
-        return "<a class='btn btn-sm btn-success quick-create-button-{$this->grid->getName()}'><i class='fa fa-plus'></i><span class='hidden-xs'>&nbsp; $new</span></a>";
+        return "<a data-url='$url' class='btn btn-sm btn-success {$class}'><i class='fa fa-plus'></i><span class='hidden-xs'>&nbsp; $new</span></a>";
     }
 
     protected function renderCreateButton()
@@ -68,6 +59,6 @@ class CreateButton implements Renderable
 
     public function render()
     {
-        return "<div class='btn-group' style='margin-right:3px'>{$this->renderCreateButton()}{$this->renderQuickCreateButton()}{$this->renderDialogCreateButton()}</div>";
+        return "<div class='btn-group' style='margin-right:3px'>{$this->renderCreateButton()}{$this->renderDialogCreateButton()}</div>";
     }
 }

src/Grid/Tools/RowSelector.php

@@ -72,7 +72,7 @@ HTML;
 
     }
 
-    public function render($row, $id)
+    public function renderColumn($row, $id)
     {
         $this->setupScript();