Ver código fonte

Apply fixes from StyleCI

Jiang Qinghua 5 anos atrás
pai
commit
29a0159dce
2 arquivos alterados com 83 adições e 83 exclusões
  1. 81 82
      src/Grid/Concerns/CanFixColumns.php
  2. 2 1
      src/Grid/FixColumns.php

+ 81 - 82
src/Grid/Concerns/CanFixColumns.php

@@ -1,82 +1,81 @@
-<?php
-
-namespace Dcat\Admin\Grid\Concerns;
-
-use Dcat\Admin\Grid\Displayers\Actions;
-use Dcat\Admin\Grid\Displayers\ContextMenuActions;
-use Dcat\Admin\Grid\Displayers\DropdownActions;
-use Dcat\Admin\Grid\FixColumns;
-use Illuminate\Support\Collection;
-
-trait CanFixColumns
-{
-    /**
-     * @var FixColumns
-     */
-    protected $fixColumns;
-
-    /**
-     * @param int $head
-     * @param int $tail
-     *
-     * @return $this
-     */
-    public function fixColumns(int $head, int $tail = -1)
-    {
-        $this->fixColumns = new FixColumns($this, $head, $tail);
-
-        $this->resetActions();
-
-        return $this;
-    }
-
-    protected function resetActions()
-    {
-        $actions = $this->actionsClass ?: config('admin.grid.grid_action_class');
-
-        if ($actions === DropdownActions::class) {
-            $this->setActionClass(Actions::class);
-        }
-    }
-
-    protected function applyFixColumns()
-    {
-        if ($this->fixColumns) {
-            $this->withBorder();
-
-            $this->fixColumns->apply();
-        }
-    }
-
-    /**
-     * @return Collection
-     */
-    public function leftVisibleColumns()
-    {
-        return $this->fixColumns->leftColumns();
-    }
-
-    /**
-     * @return Collection
-     */
-    public function rightVisibleColumns()
-    {
-        return $this->fixColumns->rightColumns();
-    }
-
-    /**
-     * @return Collection
-     */
-    public function leftVisibleComplexColumns()
-    {
-        return $this->fixColumns->leftComplexColumns();
-    }
-
-    /**
-     * @return Collection
-     */
-    public function rightVisibleComplexColumns()
-    {
-        return $this->fixColumns->rightComplexColumns();
-    }
-}
+<?php
+
+namespace Dcat\Admin\Grid\Concerns;
+
+use Dcat\Admin\Grid\Displayers\Actions;
+use Dcat\Admin\Grid\Displayers\DropdownActions;
+use Dcat\Admin\Grid\FixColumns;
+use Illuminate\Support\Collection;
+
+trait CanFixColumns
+{
+    /**
+     * @var FixColumns
+     */
+    protected $fixColumns;
+
+    /**
+     * @param int $head
+     * @param int $tail
+     *
+     * @return $this
+     */
+    public function fixColumns(int $head, int $tail = -1)
+    {
+        $this->fixColumns = new FixColumns($this, $head, $tail);
+
+        $this->resetActions();
+
+        return $this;
+    }
+
+    protected function resetActions()
+    {
+        $actions = $this->actionsClass ?: config('admin.grid.grid_action_class');
+
+        if ($actions === DropdownActions::class) {
+            $this->setActionClass(Actions::class);
+        }
+    }
+
+    protected function applyFixColumns()
+    {
+        if ($this->fixColumns) {
+            $this->withBorder();
+
+            $this->fixColumns->apply();
+        }
+    }
+
+    /**
+     * @return Collection
+     */
+    public function leftVisibleColumns()
+    {
+        return $this->fixColumns->leftColumns();
+    }
+
+    /**
+     * @return Collection
+     */
+    public function rightVisibleColumns()
+    {
+        return $this->fixColumns->rightColumns();
+    }
+
+    /**
+     * @return Collection
+     */
+    public function leftVisibleComplexColumns()
+    {
+        return $this->fixColumns->leftComplexColumns();
+    }
+
+    /**
+     * @return Collection
+     */
+    public function rightVisibleComplexColumns()
+    {
+        return $this->fixColumns->rightComplexColumns();
+    }
+}

+ 2 - 1
src/Grid/FixColumns.php

@@ -141,12 +141,13 @@ class FixColumns
                 return $this->grid->allColumns()->get($name);
             });
     }
+
     /**
      * @return $this
      */
     protected function addScript()
     {
-        $script = <<<JS
+        $script = <<<'JS'
 
 (function () {
     var theadHeight = $('.table-main thead tr').outerHeight();