Merge pull request #2516 from zanemmm/master

fix #2485 #1572 部分 Displayer 支持传递闭包参数

src/Grid/Displayers/Checkbox.php

@@ -3,18 +3,27 @@
 namespace Encore\Admin\Grid\Displayers;
 
 use Encore\Admin\Admin;
+use Illuminate\Contracts\Support\Arrayable;
 
 class Checkbox extends AbstractDisplayer
 {
     public function display($options = [])
     {
+        if ($options instanceof \Closure) {
+            $options = $options->call($this, $this->row);
+        }
+
         $radios = '';
         $name = $this->column->getName();
 
         if (is_string($this->value)) {
             $this->value = explode(',', $this->value);
         }
 
+        if ($this->value instanceof Arrayable) {
+            $this->value = $this->value->toArray();
+        }
+
         foreach ($options as $value => $label) {
             $checked = in_array($value, $this->value) ? 'checked' : '';
             $radios .= <<<EOT

src/Grid/Displayers/Editable.php

@@ -58,6 +58,10 @@ public function textarea()
      */
     public function select($options = [])
     {
+        if ($options instanceof \Closure) {
+            $options = $options->call($this, $this->row);
+        }
+
         $source = [];
 
         foreach ($options as $key => $value) {

src/Grid/Displayers/Radio.php

@@ -8,6 +8,10 @@ class Radio extends AbstractDisplayer
 {
     public function display($options = [])
     {
+        if ($options instanceof \Closure) {
+            $options = $options->call($this, $this->row);
+        }
+
         $radios = '';
         $name = $this->column->getName();
 

src/Grid/Displayers/Select.php

@@ -8,6 +8,10 @@ class Select extends AbstractDisplayer
 {
     public function display($options = [])
     {
+        if ($options instanceof \Closure) {
+            $options = $options->call($this, $this->row);
+        }
+
         $name = $this->column->getName();
 
         $class = "grid-select-{$name}";