Explorar o código

Merge pull request #1877 from PorygonCN/2.0

修复embeds中上传图片会被误处理为保存的问题
Jiang Qinghua %!s(int64=3) %!d(string=hai) anos
pai
achega
1a45eafbb9
Modificáronse 1 ficheiros con 8 adicións e 5 borrados
  1. 8 5
      src/Form/Concerns/HasFiles.php

+ 8 - 5
src/Form/Concerns/HasFiles.php

@@ -155,11 +155,14 @@ trait HasFiles
     public function getFieldByRelationName($relation, $column)
     {
         $relation = $this->findFieldByName($relation);
-
-        if ($relation && $relation instanceof Field\HasMany) {
-            return $relation->buildNestedForm()->fields()->first(function ($field) use ($column) {
-                return $field->column() === $column;
-            });
+        if ($relation) {
+            if ($relation instanceof Field\HasMany) {
+                return $relation->buildNestedForm()->fields()->first(function ($field) use ($column) {
+                    return $field->column() === $column;
+                });
+            } elseif ($relation instanceof Field\Embeds) {
+                return $relation->field($column);
+            }
         }
     }