移植6.x的绑定属性到父模型

Author: wdaglb

library/think/model/Collection.php

@@ -32,6 +32,22 @@ public function load($relation)
         return $this;
     }
 
+    /**
+     * 绑定（一对一）关联属性到当前模型
+     * @access protected
+     * @param  string $relation 关联名称
+     * @param  array  $attrs    绑定属性
+     * @return $this
+     */
+    public function bindAttr($relation, array $attrs = [])
+    {
+        $this->each(function (Model $model) use ($relation, $attrs) {
+            $model->bindAttr($relation, $attrs);
+        });
+
+        return $this;
+    }
+
     /**
      * 设置需要隐藏的输出属性
      * @access public

library/think/model/concern/RelationShip.php

@@ -13,6 +13,7 @@
 
 use think\Collection;
 use think\db\Query;
+use think\Exception;
 use think\Loader;
 use think\Model;
 use think\model\Relation;
@@ -115,6 +116,32 @@ public function setRelation($name, $value, $data = [])
         return $this;
     }
 
+    /**
+     * 绑定（一对一）关联属性到当前模型
+     * @access protected
+     * @param  string   $relation    关联名称
+     * @param  array    $attrs       绑定属性
+     * @return $this
+     * @throws Exception
+     */
+    public function bindAttr($relation, array $attrs = [])
+    {
+        $relation = $this->getRelation($relation);
+
+        foreach ($attrs as $key => $attr) {
+            $key   = is_numeric($key) ? $attr : $key;
+            $value = $this->getOrigin($key);
+
+            if (!is_null($value)) {
+                throw new Exception('bind attr has exists:' . $key);
+            }
+
+            $this->setAttr($key, $relation ? $relation->getAttr($attr) : null);
+        }
+
+        return $this;
+    }
+
     /**
      * 关联数据写入
      * @access public

library/think/model/relation/OneToOne.php

@@ -282,20 +282,22 @@ protected function match($model, $relation, &$result)
     /**
      * 绑定关联属性到父模型
      * @access protected
-     * @param  Model $model    关联模型对象
-     * @param  Model $result   父模型对象
+     * @param  Model $result    关联模型对象
+     * @param  Model $model   父模型对象
      * @return void
      * @throws Exception
      */
     protected function bindAttr($model, &$result)
     {
         foreach ($this->bindAttr as $key => $attr) {
-            $key = is_numeric($key) ? $attr : $key;
-            if (isset($result->$key)) {
+            $key   = is_numeric($key) ? $attr : $key;
+            $value = $result->getOrigin($key);
+
+            if (!is_null($value)) {
                 throw new Exception('bind attr has exists:' . $key);
-            } else {
-                $result->setAttr($key, $model ? $model->$attr : null);
             }
+
+            $result->setAttr($key, $model ? $model->getAttr($attr) : null);
         }
     }