改进模型数据验证

library/think/Model.php

@@ -1043,15 +1043,17 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
         }
 
         // 数据自动验证
-        if (!$this->validateData($data)) {
+        if (!empty($data)) {
-            return false;
+            if (!$this->validateData($data)) {
+                return false;
+            }
+
+            // 数据对象赋值
+            foreach ($data as $key => $value) {
+                $this->setAttr($key, $value, $data);
+            }
         }
 
-        // 数据对象赋值
-        foreach ($data as $key => $value) {
-            $this->setAttr($key, $value, $data);
-        }
-        
         if (!empty($where)) {
             $this->isUpdate    = true;
             $this->updateWhere = $where;

library/think/model/relation/HasMany.php

@@ -202,10 +202,9 @@ class HasMany extends Relation
      */
     public function save($data)
     {
-        $model = $this->make();
+        $model = $this->make($data);
-        $data  = array_merge($model->getData(), $data);
 
-        return $model->save($data) ? $model : false;
+        return $model->save() ? $model : false;
     }
 
     /**

library/think/model/relation/MorphMany.php

@@ -245,10 +245,9 @@ class MorphMany extends Relation
      */
     public function save($data)
     {
-        $model = $this->make();
+        $model = $this->make($data);
-        $data  = array_merge($model->getData(), $data);
 
-        return $model->save($data) ? $model : false;
+        return $model->save() ? $model : false;
     }
 
     /**

library/think/model/relation/MorphOne.php

@@ -199,10 +199,9 @@ class MorphOne extends Relation
      */
     public function save($data)
     {
-        $model = $this->make();
+        $model = $this->make($data);
-        $data  = array_merge($model->getData(), $data);
 
-        return $model->save($data) ? $model : false;
+        return $model->save() ? $model : false;
     }
 
     /**