Home Explore Help
Register Sign In
wangjunyun
/
Dcat-Admin
mirror of https://gitee.com/jqhph/dcat-admin.git
1
0
Fork 0
Files Issues 0 Wiki
Browse Source

fix #867

jqh 4 years ago
parent
d554c3cab9
commit
d1b0028ac8
4 changed files with 14 additions and 6 deletions
Unified View Show Diff Stats
  1. 1 1
      src/Admin.php
  2. 1 3
      src/Grid/Column.php
  3. 7 1
      src/Support/Helper.php
  4. 5 1
      tests/Controllers/UserController.php

+ 1 - 1
src/Admin.php
View File 

@@ -29,7 +29,7 @@ class Admin
 
     use HasAssets;
 
     use HasAssets;
 
     use HasHtml;
 
     use HasHtml;
 
 
 
-    const VERSION = '2.0.12-beta';
 
+    const VERSION = '2.0.13-beta';
 
 
 
     const SECTION = [
 
     const SECTION = [
 
         // 往 <head> 标签内输入内容
 
         // 往 <head> 标签内输入内容

+ 1 - 3
src/Grid/Column.php
View File 

@@ -545,9 +545,7 @@ class Column
 
                 $value = $this->callDisplayCallbacks($this->original);
 
                 $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;
 
         $this->value = $value ?? null;

+ 7 - 1
src/Support/Helper.php
View File 

@@ -892,7 +892,13 @@ class Helper
 
             if (is_array($array)) {
 
             if (is_array($array)) {
 
                 $array = &$array[$key];
 
                 $array = &$array[$key];
 
             } else {
 
             } 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);
 
+                }
 
             }
 
             }
 
         }
 
         }

+ 5 - 1
tests/Controllers/UserController.php
View File 

@@ -81,12 +81,16 @@ class UserController extends AdminController
 
 
 
         $grid->model()->with(['tags', 'profile']);
 
         $grid->model()->with(['tags', 'profile']);
 
 
 
+        $grid->number();
 
+
 
         $grid->id('ID')->sortable();
 
         $grid->id('ID')->sortable();
 
 
 
         $grid->username();
 
         $grid->username();
 
         $grid->email();
 
         $grid->email();
 
         $grid->mobile();
 
         $grid->mobile();
 
-        $grid->full_name();
 
+        $grid->full()->display(function () {
 
+            return $this->full_name;
 
+        });
 
         $grid->avatar()->display(function ($avatar) {
 
         $grid->avatar()->display(function ($avatar) {
 
             return "<img src='{$avatar}' />";
 
             return "<img src='{$avatar}' />";
 
         });
 
         });