fix #867

jqhph · Dec 23, 2020 · d1b0028 · d1b0028
1 parent d554c3c
commit d1b0028
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/src/Admin.php b/src/Admin.php
@@ -29,7 +29,7 @@ class Admin
     use HasAssets;
     use HasHtml;
 
-    const VERSION = '2.0.12-beta';
+    const VERSION = '2.0.13-beta';
 
     const SECTION = [
         // 往 <head> 标签内输入内容

diff --git a/src/Grid/Column.php b/src/Grid/Column.php
@@ -545,9 +545,7 @@ public function fill($data)
                 $value = $this->callDisplayCallbacks($this->original);
             }
 
-            if ($value !== $this->value) {
-                Helper::arraySet($row, $this->name, $value);
-            }
+            Helper::arraySet($row, $this->name, $value);
         }
 
         $this->value = $value ?? null;

diff --git a/src/Support/Helper.php b/src/Support/Helper.php
@@ -892,7 +892,13 @@ public static function arraySet(&$array, $key, $value)
             if (is_array($array)) {
                 $array = &$array[$key];
             } else {
-                $array[$key] = static::arraySet($array[$key], implode('.', $keys), $value);
+                if (is_object($array[$key])) {
+                    $array[$key] = static::arraySet($array[$key], implode('.', $keys), $value);
+                } else {
+                    $mid = $array[$key];
+
+                    $array[$key] = static::arraySet($mid, implode('.', $keys), $value);
+                }
             }
         }
 

diff --git a/tests/Controllers/UserController.php b/tests/Controllers/UserController.php
@@ -81,12 +81,16 @@ protected function grid()
 
         $grid->model()->with(['tags', 'profile']);
 
+        $grid->number();
+
         $grid->id('ID')->sortable();
 
         $grid->username();
         $grid->email();
         $grid->mobile();
-        $grid->full_name();
+        $grid->full()->display(function () {
+            return $this->full_name;
+        });
         $grid->avatar()->display(function ($avatar) {
             return "<img src='{$avatar}' />";
         });