Jiang qinghua 5 years ago
parent
commit
b7c6fda3e4
1 changed files with 31 additions and 5 deletions
  1. 31 5
      src/Grid.php

+ 31 - 5
src/Grid.php

@@ -71,7 +71,7 @@ class Grid
      *
      * @var array
      */
-    public $columnNames = [];
+    protected $columnNames = [];
 
     /**
      * Grid builder.
@@ -134,21 +134,21 @@ class Grid
      *
      * @var array
      */
-    public $perPages = [10, 20, 30, 50, 100, 200];
+    protected $perPages = [10, 20, 30, 50, 100, 200];
 
     /**
      * Default items count per-page.
      *
      * @var int
      */
-    public $perPage = 20;
+    protected $perPage = 20;
 
     /**
      * Header tools.
      *
      * @var Tools
      */
-    public $tools;
+    protected $tools;
 
     /**
      * Callback for grid actions.
@@ -330,7 +330,7 @@ class Grid
         if (strpos($name, '.') !== false) {
             list($relationName, $relationColumn) = explode('.', $name);
 
-            $label = empty($label) ? trans_field($relationColumn) : $label;
+            $label = empty($label) ? admin_trans_field($relationColumn) : $label;
 
             $name = Str::snake($relationName).'.'.$relationColumn;
         }
@@ -435,6 +435,14 @@ class Grid
         return $this->model;
     }
 
+    /**
+     * @return array
+     */
+    public function getColumnNames()
+    {
+        return $this->columnNames;
+    }
+
     /**
      * Paginate the grid.
      *
@@ -449,6 +457,14 @@ class Grid
         $this->model()->setPerPage($perPage);
     }
 
+    /**
+     * @return int
+     */
+    public function getPerPage()
+    {
+        return $this->perPage;
+    }
+
     /**
      * Get the grid paginator.
      *
@@ -485,6 +501,16 @@ class Grid
         return $this;
     }
 
+    /**
+     * Get per-page options.
+     *
+     * @return array
+     */
+    public function getPerPages()
+    {
+        return $this->perPages;
+    }
+
     /**
      * Set grid action callback.
      *