jqh 4 years ago
parent
commit
7ec0971973
1 changed files with 4 additions and 2 deletions
  1. 4 2
      src/Grid/Column.php

+ 4 - 2
src/Grid/Column.php

@@ -528,6 +528,10 @@ class Column
         $i = 0;
         $i = 0;
 
 
         $data->transform(function ($row, $key) use (&$i) {
         $data->transform(function ($row, $key) use (&$i) {
+            $this->setOriginalModel(static::$originalGridModels[$key]);
+
+            $this->originalModel['_index'] = $row['_index'] = $i;
+
             $row = $this->convertModelToArray($row);
             $row = $this->convertModelToArray($row);
 
 
             $i++;
             $i++;
@@ -535,8 +539,6 @@ class Column
                 $row['#'] = $i;
                 $row['#'] = $i;
             }
             }
 
 
-            $this->setOriginalModel(static::$originalGridModels[$key]);
-
             $this->original = Arr::get($this->originalModel, $this->name);
             $this->original = Arr::get($this->originalModel, $this->name);
 
 
             $this->value = $value = $this->htmlEntityEncode($original = Arr::get($row, $this->name));
             $this->value = $value = $this->htmlEntityEncode($original = Arr::get($row, $this->name));