Merge pull request #5454 from mis3085/fix_grid_model_setsort_is_relation

修正Grid無法對關聯欄位使用sortable()的問題

Author: jxlwqq

src/Grid/Model.php

@@ -526,6 +526,9 @@ protected function setSort()
 
         $columnNameContainsDots = Str::contains($columnName, '.');
         $isRelation = $this->queries->contains(function ($query) use ($columnName) {
+            // relationship should be camel case
+            $columnName = Str::camel(Str::before($columnName, '.'));
+
             return $query['method'] === 'with' && in_array($columnName, $query['arguments'], true);
         });
         if ($columnNameContainsDots === true && $isRelation) {
@@ -570,6 +573,8 @@ protected function setSort()
     protected function setRelationSort($column)
     {
         list($relationName, $relationColumn) = explode('.', $column);
+        // relationship should be camel case
+        $relationName = Str::camel($relationName);
 
         if ($this->queries->contains(function ($query) use ($relationName) {
             return $query['method'] == 'with' && in_array($relationName, $query['arguments']);